Skip to content

Fix null span/scope handling for OpenTracing Bridge #1429

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

Merged
tylerbenson merged 1 commit into from
May 4, 2020
Merged

Fix null span/scope handling for OpenTracing Bridge #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public TypeConverter(final LogHandler logHandler) {
}

public AgentSpan toAgentSpan(final Span span) {
if (span instanceof OTSpan) {
if (span == null) {
return null;
} else if (span instanceof OTSpan) {
return ((OTSpan) span).getDelegate();
} else {
// NOOP Span
Expand All @@ -33,7 +35,9 @@ public AgentSpan toAgentSpan(final Span span) {
}

public Span toSpan(final AgentSpan agentSpan) {
if (agentSpan instanceof DDSpan) {
if (agentSpan == null) {
return null;
} else if (agentSpan instanceof DDSpan) {
return new OTSpan((DDSpan) agentSpan, this, logHandler);
} else {
// NOOP AgentSpans
Expand All @@ -45,7 +49,9 @@ public Span toSpan(final AgentSpan agentSpan) {
// That fact that some methods return AgentScope and other TraceScope even though its the same
// underlying object needs to be cleaned up
public Scope toScope(final Object scope) {
if (scope instanceof CustomScopeManagerWrapper.CustomScopeManagerScope) {
if (scope == null) {
return null;
} else if (scope instanceof CustomScopeManagerWrapper.CustomScopeManagerScope) {
return ((CustomScopeManagerWrapper.CustomScopeManagerScope) scope).getDelegate();
} else if (scope instanceof TraceScope) {
return new OTScopeManager.OTTraceScope((TraceScope) scope, this);
Expand All @@ -59,7 +65,9 @@ public SpanContext toSpanContext(final DDSpanContext context) {
}

public SpanContext toSpanContext(final TagContext tagContext) {
if (tagContext instanceof ExtractedContext) {
if (tagContext == null) {
return null;
} else if (tagContext instanceof ExtractedContext) {
return new OTExtractedContext((ExtractedContext) tagContext);
} else {
return new OTTagContext(tagContext);
Expand All @@ -69,7 +77,9 @@ public SpanContext toSpanContext(final TagContext tagContext) {
public AgentSpan.Context toContext(final SpanContext spanContext) {
// FIXME: [API] DDSpanContext, ExtractedContext, TagContext, AgentSpan.Context
// don't share a meaningful hierarchy
if (spanContext instanceof OTGenericContext) {
if (spanContext == null) {
return null;
} else if (spanContext instanceof OTGenericContext) {
return ((OTGenericContext) spanContext).getDelegate();
} else if (spanContext instanceof OTExtractedContext) {
return ((OTExtractedContext) spanContext).getDelegate();
Expand Down
8 changes: 8 additions & 0 deletions dd-trace-ot/src/test/groovy/datadog/opentracing/OpenTracingAPITest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@ class OpenTracingAPITest extends DDSpecification {
def scopeListener = Mock(ScopeListener)

def setup() {
assert tracer.scopeManager().active() == null
tracer.addTraceInterceptor(traceInterceptor)
tracer.addScopeListener(scopeListener)
}

def "tracer/scopeManager returns null for no active span"() {
expect:
tracer.activeSpan() == null
tracer.scopeManager().active() == null
tracer.scopeManager().activeSpan() == null
}

def "single span"() {
when:
Scope scope
Expand Down