fixup: improve based on gemini feedback

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

providers/flagd/flagd-testbed

@@ -305,8 +305,12 @@ func TestNewProvider(t *testing.T) {
 			options: []ProviderOption{
 				WithInProcessResolver(),
 				WithContextEnricher(func(m map[string]any) *of.EvaluationContext {
-					m["test2"] = "test2"
-					context := of.NewTargetlessEvaluationContext(m)
+					newMap := make(map[string]any, len(m)+1)
+					for k, v := range m {
+						newMap[k] = v
+					}
+					newMap["test2"] = "test2"
+					context := of.NewTargetlessEvaluationContext(newMap)
 					return &context
 				}),
 			},
@@ -413,10 +417,8 @@ func TestNewProvider(t *testing.T) {
 
 			if test.expectContextEnrichment != nil {
 				enriched := config.ContextEnricher(enrichment).Attributes()
-				for k, v := range test.expectContextEnrichment {
-					if enriched[k] != v {
-						t.Errorf("incorrect context_enrichment attribute, expected %v, got %v", v, enriched[k])
-					}
+				if !reflect.DeepEqual(test.expectContextEnrichment, enriched) {
+					t.Errorf("incorrect context_enrichment attribute, expected %v, got %v", test.expectContextEnrichment, enriched)
 				}
 			}
 

providers/flagd/pkg/provider_test.go

@@ -33,6 +33,7 @@ type InProcess struct {
 	syncEnd          context.CancelFunc
 	wg               parallel.WaitGroup
 	contextValues    map[string]any
+	mtx              parallel.RWMutex
 }
 
 type Configuration struct {
@@ -298,7 +299,19 @@ func (i *InProcess) appendMetadata(evalMetadata model.Metadata) {
 }
 
 func (i *InProcess) ContextValues() map[string]any {
-	return i.contextValues
+	i.mtx.RLock()
+	defer i.mtx.RUnlock()
+
+	if i.contextValues == nil {
+		return nil
+	}
+
+	// Return a copy to prevent mutation of internal state
+	contextValuesCopy := make(map[string]any, len(i.contextValues))
+	for k, v := range i.contextValues {
+		contextValuesCopy[k] = v
+	}
+	return contextValuesCopy
 }
 
 // makeSyncProvider is a helper to create sync.ISync and return the underlying uri used by it to the caller