Remove shared ThreadLocal scopes

DataDog · Dec 17, 2024 · 32afc41 · 32afc41
1 parent e7f82e3
commit 32afc41
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 23 deletions.
diff --git a/...roid-trace/src/main/java/com/datadog/opentracing/scopemanager/ContextualScopeManager.java b/...roid-trace/src/main/java/com/datadog/opentracing/scopemanager/ContextualScopeManager.java
@@ -19,7 +19,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class ContextualScopeManager implements ScopeManager {
-  static final ThreadLocal<DDScope> tlsScope = new ThreadLocal<>();
+  final ThreadLocal<DDScope> tlsScope = new ThreadLocal<>();
   final Deque<ScopeContext> scopeContexts = new LinkedList<>();
   final List<ScopeListener> scopeListeners = new CopyOnWriteArrayList<>();
 

diff --git a/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/AndroidTracerTest.kt b/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/android/trace/AndroidTracerTest.kt
@@ -19,7 +19,6 @@ import com.datadog.legacy.trace.api.Config
 import com.datadog.legacy.trace.common.writer.Writer
 import com.datadog.opentracing.DDSpan
 import com.datadog.opentracing.LogHandler
-import com.datadog.opentracing.scopemanager.ScopeTestHelper
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.DoubleForgery
 import fr.xgouchet.elmyr.annotation.Forgery
@@ -134,8 +133,6 @@ internal class AndroidTracerTest {
         val activeScope = tracer?.scopeManager()?.active()
         activeSpan?.finish()
         activeScope?.close()
-
-        ScopeTestHelper.removeThreadLocalScope()
     }
 
     // region Tracer

diff --git a/...id-trace/src/test/kotlin/com/datadog/android/trace/internal/utils/TracerExtensionsTest.kt b/...id-trace/src/test/kotlin/com/datadog/android/trace/internal/utils/TracerExtensionsTest.kt
@@ -10,7 +10,6 @@ import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.trace.AndroidTracer
 import com.datadog.android.utils.forge.Configurator
 import com.datadog.opentracing.DDSpan
-import com.datadog.opentracing.scopemanager.ScopeTestHelper
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
 import fr.xgouchet.elmyr.junit5.ForgeExtension
@@ -58,8 +57,6 @@ internal class TracerExtensionsTest {
         val activeScope = tracer.scopeManager().active()
         activeSpan?.finish()
         activeScope?.close()
-
-        ScopeTestHelper.removeThreadLocalScope()
     }
 
     @Test

diff --git a/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/opentracing/PendingTraceTest.kt b/features/dd-sdk-android-trace/src/test/kotlin/com/datadog/opentracing/PendingTraceTest.kt
@@ -47,7 +47,7 @@ class PendingTraceTest {
             PendingTrace::class.java,
             mockTracer,
             fakeTraceId,
-            mockInternalLogger as InternalLogger
+            mockInternalLogger
         )
         val rootSpan =
             forge.fakeSpan(pendingTrace, mockTracer, fakeTraceId, BigInteger.ZERO, "rootSpan", mockInternalLogger)

diff --git a/...sdk-android-trace/src/test/kotlin/com/datadog/opentracing/scopemanager/ScopeTestHelper.kt b/...sdk-android-trace/src/test/kotlin/com/datadog/opentracing/scopemanager/ScopeTestHelper.kt
diff --git a/tools/unit/src/main/kotlin/com/datadog/tools/unit/ReflectUtils.kt b/tools/unit/src/main/kotlin/com/datadog/tools/unit/ReflectUtils.kt
@@ -123,7 +123,7 @@ private fun <R> setFieldValue(instance: Any?, field: Field, fieldValue: R): Bool
  * @param params the parameters to provide the constructor
  * @return the instance of the class
  */
-@Suppress("SpreadOperator")
+@Suppress("SpreadOperator", "UNCHECKED_CAST")
 fun <T : Any> createInstance(clazz: Class<T>, vararg params: Any?): T {
     val toTypedArray = params.map { it?.javaClass ?: Any::class.java }.toTypedArray()
     val constructor = clazz.declaredConstructors