Added FieldsFromContext method

asticode · Nov 13, 2020 · cd59a08 · cd59a08
1 parent 5184b8c
commit cd59a08
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/context.go b/context.go
@@ -27,6 +27,19 @@ func fieldsFromContext(ctx context.Context) *contextFields {
 	return v
 }
 
+func FieldsFromContext(ctx context.Context) (fs map[string]interface{}) {
+	if cfs := fieldsFromContext(ctx); cfs != nil {
+		cfs.m.Lock()
+		fs = make(map[string]interface{})
+		for k, v := range cfs.fs {
+			fs[k] = v
+		}
+		cfs.m.Unlock()
+		return
+	}
+	return
+}
+
 func ContextWithField(ctx context.Context, k string, v interface{}) context.Context {
 	return ContextWithFields(ctx, map[string]interface{}{k: v})
 }

diff --git a/context_test.go b/context_test.go
@@ -12,7 +12,7 @@ func TestContext(t *testing.T) {
 		"k2": "v2",
 	}
 	ctx := ContextWithFields(context.Background(), fs)
-	if g := fieldsFromContext(ctx); !reflect.DeepEqual(fs, g.fs) {
-		t.Errorf("expected %+v, got %+v", fs, g.fs)
+	if g := FieldsFromContext(ctx); !reflect.DeepEqual(fs, g) {
+		t.Errorf("expected %+v, got %+v", fs, g)
 	}
 }