Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: fix baggage set member failed #3165

Merged
merged 6 commits into from
Sep 17, 2022
Merged

bugfix: fix baggage set member failed #3165

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e54e84d
fix baggage set member failed
hanyuancheung Sep 13, 2022
be85537
add unittest
hanyuancheung Sep 13, 2022
a3ce943
fix unittest
hanyuancheung Sep 13, 2022
81a0037
rewrite unittest code
hanyuancheung Sep 15, 2022
4f035a0
Merge branch 'main' into feature/csuzhang_fix_baggage_set_member_failed
hanyuancheung Sep 16, 2022
5b3a64d
Merge branch 'main' into feature/csuzhang_fix_baggage_set_member_failed
hanyuancheung Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions baggage/baggage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ func (b Baggage) Member(key string) Member {
key: key,
value: v.Value,
properties: fromInternalProperties(v.Properties),
hasData: true,
}
}

Expand All @@ -484,6 +485,7 @@ func (b Baggage) Members() []Member {
key: k,
value: v.Value,
properties: fromInternalProperties(v.Properties),
hasData: true,
})
}
return members
Expand Down
22 changes: 21 additions & 1 deletion baggage/baggage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,24 @@ func TestBaggageSetMember(t *testing.T) {
assert.Equal(t, baggage.Item{}, b4.list[m.key])
assert.Equal(t, 1, len(b3.list))
assert.Equal(t, 2, len(b4.list))

m = Member{key: "hasData false", hasData: false}
b5, err := b4.SetMember(m)
assert.Error(t, err)
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b3.list[key])
assert.NotContains(t, b3.list, m.key)
assert.Equal(t, baggage.Item{Value: "v", Properties: []baggage.Property{{Key: "p"}}}, b4.list[key])
assert.Equal(t, baggage.Item{}, b4.list[m.key])
assert.Equal(t, 2, len(b4.list))
assert.Equal(t, 2, len(b5.list))

m2 := Member{key: key, value: "v", hasData: false}
b6, err := b1.SetMember(m2)
assert.Error(t, err)
assert.Equal(t, baggage.Item{}, b1.list[key])
assert.Equal(t, baggage.Item{Value: ""}, b6.list[key])
assert.Equal(t, 1, len(b1.list))
assert.Equal(t, 1, len(b6.list))
hanyuancheung marked this conversation as resolved.
Show resolved Hide resolved
}

func TestNilBaggageMembers(t *testing.T) {
Expand All @@ -602,13 +620,15 @@ func TestBaggageMembers(t *testing.T) {
{key: "state", value: "on", hasValue: true},
{key: "red"},
},
hasData: true,
},
{
key: "bar",
value: "2",
properties: properties{
{key: "yellow"},
},
hasData: true,
},
}

Expand All @@ -631,7 +651,7 @@ func TestBaggageMembers(t *testing.T) {

func TestBaggageMember(t *testing.T) {
bag := Baggage{list: baggage.List{"foo": {Value: "1"}}}
assert.Equal(t, Member{key: "foo", value: "1"}, bag.Member("foo"))
assert.Equal(t, Member{key: "foo", value: "1", hasData: true}, bag.Member("foo"))
assert.Equal(t, Member{}, bag.Member("bar"))
}

Expand Down