Minor test changes to avoid deprecated API (#8574)

mcculls · web-flow · commit b046b8661799 · 2025-03-18T09:05:31.000+01:00
diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala b/dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala
@@ -6,7 +6,7 @@ import akka.util.Timeout
 import datadog.trace.api.Trace
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{
   activateSpan,
-  activeScope,
+  setAsyncPropagationEnabled,
   activeSpan,
   startSpan
 }
@@ -57,7 +57,7 @@ class AkkaActors extends AutoCloseable {
   @Trace
   def send(name: String, who: String): Unit = {
     val actor = actors(name)
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName(name)
     actor ! WhoToGreet(who)
     if (name == "ask") {
@@ -69,7 +69,7 @@ class AkkaActors extends AutoCloseable {
 
   @Trace
   def leak(who: String, leak: String): Unit = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName("leak all the things")
     tellGreeter ! WhoToGreet(who)
     tellGreeter ! Leak(leak)
diff --git a/dd-java-agent/instrumentation/pekko-concurrent/src/test/scala/PekkoActors.scala b/dd-java-agent/instrumentation/pekko-concurrent/src/test/scala/PekkoActors.scala
@@ -6,7 +6,7 @@ import org.apache.pekko.util.Timeout
 import datadog.trace.api.Trace
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{
   activateSpan,
-  activeScope,
+  setAsyncPropagationEnabled,
   activeSpan,
   startSpan
 }
@@ -55,7 +55,7 @@ class PekkoActors extends AutoCloseable {
   @Trace
   def send(name: String, who: String): Unit = {
     val actor = actors(name)
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName(name)
     actor ! WhoToGreet(who)
     if (name == "ask") {
@@ -67,7 +67,7 @@ class PekkoActors extends AutoCloseable {
 
   @Trace
   def leak(who: String, leak: String): Unit = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName("leak all the things")
     tellGreeter ! WhoToGreet(who)
     tellGreeter ! Leak(leak)
diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/latestDepTest/scala/ScalaConcurrentTests.scala b/dd-java-agent/instrumentation/scala-concurrent/src/latestDepTest/scala/ScalaConcurrentTests.scala
@@ -1,6 +1,6 @@
 import datadog.trace.agent.test.AgentTestRunner.blockUntilChildSpansFinished
 import datadog.trace.api.Trace
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeScope, activeSpan}
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{setAsyncPropagationEnabled, activeSpan}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
@@ -13,7 +13,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def traceWithFutureAndCallbacks(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val goodFuture: Future[Integer] = Future {
       tracedChild("goodFuture")
       1
@@ -31,7 +31,7 @@ class ScalaConcurrentTests {
 
   @Trace
   def tracedAcrossThreadsWithNoTrace(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val goodFuture: Future[Integer] = Future {
       1
     }
@@ -51,7 +51,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def traceWithPromises(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val keptPromise   = Promise[Boolean]()
     val brokenPromise = Promise[Boolean]()
     val afterPromise  = keptPromise.future
@@ -78,7 +78,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def tracedWithFutureFirstCompletions(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val completedVal = Future.firstCompletedOf(List(Future {
       tracedChild("timeout1")
       false
@@ -100,7 +100,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def tracedTimeout(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val f: Future[String] = Future {
       tracedChild("timeoutChild")
       while (true) {
diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/test/scala/ScalaConcurrentTests.scala b/dd-java-agent/instrumentation/scala-concurrent/src/test/scala/ScalaConcurrentTests.scala
@@ -1,6 +1,6 @@
 import datadog.trace.agent.test.AgentTestRunner.blockUntilChildSpansFinished
 import datadog.trace.api.Trace
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeScope, activeSpan}
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{setAsyncPropagationEnabled, activeSpan}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
@@ -13,7 +13,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def traceWithFutureAndCallbacks(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val goodFuture: Future[Integer] = Future {
       tracedChild("goodFuture")
       1
@@ -31,7 +31,7 @@ class ScalaConcurrentTests {
 
   @Trace
   def tracedAcrossThreadsWithNoTrace(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val goodFuture: Future[Integer] = Future {
       1
     }
@@ -51,7 +51,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def traceWithPromises(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val keptPromise   = Promise[Boolean]()
     val brokenPromise = Promise[Boolean]()
     val afterPromise  = keptPromise.future
@@ -78,7 +78,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def tracedWithFutureFirstCompletions(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val completedVal = Future.firstCompletedOf(List(Future {
       tracedChild("timeout1")
       false
@@ -100,7 +100,7 @@ class ScalaConcurrentTests {
     */
   @Trace
   def tracedTimeout(): Integer = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     val f: Future[String] = Future {
       tracedChild("timeoutChild")
       while (true) {
diff --git a/dd-java-agent/instrumentation/slick/src/test/scala/SlickUtils.scala b/dd-java-agent/instrumentation/slick/src/test/scala/SlickUtils.scala
@@ -1,6 +1,6 @@
 import datadog.trace.agent.test.AgentTestRunner.blockUntilChildSpansFinished
 import datadog.trace.api.Trace
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{activeScope, activeSpan}
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{setAsyncPropagationEnabled, activeSpan}
 import datadog.trace.common.writer.ListWriter
 import datadog.trace.core.DDSpan
 import slick.jdbc.H2Profile.api._
@@ -26,7 +26,7 @@ class SlickUtils(TEST_WRITER: ListWriter) {
 
   @Trace
   def setup(): DDSpan = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     Await.result(
       database.run(
         sqlu"""CREATE ALIAS IF NOT EXISTS SLEEP FOR "java.lang.Thread.sleep(long)""""
@@ -39,7 +39,7 @@ class SlickUtils(TEST_WRITER: ListWriter) {
   @Trace
   def startQuery(query: String): Future[Vector[Int]] = {
     try {
-      activeScope().setAsyncPropagation(true)
+      setAsyncPropagationEnabled(true)
       database.run(sql"#$query".as[Int])
     } finally {
       blockUntilChildSpansFinished(activeSpan(), 1)
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/scopemanager/ScopeManagerTest.groovy
@@ -541,7 +541,7 @@ class ScopeManagerTest extends DDCoreSpecification {
 
   def "closing scope out of order - complex"() {
     // Events are checked twice in each case to ensure a call to
-    // tracer.activeScope() or tracer.activeSpan() doesn't change the count
+    // scopeManager.active() or tracer.activeSpan() doesn't change the count
 
     when:
     AgentSpan firstSpan = tracer.buildSpan("test", "foo").start()
@@ -550,7 +550,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE])
     tracer.activeSpan() == firstSpan
-    tracer.activeScope() == firstScope
+    scopeManager.active() == firstScope
     assertEvents([ACTIVATE])
     1 * profilingContext.onRootSpanStarted(_)
     1 * profilingContext.onAttach()
@@ -565,7 +565,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE, ACTIVATE])
     tracer.activeSpan() == secondSpan
-    tracer.activeScope() == secondScope
+    scopeManager.active() == secondScope
     assertEvents([ACTIVATE, ACTIVATE])
     1 * profilingContext.encodeOperationName("bar")
     1 * profilingContext.newScopeState(_) >> Stub(Stateful)
@@ -578,7 +578,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
     tracer.activeSpan() == thirdSpan
-    tracer.activeScope() == thirdScope
+    scopeManager.active() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
     1 * profilingContext.encodeOperationName("quux")
     1 * profilingContext.newScopeState(_) >> Stub(Stateful)
@@ -590,7 +590,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
     tracer.activeSpan() == thirdSpan
-    tracer.activeScope() == thirdScope
+    scopeManager.active() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE])
     0 * _
 
@@ -600,7 +600,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE])
     tracer.activeSpan() == firstSpan
-    tracer.activeScope() == firstScope
+    scopeManager.active() == firstScope
 
     assertEvents([ACTIVATE, ACTIVATE, ACTIVATE, CLOSE, CLOSE, ACTIVATE])
     0 * _
@@ -618,7 +618,7 @@ class ScopeManagerTest extends DDCoreSpecification {
       ACTIVATE,
       CLOSE
     ])
-    tracer.activeScope() == null
+    scopeManager.active() == null
     assertEvents([
       ACTIVATE,
       ACTIVATE,
@@ -656,7 +656,7 @@ class ScopeManagerTest extends DDCoreSpecification {
     then:
     assertEvents([ACTIVATE, ACTIVATE])
     tracer.activeSpan() == thirdSpan
-    tracer.activeScope() == thirdScope
+    scopeManager.active() == thirdScope
     assertEvents([ACTIVATE, ACTIVATE])
     1 * profilingContext.encodeOperationName("quux")
     1 * profilingContext.newScopeState(_) >> Stub(Stateful)
