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.

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

Fix span deduplication via correct ordering of adjusters #6116

Merged
merged 5 commits into from
Oct 27, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro committed Oct 27, 2024
commit b5703ea46aabb8278f2981dc0cff706f0a38f529
5 changes: 5 additions & 0 deletions cmd/query/app/http_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ func extractTraces(t *testing.T, response *structuredResponse) []ui.Trace {
return traces
}

// TestGetTraceDedupeSuccess partially verifies that the standard adjusteres
// are defined in correct order.
func TestGetTraceDedupeSuccess(t *testing.T) {
dupedMockTrace := &model.Trace{
Spans: append(mockTrace.Spans, mockTrace.Spans...),
Expand All @@ -187,6 +189,9 @@ func TestGetTraceDedupeSuccess(t *testing.T) {
assert.Empty(t, response.Errors)
traces := extractTraces(t, &response)
assert.Len(t, traces[0].Spans, 2)
for _, span := range traces[0].Spans {
assert.Empty(t, span.Warnings, "clock skew adjuster would've complained about dupes")
}
}

func TestLogOnServerError(t *testing.T) {
Expand Down
Loading