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

fix zipkinv2 translation error tag handling #2253

Merged
merged 7 commits into from
Jan 4, 2021
Merged

fix zipkinv2 translation error tag handling #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc95896
fix zipkinv2 translation error tag handling
ericmustin Dec 4, 2020
a288aea
use blank identifier for linting
ericmustin Dec 4, 2020
52b30a7
[zipkin]: add check for 'true' string
ericmustin Dec 12, 2020
0adaf7b
add error tag test
ericmustin Dec 12, 2020
462e1c1
[zipkin] typo fix
ericmustin Dec 12, 2020
e48e7db
[zipkin]: fix tests to test error tag for zipkin
ericmustin Dec 12, 2020
8a00493
Merge branch 'master' into fix_zipkin_error_handling
ericmustin Dec 12, 2020
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
7 changes: 7 additions & 0 deletions translator/trace/zipkin/zipkinv2_to_traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ func populateSpanStatus(tags map[string]string, status pdata.SpanStatus) {
delete(tags, tracetranslator.TagStatusMsg)
}
}

if val, ok := tags[tracetranslator.TagError]; ok {
if val == "true" {
status.SetCode(pdata.StatusCodeError)
delete(tags, tracetranslator.TagError)
}
}
}

func zipkinKindToSpanKind(kind zipkinmodel.Kind, tags map[string]string) pdata.SpanKind {
Expand Down
35 changes: 35 additions & 0 deletions translator/trace/zipkin/zipkinv2_to_traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ func TestZipkinSpansToInternalTraces(t *testing.T) {
td: generateTraceSingleSpanMinmalResource(),
err: nil,
},
{
name: "errorTag",
zs: generateSpanErrorTags(),
td: generateTraceSingleSpanErrorStatus(),
err: nil,
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
Expand Down Expand Up @@ -101,6 +107,15 @@ func generateSpanNoTags() []*zipkinmodel.SpanModel {
return spans
}

func generateSpanErrorTags() []*zipkinmodel.SpanModel {
errorTags := make(map[string]string)
errorTags["error"] = "true"

spans := generateSpanNoEndpoints()
spans[0].Tags = errorTags
return spans
}

func generateTraceSingleSpanNoResourceOrInstrLibrary() pdata.Traces {
td := pdata.NewTraces()
td.ResourceSpans().Resize(1)
Expand Down Expand Up @@ -128,3 +143,23 @@ func generateTraceSingleSpanMinmalResource() pdata.Traces {
rsc.Attributes().UpsertString(conventions.AttributeServiceName, "SoleAttr")
return td
}

func generateTraceSingleSpanErrorStatus() pdata.Traces {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a nit but perhaps generateTraceOneSpanOneTraceID (or just testdata.GenerateTraceDataOneSpan) could be reused to make this even simpler?

td := pdata.NewTraces()
td.ResourceSpans().Resize(1)
rs := td.ResourceSpans().At(0)
rs.InstrumentationLibrarySpans().Resize(1)
ils := rs.InstrumentationLibrarySpans().At(0)
ils.Spans().Resize(1)
span := ils.Spans().At(0)
span.SetTraceID(
pdata.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}))
span.SetSpanID(pdata.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}))
span.SetName("MinimalData")
span.SetKind(pdata.SpanKindCLIENT)
span.SetStartTime(1596911098294000000)
span.SetEndTime(1596911098295000000)
span.Attributes().InitEmptyWithCapacity(0)
span.Status().SetCode(pdata.StatusCodeError)
return td
}