Merge pull request #2773 from DataDog/tvaleev/feature/RUM-9902-removing-unused-code

[RUM-9902] Isolating implementation layer from integration modules

Author: satween

dd-sdk-android-internal/api/apiSurface

@@ -82,7 +82,6 @@ class com.datadog.android.internal.thread.NamedRunnable : NamedExecutionUnit, Ru
 class com.datadog.android.internal.thread.NamedCallable<V> : NamedExecutionUnit, java.util.concurrent.Callable<V>
   constructor(String, java.util.concurrent.Callable<V>)
 fun ByteArray.toHexString(): String
-fun <R> Any.tryCastTo(): R?
 object com.datadog.android.internal.utils.ImageViewUtils
   fun resolveParentRectAbsPosition(android.view.View, Boolean = true): android.graphics.Rect
   fun calculateClipping(android.graphics.Rect, android.graphics.Rect, Float): android.graphics.Rect

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/CastExt.kt

@@ -752,6 +752,7 @@ datadog:
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.core.CoreTracer?, com.datadog.trace.core.CoreTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.android.api.SdkCore?, com.datadog.android.api.SdkCore?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?, com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?)"
+      - "java.util.concurrent.atomic.AtomicReference.compareAndSet(com.datadog.android.trace.api.tracer.DatadogTracer?, com.datadog.android.trace.api.tracer.DatadogTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(io.opentracing.Tracer?, io.opentracing.Tracer?)"
       - "java.util.concurrent.atomic.AtomicReference.compareAndSet(UNKNOWN, UNKNOWN)"
       - "java.util.concurrent.atomic.AtomicReference.constructor()"
@@ -766,6 +767,7 @@ datadog:
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.SdkCore?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.api.feature.FeatureEventReceiver?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.rum.internal.domain.RumContext?)"
+      - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.android.trace.api.tracer.DatadogTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI?)"
       - "java.util.concurrent.atomic.AtomicReference.set(com.datadog.trace.core.CoreTracer?)"
       - "java.util.concurrent.atomic.AtomicReference.set(io.opentracing.Tracer?)"
@@ -847,6 +849,7 @@ datadog:
       - "java.util.HashSet.addAll(kotlin.collections.Collection)"
       - "java.util.HashSet.find(kotlin.Function1)"
       - "java.util.Properties.constructor()"
+      - "java.util.Properties.contains(kotlin.Any?)"
       - "java.util.Properties.setProperty(kotlin.String?, kotlin.String?)"
       - "java.util.UUID.constructor(kotlin.Long, kotlin.Long)"
       - "java.util.UUID.randomUUID()"
@@ -989,6 +992,7 @@ datadog:
       - "kotlin.collections.Map.forEach(kotlin.Function1)"
       - "kotlin.collections.Map.forEach(kotlin.Function1)" # one of our usage is with <*, *> which doesn't get captured
       - "kotlin.collections.Map.get(kotlin.String)"
+      - "kotlin.collections.Map.get(kotlin.String?)"
       - "kotlin.collections.Map.isEmpty()"
       - "kotlin.collections.Map.isNotEmpty()"
       - "kotlin.collections.Map.isNullOrEmpty()"
@@ -1079,6 +1083,7 @@ datadog:
       - "kotlin.collections.MutableMap.isEmpty()"
       - "kotlin.collections.MutableMap.isNotEmpty()"
       - "kotlin.collections.MutableMap.iterator()"
+      - "kotlin.collections.MutableMap.orEmpty()"
       - "kotlin.collections.MutableMap.map(kotlin.Function1)"
       - "kotlin.collections.MutableMap.mapValues(kotlin.Function1)"
       - "kotlin.collections.MutableMap.put(kotlin.Any?, kotlin.Any?)"
@@ -1466,6 +1471,7 @@ datadog:
       - "io.opentelemetry.api.trace.SpanBuilder.setAttribute(kotlin.String?, kotlin.String?)"
       - "io.opentelemetry.api.trace.TracerBuilder.setInstrumentationVersion(kotlin.String?)"
       - "io.opentelemetry.api.trace.TracerProvider.noop()"
+      - "io.opentelemetry.context.propagation.ContextPropagators.noop()"
       - "io.opentelemetry.context.Context.get(io.opentelemetry.context.ContextKey?)"
       - "io.opentelemetry.context.Context.makeCurrent()"
       - "io.opentelemetry.context.Context.root()"

detekt_custom.yml

@@ -77,13 +77,15 @@ dependencies {
             )
         }
     }
-    testImplementation(testFixtures(project(":dd-sdk-android-core")))
-    testImplementation(testFixtures(project(":dd-sdk-android-internal")))
+
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
     testImplementation(libs.okHttp)
     testImplementation(libs.okHttpMock)
-    testImplementation(libs.bundles.openTracing)
+    testImplementation(project(":features:dd-sdk-android-trace"))
+    testImplementation(testFixtures(project(":dd-sdk-android-core")))
+    testImplementation(testFixtures(project(":dd-sdk-android-internal")))
+    testImplementation(testFixtures(project(":features:dd-sdk-android-trace")))
     unmock(libs.robolectric)
 }
 

features/dd-sdk-android-rum/build.gradle.kts

@@ -436,20 +436,21 @@ internal class TelemetryEventHandler(
     }
 
     private fun isGlobalTracerRegistered(): Boolean {
-        // We don't reference io.opentracing from RUM directly, so using reflection for this.
-        // Would be nice to add the test with the flavor which is has no io.opentracing and test
+        // We don't reference com.datadog.android.trace from RUM directly, so using reflection for this.
+        // Would be nice to add the test with the flavor which is has no com.datadog.android.trace and test
         // for obfuscation enabled case.
         return try {
-            val globalTracerClass = Class.forName("io.opentracing.util.GlobalTracer")
+            val globalDatadogTracer =
+                Class.forName("com.datadog.android.trace.GlobalDatadogTracer")
             return try {
-                globalTracerClass.getMethod("isRegistered")
-                    .invoke(null) as Boolean
+                val holderInstance = globalDatadogTracer.getDeclaredField("INSTANCE").get(null)
+                globalDatadogTracer.getDeclaredMethod("getOrNull").invoke(holderInstance) != null
             } catch (@Suppress("TooGenericExceptionCaught") t: Throwable) {
                 sdkCore.internalLogger.log(
                     InternalLogger.Level.ERROR,
                     InternalLogger.Target.TELEMETRY,
                     {
-                        "GlobalTracer class exists in the runtime classpath, " +
+                        "GlobalDatadogTracer class exists in the runtime classpath, " +
                             "but there is an error invoking isRegistered method"
                     },
                     t

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt

@@ -45,16 +45,15 @@ import com.datadog.android.telemetry.model.TelemetryConfigurationEvent
 import com.datadog.android.telemetry.model.TelemetryDebugEvent
 import com.datadog.android.telemetry.model.TelemetryErrorEvent
 import com.datadog.android.telemetry.model.TelemetryUsageEvent
+import com.datadog.android.trace.GlobalDatadogTracer
+import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.tools.unit.forge.aThrowable
-import com.datadog.tools.unit.setStaticValue
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.FloatForgery
 import fr.xgouchet.elmyr.annotation.Forgery
 import fr.xgouchet.elmyr.annotation.StringForgery
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
 import fr.xgouchet.elmyr.junit5.ForgeExtension
-import io.opentracing.Tracer
-import io.opentracing.util.GlobalTracer
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.within
 import org.junit.jupiter.api.AfterEach
@@ -224,7 +223,7 @@ internal class TelemetryEventHandlerTest {
 
     @AfterEach
     fun `tear down`() {
-        GlobalTracer::class.java.setStaticValue("isRegistered", false)
+        GlobalDatadogTracer.clear()
     }
 
     // region Debug Event
@@ -615,7 +614,7 @@ internal class TelemetryEventHandlerTest {
         if (useTracer) {
             whenever(mockSdkCore.getFeature(Feature.TRACING_FEATURE_NAME)) doReturn mock()
             if (tracerApi == TelemetryEventHandler.TracerApi.OpenTracing) {
-                GlobalTracer.registerIfAbsent(mock<Tracer>())
+                GlobalDatadogTracer.registerIfAbsent(mock<DatadogTracer>())
             } else if (tracerApi == TelemetryEventHandler.TracerApi.OpenTelemetry) {
                 fakeDatadogContext = fakeDatadogContext.copy(
                     featuresContext = fakeDatadogContext.featuresContext.toMutableMap().apply {

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt

@@ -0,0 +1,18 @@
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+build/

features/dd-sdk-android-trace-api/.gitignore

@@ -0,0 +1,129 @@
+object com.datadog.android.trace.api.DatadogTracingConstants
+  const val DEFAULT_ASYNC_PROPAGATING: Boolean
+  object Tags
+    const val KEY_HTTP_URL: String
+    const val KEY_SPAN_KIND: String
+    const val KEY_HTTP_METHOD: String
+    const val KEY_HTTP_STATUS: String
+    const val KEY_ERROR_MSG: String
+    const val KEY_ERROR_TYPE: String
+    const val KEY_ERROR_STACK: String
+    const val VALUE_SPAN_KIND_CLIENT: String
+    const val VALUE_SPAN_KIND_SERVER: String
+    const val VALUE_SPAN_KIND_PRODUCER: String
+    const val VALUE_SPAN_KIND_CONSUMER: String
+    const val KEY_ANALYTICS_SAMPLE_RATE: String
+    const val RESOURCE_NAME: String
+    const val ERROR_MSG: String
+    const val ERROR_TYPE: String
+  object PrioritySampling
+    const val UNSET: Int
+    const val SAMPLER_DROP: Int
+    const val SAMPLER_KEEP: Int
+    const val USER_DROP: Int
+    const val USER_KEEP: Int
+  object TracerConfig
+    const val SPAN_TAGS: String
+    const val TRACE_RATE_LIMIT: String
+    const val PARTIAL_FLUSH_MIN_SPANS: String
+    const val TRACE_SAMPLE_RATE: String
+    const val PROPAGATION_STYLE_EXTRACT: String
+    const val PROPAGATION_STYLE_INJECT: String
+    const val SERVICE_NAME: String
+    const val URL_AS_RESOURCE_NAME: String
+    const val TAGS: String
+  object LogAttributes
+    const val ERROR_KIND: String
+    const val ERROR_OBJECT: String
+    const val EVENT: String
+    const val MESSAGE: String
+    const val STACK: String
+    const val STATUS: String
+  object ErrorPriorities
+    const val UNSET: Byte
+    const val HTTP_SERVER_DECORATOR: Byte
+    const val DEFAULT: Byte
+interface com.datadog.android.trace.api.propagation.DatadogPropagation
+  fun <C> inject(com.datadog.android.trace.api.span.DatadogSpanContext, C, (C) -> Unit)
+  fun <C> extract(C, (C) -> Unit): com.datadog.android.trace.api.span.DatadogSpanContext?
+class com.datadog.android.trace.api.propagation.NoOpDatadogPropagation : DatadogPropagation
+  override fun <C> inject(com.datadog.android.trace.api.span.DatadogSpanContext, C, (C) -> Unit)
+  override fun <C> extract(C, (C) -> Unit): com.datadog.android.trace.api.span.DatadogSpanContext?
+interface com.datadog.android.trace.api.scope.DatadogScope : java.io.Closeable
+  override fun close()
+interface com.datadog.android.trace.api.span.DatadogSpan
+  var isError: Boolean?
+  val isRootSpan: Boolean
+  val samplingPriority: Int?
+  val traceId: com.datadog.android.trace.api.trace.DatadogTraceId
+  val parentSpanId: Long?
+  var resourceName: String?
+  var serviceName: String
+  var operationName: String
+  val durationNano: Long
+  val startTimeNanos: Long
+  val localRootSpan: DatadogSpan?
+  fun context(): DatadogSpanContext
+  fun finish()
+  fun finish(Long)
+  fun drop()
+  fun setErrorMessage(String?)
+  fun addThrowable(Throwable)
+  fun addThrowable(Throwable, Byte)
+  fun setTag(String?, String?)
+  fun setTag(String?, Boolean)
+  fun setTag(String?, Number?)
+  fun setTag(String?, Any?)
+  fun getTag(String?): Any?
+  fun setMetric(String, Int)
+  fun logThrowable(Throwable)
+  fun logErrorMessage(String)
+  fun logMessage(String)
+  fun logAttributes(Map<String, Any>)
+interface com.datadog.android.trace.api.span.DatadogSpanBuilder
+  fun start(): DatadogSpan
+  fun withOrigin(String?): DatadogSpanBuilder
+  fun withTag(String, Double?): DatadogSpanBuilder
+  fun withTag(String, Long?): DatadogSpanBuilder
+  fun withTag(String, Any?): DatadogSpanBuilder
+  fun withResourceName(String?): DatadogSpanBuilder
+  fun withParentContext(DatadogSpanContext?): DatadogSpanBuilder
+  fun withParentSpan(DatadogSpan?): DatadogSpanBuilder
+  fun withStartTimestamp(Long): DatadogSpanBuilder
+  fun ignoreActiveSpan(): DatadogSpanBuilder
+  fun withLink(DatadogSpanLink): DatadogSpanBuilder
+interface com.datadog.android.trace.api.span.DatadogSpanContext
+  val traceId: com.datadog.android.trace.api.trace.DatadogTraceId
+  val spanId: Long
+  val samplingPriority: Int
+  val tags: Map<String, Any?>
+  fun setSamplingPriority(Int): Boolean
+  fun setMetric(CharSequence?, Double)
+interface com.datadog.android.trace.api.span.DatadogSpanLink
+  val spanId: Long
+  val sampled: Boolean
+  val traceId: com.datadog.android.trace.api.trace.DatadogTraceId
+  val traceStrace: String
+  val attributes: Map<String, String>?
+interface com.datadog.android.trace.api.span.DatadogSpanWriter
+interface com.datadog.android.trace.api.trace.DatadogTraceId
+  fun toHexStringPadded(Int): String
+  fun toHexString(): String
+  fun toLong(): Long
+  companion object 
+interface com.datadog.android.trace.api.tracer.DatadogTracer
+  fun activeSpan(): com.datadog.android.trace.api.span.DatadogSpan?
+  fun propagate(): com.datadog.android.trace.api.propagation.DatadogPropagation
+  fun activateSpan(com.datadog.android.trace.api.span.DatadogSpan): com.datadog.android.trace.api.scope.DatadogScope?
+  fun activateSpan(com.datadog.android.trace.api.span.DatadogSpan, Boolean): com.datadog.android.trace.api.scope.DatadogScope?
+  fun buildSpan(CharSequence): com.datadog.android.trace.api.span.DatadogSpanBuilder
+  fun buildSpan(String, CharSequence): com.datadog.android.trace.api.span.DatadogSpanBuilder
+  fun addScopeListener(com.datadog.android.trace.api.scope.DatadogScopeListener)
+interface com.datadog.android.trace.api.tracer.DatadogTracerBuilder
+  fun build(): DatadogTracer
+  fun withTracingHeadersTypes(Set<com.datadog.android.trace.TracingHeaderType>): DatadogTracerBuilder
+  fun withServiceName(String): DatadogTracerBuilder
+  fun withSampleRate(Double): DatadogTracerBuilder
+  fun withPartialFlushMinSpans(Int): DatadogTracerBuilder
+  fun withTag(String, String): DatadogTracerBuilder
+  fun setBundleWithRumEnabled(Boolean): DatadogTracerBuilder