CBG-3379 add contexts for logging in interfaces that are supplied by …

…sg-bucket (#6422) * ctx * Update with sg-bucket changes * Add dcp * update go.mod * Use context that doesn't go out of scope * fix ctx * go mod tidy * amend comment * Use correct ctx * update rosmar and sg-bucket * simplify context in dcp feed * Update rosmar go.mod
couchbase · Apr 8, 2024 · afcae7e · afcae7e
1 parent be676b3
commit afcae7e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/base/collection_n1ql_common.go b/base/collection_n1ql_common.go
@@ -497,7 +497,6 @@ func (i *gocbRawIterator) Next(ctx context.Context, valuePtr interface{}) bool {
 		return false
 	}
 
-	ctx := context.TODO() // fix in sg-bucket
 	err := JSONUnmarshal(nextBytes, &valuePtr)
 	if err != nil {
 		WarnfCtx(ctx, "Unable to marshal view result row into value: %v", err)

diff --git a/base/config_persistence_test.go b/base/config_persistence_test.go
@@ -157,7 +157,6 @@ func TestXattrConfigPersistence(t *testing.T) {
 	_, reinsertErr := cp.insertConfig(c, configKey, configBody)
 	require.Equal(t, ErrAlreadyExists, reinsertErr)
 
-	ctx := TestCtx(t)
 	// Retrieve the config, cas should still match insertCas
 	var loadedConfig map[string]interface{}
 	loadCas, loadErr := cp.loadConfig(ctx, c, configKey, &loadedConfig)

diff --git a/db/background_mgr_resync_dcp_test.go b/db/background_mgr_resync_dcp_test.go
@@ -362,7 +362,7 @@ func TestResyncImportComputeStat(t *testing.T) {
 
 	err = WaitForConditionWithOptions(t, func() bool {
 		var status BackgroundManagerStatus
-		rawStatus, _ := resycMgr.GetStatus()
+		rawStatus, _ := resycMgr.GetStatus(ctx)
 		_ = json.Unmarshal(rawStatus, &status)
 		return status.State == BackgroundProcessStateCompleted
 	}, 200, 200)