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

ddtrace/tracer: fix top_level computation with DD_SERVICE_MAPPING #1150

Merged
merged 2 commits into from Mar 1, 2022
Merged

ddtrace/tracer: fix top_level computation with DD_SERVICE_MAPPING #1150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ec553
ddtrace/tracer: fix top_level computation with DD_SERVICE_MAPPING
mackjmr Jan 28, 2022
ac28de6
Merge branch 'v1' into mackjmr/fix-service-mapping-top-level
nsrip-dd Mar 1, 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
10 changes: 5 additions & 5 deletions ddtrace/tracer/tracer.go
View file
Open in desktop
Expand Up @@ -394,6 +394,11 @@ func (t *tracer) StartSpan(operationName string, options ...ddtrace.StartSpanOpt
for k, v := range t.config.globalTags {
span.SetTag(k, v)
}
if t.config.serviceMappings != nil {
if newSvc, ok := t.config.serviceMappings[span.Service]; ok {
span.Service = newSvc
}
}
if context == nil || context.span == nil || context.span.Service != span.Service {
span.setMetric(keyTopLevel, 1)
// all top level spans are measured. So the measured tag is redundant.
Expand All @@ -412,11 +417,6 @@ func (t *tracer) StartSpan(operationName string, options ...ddtrace.StartSpanOpt
if t.config.profilerHotspots || t.config.profilerEndpoints {
t.applyPPROFLabels(pprofContext, span)
}
if t.config.serviceMappings != nil {
if newSvc, ok := t.config.serviceMappings[span.Service]; ok {
span.Service = newSvc
}
}
log.Debug("Started Span: %v, Operation: %s, Resource: %s, Tags: %v, %v", span, span.Name, span.Resource, span.Meta, span.Metrics)
return span
}
Expand Down