File tree Expand file tree Collapse file tree 3 files changed +0
-21
lines changed
dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala
dd-trace-core/src/main/java/datadog/trace/core
internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api Expand file tree Collapse file tree 3 files changed +0
-21
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ import akka.util.Timeout
6
6
import datadog .trace .api .Trace
7
7
import datadog .trace .bootstrap .instrumentation .api .AgentTracer .{
8
8
activateSpan ,
9
- activeScope ,
10
9
activeSpan ,
11
10
startSpan
12
11
}
@@ -57,7 +56,6 @@ class AkkaActors extends AutoCloseable {
57
56
@ Trace
58
57
def send (name : String , who : String ): Unit = {
59
58
val actor = actors(name)
60
- activeScope().setAsyncPropagation(true )
61
59
activeSpan().setSpanName(name)
62
60
actor ! WhoToGreet (who)
63
61
if (name == " ask" ) {
@@ -69,7 +67,6 @@ class AkkaActors extends AutoCloseable {
69
67
70
68
@ Trace
71
69
def leak (who : String , leak : String ): Unit = {
72
- activeScope().setAsyncPropagation(true )
73
70
activeSpan().setSpanName(" leak all the things" )
74
71
tellGreeter ! WhoToGreet (who)
75
72
tellGreeter ! Leak (leak)
Original file line number Diff line number Diff line change @@ -966,11 +966,6 @@ public AgentSpan activeSpan() {
966
966
return scopeManager .activeSpan ();
967
967
}
968
968
969
- @ Override
970
- public AgentScope activeScope () {
971
- return scopeManager .active ();
972
- }
973
-
974
969
@ Override
975
970
public void checkpointActiveForRollback () {
976
971
this .scopeManager .checkpointActiveForRollback ();
Original file line number Diff line number Diff line change @@ -185,12 +185,6 @@ public static AgentSpan activeSpan() {
185
185
return get ().activeSpan ();
186
186
}
187
187
188
- /** @deprecated To be removed, do not use. */
189
- @ Deprecated
190
- public static AgentScope activeScope () {
191
- return get ().activeScope ();
192
- }
193
-
194
188
/**
195
189
* Checks whether asynchronous propagation is enabled, meaning this context will propagate across
196
190
* asynchronous boundaries.
@@ -359,8 +353,6 @@ AgentSpan startSpan(
359
353
360
354
AgentSpan activeSpan ();
361
355
362
- AgentScope activeScope ();
363
-
364
356
default AgentSpan blackholeSpan () {
365
357
final AgentSpan active = activeSpan ();
366
358
return new BlackHoleSpan (active != null ? active .getTraceId () : DDTraceId .ZERO );
@@ -528,11 +520,6 @@ public AgentSpan activeSpan() {
528
520
return NoopSpan .INSTANCE ;
529
521
}
530
522
531
- @ Override
532
- public AgentScope activeScope () {
533
- return null ;
534
- }
535
-
536
523
@ Override
537
524
public AgentSpan blackholeSpan () {
538
525
return NoopSpan .INSTANCE ; // no-op tracer stays no-op
You can’t perform that action at this time.
0 commit comments