Skip to content

Commit 1913e33

Browse files
mccullsdevflow.devflow-routing-intake
andauthored
Disallow AgentTracer.forceRegister(null) (#11942)
Disallow AgentTracer.forceRegister(null) Callers should pass NOOP_TRACER explicitly instead of null. Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 658a3e4 commit 1913e33

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DebuggerTracerTest {
2020

2121
@AfterEach
2222
public void after() {
23-
AgentTracer.forceRegister(null);
23+
AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
2424
}
2525

2626
@Test
@@ -60,7 +60,7 @@ public void setError() {
6060

6161
@Test
6262
public void noApi() {
63-
AgentTracer.forceRegister(null);
63+
AgentTracer.forceRegister(AgentTracer.NOOP_TRACER);
6464
ProbeStatusSink probeStatusSink = mock(ProbeStatusSink.class);
6565
DebuggerTracer debuggerTracer = new DebuggerTracer(probeStatusSink);
6666
DebuggerSpan span =

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@ public static synchronized void registerIfAbsent(final TracerAPI tracer) {
258258
}
259259

260260
public static synchronized void forceRegister(TracerAPI tracer) {
261+
if (tracer == null) {
262+
throw new IllegalArgumentException("tracer must not be null, use NOOP_TRACER instead");
263+
}
261264
provider = tracer;
262265
}
263266

0 commit comments

Comments
 (0)