8000 Remove unused activeScope method · DataDog/dd-trace-java@637ba61 · GitHub
[go: up one dir, main page]

Skip to content

Commit 637ba61

Browse files
committed
Remove unused activeScope method
1 parent 5c793f8 commit 637ba61

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import akka.util.Timeout
66
import datadog.trace.api.Trace
77
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{
88
activateSpan,
9-
activeScope,
109
activeSpan,
1110
startSpan
1211
}
@@ -57,7 +56,6 @@ class AkkaActors extends AutoCloseable {
5756
@Trace
5857
def send(name: String, who: String): Unit = {
5958
val actor = actors(name)
60-
activeScope().setAsyncPropagation(true)
6159
activeSpan().setSpanName(name)
6260
actor ! WhoToGreet(who)
6361
if (name == "ask") {
@@ -69,7 +67,6 @@ class AkkaActors extends AutoCloseable {
6967

7068
@Trace
7169
def leak(who: String, leak: String): Unit = {
72-
activeScope().setAsyncPropagation(true)
7370
activeSpan().setSpanName("leak all the things")
7471
tellGreeter ! WhoToGreet(who)
7572
tellGreeter ! Leak(leak)

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -966,11 +966,6 @@ public AgentSpan activeSpan() {
966966
return scopeManager.activeSpan();
967967
}
968968

969-
@Override
970-
public AgentScope activeScope() {
971-
return scopeManager.active();
972-
}
973-
974969
@Override
975970
public void checkpointActiveForRollback() {
976971
this.scopeManager.checkpointActiveForRollback();

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,6 @@ public static AgentSpan activeSpan() {
185185
return get().activeSpan();
186186
}
187187

188-
/** @deprecated To be removed, do not use. */
189-
@Deprecated
190-
public static AgentScope activeScope() {
191-
return get().activeScope();
192-
}
193-
194188
/**
195189
* Checks whether asynchronous propagation is enabled, meaning this context will propagate across
196190
* asynchronous boundaries.
@@ -359,8 +353,6 @@ AgentSpan startSpan(
359353

360354
AgentSpan activeSpan();
361355

362-
AgentScope activeScope();
363-
364356
default AgentSpan blackholeSpan() {
365357
final AgentSpan active = activeSpan();
366358
return new BlackHoleSpan(active != null ? active.getTraceId() : DDTraceId.ZERO);
@@ -528,11 +520,6 @@ public AgentSpan activeSpan() {
528520
return NoopSpan.INSTANCE;
529521
}
530522

531-
@Override
532-
public AgentScope activeScope() {
533-
return null;
534-
}
535-
536523
@Override
537524
public AgentSpan blackholeSpan() {
538525
return NoopSpan.INSTANCE; // no-op tracer stays no-op

0 commit comments

Comments
 (0)
0