Fix entity data bleed when using WithContext and WithTime

Creates a copy of the data map when using WithContext to create a
child entity.  Without this, the data map of the parent entitiy,
which is exposed in the entity struct, is shared between a parent
and all children instances.

This can create bugs of shared or overwritten data when a parent
entity is used to make children in differing contexts, and behaves
differently than `WithField` and its diritivites which does make
a copy of the data.

Additionally implements the same logic for WithTime, for API
consistency in behavior.
This commit is contained in:
Taylor Wrobel
2019-11-27 20:03:38 -08:00
parent 67a7fdcf74
commit bcc146f96b
2 changed files with 38 additions and 2 deletions
+28
View File
@@ -47,6 +47,34 @@ func TestEntryWithContext(t *testing.T) {
assert.Equal(ctx, entry.WithContext(ctx).Context)
}
func TestEntryWithContextCopiesData(t *testing.T) {
assert := assert.New(t)
ctx1 := context.WithValue(context.Background(), "foo", "bar")
ctx2 := context.WithValue(context.Background(), "bar", "baz")
assert.NotEqual(ctx1, ctx2)
logger := New()
logger.Out = &bytes.Buffer{}
parentEntry := NewEntry(logger).WithField("parentKey", "parentValue")
childEntry1 := parentEntry.WithContext(ctx1)
assert.Equal(ctx1, childEntry1.Context)
childEntry2 := parentEntry.WithContext(ctx2)
assert.Equal(ctx2, childEntry2.Context)
assert.NotEqual(ctx1, ctx2)
assert.Equal("parentValue", childEntry1.Data["parentKey"])
assert.Equal("parentValue", childEntry2.Data["parentKey"])
childEntry1.Data["ChildKeyValue1"] = "ChildDataValue1"
val, exists := childEntry1.Data["ChildKeyValue1"]
assert.True(exists)
assert.Equal("ChildDataValue1", val)
val, exists = childEntry2.Data["ChildKeyValue1"]
assert.False(exists)
assert.Empty(val)
}
func TestEntryPanicln(t *testing.T) {
errBoom := fmt.Errorf("boom time")