Skip to content

Drop noopScope() wrapper caching from OT/OTel TypeConverters #12011

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
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Jul 21, 2026
Merged

Drop noopScope() wrapper caching from OT/OTel TypeConverters #12011

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
6 changes: 0 additions & 6 deletions ...elemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package datadog.trace.instrumentation.opentelemetry;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext;

Expand All @@ -16,12 +15,10 @@
public class TypeConverter {
private final Span noopSpanWrapper;
private final SpanContext noopContextWrapper;
private final OtelScope noopScopeWrapper;

public TypeConverter() {
noopSpanWrapper = new OtelSpan(noopSpan(), this);
noopContextWrapper = new OtelSpanContext(noopSpanContext());
noopScopeWrapper = new OtelScope(noopScope());
}

public AgentSpan toAgentSpan(final Span span) {
Expand Down Expand Up @@ -55,9 +52,6 @@ public Scope toScope(final AgentScope scope) {
if (scope == null) {
return null;
}
if (scope == noopScope()) {
return noopScopeWrapper;
}
return new OtelScope(scope);
}

Expand Down
7 changes: 0 additions & 7 deletions .../instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import datadog.trace.core.PendingTrace
import datadog.trace.core.propagation.PropagationTags
import datadog.trace.instrumentation.opentelemetry.TypeConverter

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext

Expand Down Expand Up @@ -39,12 +38,6 @@ class TypeConverterTest extends InstrumentationSpecification {
typeConverter.toSpanContext(noopContext) is typeConverter.toSpanContext(noopContext)
}

def "should avoid the noop scope wrapper allocation"() {
def noopScope = noopScope()
expect:
typeConverter.toScope(noopScope) is typeConverter.toScope(noopScope)
}

def createTestSpanContext() {
def trace = Stub(PendingTrace)
return new DDSpanContext(
Expand Down
6 changes: 0 additions & 6 deletions ...tracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package datadog.trace.instrumentation.opentracing31;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext;

Expand All @@ -18,13 +17,11 @@ public class TypeConverter {
private final LogHandler logHandler;
private final OTSpan noopSpanWrapper;
private final OTSpanContext noopContextWrapper;
private final OTScopeManager.OTScope noopScopeWrapper;

public TypeConverter(final LogHandler logHandler) {
this.logHandler = logHandler;
noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
noopContextWrapper = new OTSpanContext(noopSpanContext());
noopScopeWrapper = new OTScopeManager.OTScope(noopScope(), false, this);
}

public AgentSpan toAgentSpan(final Span span) {
Expand Down Expand Up @@ -58,9 +55,6 @@ public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) {
if (scope == null) {
return null;
}
if (scope == noopScope()) {
return noopScopeWrapper;
}
return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
}

Expand Down
16 changes: 8 additions & 8 deletions ...ent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/TypeConverterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import datadog.trace.core.DDSpanContext
import datadog.trace.core.PendingTrace
import datadog.trace.core.propagation.PropagationTags
import datadog.trace.instrumentation.opentracing.DefaultLogHandler
import datadog.trace.bootstrap.instrumentation.api.AgentScope
import datadog.trace.instrumentation.opentracing31.TypeConverter

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext

Expand Down Expand Up @@ -40,14 +40,14 @@ class TypeConverterTest extends InstrumentationSpecification {
typeConverter.toSpanContext(noopContext) is typeConverter.toSpanContext(noopContext)
}

def "should avoid the noop scope wrapper allocation"() {
def noopScope = noopScope()
def "should reuse the noop span wrapper via scope"() {
def noopScope = Stub(AgentScope) {
span() >> noopSpan()
}
def noopSpanWrapper = typeConverter.toSpan(noopSpan())
expect:
typeConverter.toScope(noopScope, true) is typeConverter.toScope(noopScope, true)
typeConverter.toScope(noopScope, false) is typeConverter.toScope(noopScope, false)
// noop scopes expected to be the same despite the finishSpanOnClose flag
typeConverter.toScope(noopScope, true) is typeConverter.toScope(noopScope, false)
typeConverter.toScope(noopScope, false) is typeConverter.toScope(noopScope, true)
typeConverter.toScope(noopScope, true).span() is noopSpanWrapper
typeConverter.toScope(noopScope, false).span() is noopSpanWrapper
}

def createTestSpanContext() {
Expand Down
6 changes: 0 additions & 6 deletions ...tracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package datadog.trace.instrumentation.opentracing32;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext;

Expand All @@ -18,13 +17,11 @@ public class TypeConverter {
private final LogHandler logHandler;
private final OTSpan noopSpanWrapper;
private final OTSpanContext noopContextWrapper;
private final OTScopeManager.OTScope noopScopeWrapper;

public TypeConverter(final LogHandler logHandler) {
this.logHandler = logHandler;
noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
noopContextWrapper = new OTSpanContext(noopSpanContext());
noopScopeWrapper = new OTScopeManager.OTScope(noopScope(), false, this);
}

public AgentSpan toAgentSpan(final Span span) {
Expand Down Expand Up @@ -58,9 +55,6 @@ public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) {
if (scope == null) {
return null;
}
if (scope == noopScope()) {
return noopScopeWrapper;
}
return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
}

Expand Down
16 changes: 8 additions & 8 deletions ...ent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/TypeConverterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import datadog.trace.core.DDSpanContext
import datadog.trace.core.PendingTrace
import datadog.trace.core.propagation.PropagationTags
import datadog.trace.instrumentation.opentracing.DefaultLogHandler
import datadog.trace.bootstrap.instrumentation.api.AgentScope
import datadog.trace.instrumentation.opentracing32.TypeConverter

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext

Expand Down Expand Up @@ -40,14 +40,14 @@ class TypeConverterTest extends InstrumentationSpecification {
typeConverter.toSpanContext(noopContext) is typeConverter.toSpanContext(noopContext)
}

def "should avoid the noop scope wrapper allocation"() {
def noopScope = noopScope()
def "should reuse the noop span wrapper via scope"() {
def noopScope = Stub(AgentScope) {
span() >> noopSpan()
}
def noopSpanWrapper = typeConverter.toSpan(noopSpan())
expect:
typeConverter.toScope(noopScope, true) is typeConverter.toScope(noopScope, true)
typeConverter.toScope(noopScope, false) is typeConverter.toScope(noopScope, false)
// noop scopes expected to be the same despite the finishSpanOnClose flag
typeConverter.toScope(noopScope, true) is typeConverter.toScope(noopScope, false)
typeConverter.toScope(noopScope, false) is typeConverter.toScope(noopScope, true)
typeConverter.toScope(noopScope, true).span() is noopSpanWrapper
typeConverter.toScope(noopScope, false).span() is noopSpanWrapper
}

def createTestSpanContext() {
Expand Down
6 changes: 0 additions & 6 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
@@ -1,6 +1,5 @@
package datadog.opentracing;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext;

Expand All @@ -17,13 +16,11 @@ class TypeConverter {
private final LogHandler logHandler;
private final OTSpan noopSpanWrapper;
private final OTSpanContext noopContextWrapper;
private final OTScopeManager.OTScope noopScopeWrapper;

public TypeConverter(final LogHandler logHandler) {
this.logHandler = logHandler;
noopSpanWrapper = new OTSpan(noopSpan(), this, logHandler);
noopContextWrapper = new OTSpanContext(noopSpanContext());
noopScopeWrapper = new OTScopeManager.OTScope(noopScope(), false, this);
}

public AgentSpan toAgentSpan(final Span span) {
Expand Down Expand Up @@ -61,9 +58,6 @@ public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) {
if (scope == null) {
return null;
}
if (scope == noopScope()) {
return noopScopeWrapper;
}
return new OTScopeManager.OTScope(scope, finishSpanOnClose, this);
}

Expand Down
25 changes: 9 additions & 16 deletions dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package datadog.opentracing;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.common.writer.ListWriter;
import datadog.trace.core.CoreTracer;
Expand Down Expand Up @@ -45,20 +47,11 @@ void shouldAvoidTheNoopContextWrapperAllocation() {
}

@Test
void shouldAvoidTheNoopScopeWrapperAllocation() {
datadog.trace.bootstrap.instrumentation.api.AgentScope noopScopeInstance = noopScope();
assertSame(
typeConverter.toScope(noopScopeInstance, true),
typeConverter.toScope(noopScopeInstance, true));
assertSame(
typeConverter.toScope(noopScopeInstance, false),
typeConverter.toScope(noopScopeInstance, false));
// noop scopes expected to be the same despite the finishSpanOnClose flag
assertSame(
typeConverter.toScope(noopScopeInstance, true),
typeConverter.toScope(noopScopeInstance, false));
assertSame(
typeConverter.toScope(noopScopeInstance, false),
typeConverter.toScope(noopScopeInstance, true));
void shouldReuseNoopSpanWrapperViaScope() {
AgentScope noopScope = mock(AgentScope.class);
when(noopScope.span()).thenReturn(noopSpan());
OTSpan noopSpanWrapper = typeConverter.toSpan(noopSpan());
assertSame(typeConverter.toScope(noopScope, true).span(), noopSpanWrapper);
assertSame(typeConverter.toScope(noopScope, false).span(), noopSpanWrapper);
}
}
Loading