Merge pull request #2708 from DataDog/tvaleev/feature/RUM-9899_2

[RUM-9899]: TracingInterceptor migration

Author: satween

ci/pipelines/default-pipeline.yml

@@ -526,6 +526,23 @@ publish:release-internal:
       - dd-sdk-android-internal/verification-metadata.xml
 
 # region Publish features/*
+publish:release-trace-api:
+  tags: [ "arch:amd64" ]
+  only:
+    - tags
+    - develop
+  image: $CI_IMAGE_DOCKER
+  stage: publish
+  timeout: 30m
+  script:
+    - !reference [.snippets, set-publishing-credentials]
+    - ./gradlew :features:dd-sdk-android-trace-api:publishToSonatype closeSonatypeStagingRepository --stacktrace --no-daemon
+  artifacts:
+    when: on_success
+    expire_in: 7 days
+    paths:
+      - features/dd-sdk-android-trace-api/verification-metadata.xml
+
 
 publish:release-trace-internal:
   tags: [ "arch:amd64" ]
@@ -537,7 +554,7 @@ publish:release-trace-internal:
   timeout: 30m
   script:
     - !reference [ .snippets, set-publishing-credentials ]
-    - ./gradlew :features:dd-sdk-android-trace-internal:publishToSonatype --stacktrace --no-daemon
+    - ./gradlew :features:dd-sdk-android-trace-internal:publishToSonatype closeSonatypeStagingRepository --stacktrace --no-daemon
   artifacts:
     when: on_success
     expire_in: 7 days

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogContextProvider.kt

@@ -17,6 +17,7 @@ internal class DatadogContextProvider(
     private val coreFeature: CoreFeature,
     private val featureContextProvider: FeatureContextProvider
 ) : ContextProvider {
+    @Suppress("LongMethod")
     override fun getContext(withFeatureContexts: Set<String>): DatadogContext {
         // IMPORTANT All properties should be immutable and be frozen at the state
         // of the context construction moment
@@ -57,12 +58,13 @@ internal class DatadogContextProvider(
                     architecture = architecture,
                     numberOfDisplays = numberOfDisplays,
                     localeInfo = with(coreFeature.androidInfoProvider) {
-                            LocaleInfo(
-                                locales = locales,
-                                currentLocale = currentLocale,
-                                timeZone = timeZone
-                            )
-                        })
+                        LocaleInfo(
+                            locales = locales,
+                            currentLocale = currentLocale,
+                            timeZone = timeZone
+                        )
+                    }
+                )
             },
             userInfo = coreFeature.userInfoProvider.getUserInfo(),
             accountInfo = coreFeature.accountInfoProvider.getAccountInfo(),

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpContextProvider.kt

@@ -56,10 +56,10 @@ internal class NoOpContextProvider : ContextProvider {
             architecture = "",
             numberOfDisplays = null,
             localeInfo = LocaleInfo(
-                    locales = emptyList(),
-                    currentLocale = "",
-                    timeZone = ""
-                )
+                locales = emptyList(),
+                currentLocale = "",
+                timeZone = ""
+            )
         ),
         userInfo = UserInfo(null, null, null, null, emptyMap()),
         accountInfo = null,

detekt_custom.yml

@@ -321,7 +321,6 @@ datadog:
       - "okhttp3.Request.Builder.url(kotlin.String):java.lang.NullPointerException,java.lang.IllegalArgumentException"
       - "okhttp3.Request.Builder.post(okhttp3.RequestBody):java.lang.NullPointerException,java.lang.IllegalArgumentException"
       - "okhttp3.Request.Builder.method(kotlin.String, okhttp3.RequestBody?):java.lang.NullPointerException,java.lang.IllegalArgumentException"
-      - "okhttp3.Request.Builder.tag(java.lang.Class, io.opentracing.Span?):java.lang.NullPointerException"
       - "okhttp3.Request.Builder.tag(java.lang.Class, com.datadog.android.okhttp.TraceContext?):java.lang.ClassCastException"
       - "okhttp3.Request.Builder.url(kotlin.String):java.lang.NullPointerException,java.lang.IllegalArgumentException"
       - "okhttp3.Interceptor.Chain.proceed(okhttp3.Request):java.io.IOException"
@@ -339,9 +338,6 @@ datadog:
       - "org.json.JSONArray.get(kotlin.Int):org.json.JSONException"
       - "org.json.JSONObject.get(kotlin.String):org.json.JSONException"
       # endregion
-      # region OpenTracing
-      - "io.opentracing.Scope.close():java.io.IOException"
-      # endregion
       # region Gson
       - "com.google.gson.JsonParser.parseString(kotlin.String?):com.google.gson.JsonParseException"
       # endregion
@@ -759,8 +755,11 @@ datadog:
       - "java.util.concurrent.atomic.AtomicLong.constructor(kotlin.Long)"
       - "java.util.concurrent.atomic.AtomicLong.get()"
       - "java.util.concurrent.atomic.AtomicLong.set(kotlin.Long)"
+      - "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(io.opentracing.Tracer?, io.opentracing.Tracer?)"
+      - "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(UNKNOWN, UNKNOWN)"
       - "java.util.concurrent.atomic.AtomicReference.constructor()"
       - "java.util.concurrent.atomic.AtomicReference.constructor(android.app.Application.ActivityLifecycleCallbacks?)"
       - "java.util.concurrent.atomic.AtomicReference.constructor(com.datadog.android.api.SdkCore?)"
@@ -773,9 +772,12 @@ 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(io.opentracing.Tracer?)"
+      - "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(kotlin.Nothing?)"
       - "java.util.concurrent.atomic.AtomicReference.set(kotlin.String?)"
+      - "java.util.concurrent.atomic.AtomicReference.set(UNKNOWN)"
       - "java.util.concurrent.locks.ReadWriteLock.readLock()"
       - "java.util.concurrent.locks.ReadWriteLock.writeLock()"
       - "java.util.concurrent.locks.ReentrantReadWriteLock.constructor()"
@@ -853,6 +855,7 @@ datadog:
       - "java.util.Locale.getDefault()"
       - "java.util.Locale.toLanguageTag()"
       - "java.util.Properties.constructor()"
+      - "java.util.Properties.contains(kotlin.Any?)"
       - "java.util.Properties.setProperty(kotlin.String?, kotlin.String?)"
       - "java.util.TimeZone.getDefault()"
       - "java.util.UUID.constructor(kotlin.Long, kotlin.Long)"
@@ -996,6 +999,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()"
@@ -1086,6 +1090,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?)"
@@ -1365,7 +1370,6 @@ datadog:
       # region Kotlin Coroutines
       - "kotlinx.coroutines.CoroutineScope.async(kotlin.coroutines.CoroutineContext, kotlinx.coroutines.CoroutineStart, kotlin.coroutines.SuspendFunction1)"
       - "kotlinx.coroutines.CoroutineScope.launch(kotlin.coroutines.CoroutineContext, kotlinx.coroutines.CoroutineStart, kotlin.coroutines.SuspendFunction1)"
-      - "kotlinx.coroutines.CoroutineScope.withinCoroutineSpan(kotlin.String, io.opentracing.Span?, kotlin.coroutines.CoroutineContext, kotlin.coroutines.SuspendFunction1)"
       - "kotlinx.coroutines.flow.FlowCollector.emit(kotlin.Any?)"
       - "kotlinx.coroutines.flow.FlowCollector(kotlin.coroutines.SuspendFunction1)"
       - "kotlinx.coroutines.flow.flow(kotlin.coroutines.SuspendFunction1)"
@@ -1420,7 +1424,6 @@ datadog:
       - "okhttp3.Request.Builder.addHeader(kotlin.String, kotlin.String)"
       - "okhttp3.Request.Builder.header(kotlin.String, kotlin.String)"
       - "okhttp3.Request.Builder.removeHeader(kotlin.String)"
-      - "okhttp3.Request.Builder.tag(java.lang.Class, io.opentracing.Span?)"
       - "okhttp3.Request.body()"
       - "okhttp3.Request.header(kotlin.String)"
       - "okhttp3.Request.headers()"
@@ -1443,36 +1446,13 @@ datadog:
       - "org.json.JSONObject.keys()"
       - "org.json.JSONObject.toJsonObject()"
       # endregion
-      # region OpenTracing
-      - "io.opentracing.Span.context()"
-      - "io.opentracing.Span.finish()"
-      - "io.opentracing.Span.log(kotlin.collections.MutableMap?)"
-      - "io.opentracing.Span.setError(kotlin.Throwable)"
-      - "io.opentracing.Span.setTag(kotlin.String?, kotlin.Number?)"
-      - "io.opentracing.Span.setTag(kotlin.String?, kotlin.String?)"
-      - "io.opentracing.Span.setTag(io.opentracing.tag.Tag?, com.datadog.android.internal.concurrent.CompletableFuture?)"
-      - "io.opentracing.Span.setTag(io.opentracing.tag.Tag?, kotlin.String?)"
-      - "io.opentracing.SpanContext.toSpanId()"
-      - "io.opentracing.SpanContext.toTraceId()"
-      - "io.opentracing.Tracer.SpanBuilder.asChildOf(io.opentracing.Span?)"
-      - "io.opentracing.Tracer.SpanBuilder.asChildOf(io.opentracing.SpanContext?)"
-      - "io.opentracing.Tracer.SpanBuilder.start()"
-      - "io.opentracing.Tracer.activateSpan(io.opentracing.Span?)"
-      - "io.opentracing.Tracer.activeSpan()"
-      - "io.opentracing.Tracer.buildSpan(kotlin.String?)"
-      - "io.opentracing.Tracer.extract(io.opentracing.propagation.Format?, io.opentracing.propagation.TextMapExtract?)"
-      - "io.opentracing.Tracer.inject(io.opentracing.SpanContext?, io.opentracing.propagation.Format?, io.opentracing.propagation.TextMapInject?)"
-      - "io.opentracing.propagation.TextMapExtractAdapter.constructor(kotlin.collections.MutableMap?)"
-      - "io.opentracing.propagation.TextMapInject(kotlin.Function2)"
-      - "io.opentracing.util.GlobalTracer.get()"
-      - "io.opentracing.util.GlobalTracer.isRegistered()"
-      # endregion
       # region Opentelemetry
       - "io.opentelemetry.api.trace.Span.getInvalid()"
       - "io.opentelemetry.api.trace.TracerBuilder.build()"
       - "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()"

features/dd-sdk-android-logs/api/apiSurface

@@ -35,17 +35,17 @@ data class com.datadog.android.log.LogsConfiguration
     fun setEventMapper(com.datadog.android.event.EventMapper<com.datadog.android.log.model.LogEvent>): Builder
     fun build(): LogsConfiguration
 data class com.datadog.android.log.model.LogEvent
-  constructor(Device, Os, Status, kotlin.String, kotlin.String, kotlin.String, Logger, Usr? = null, Account? = null, Network? = null, Error? = null, kotlin.String? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
+  constructor(LogEventDevice, Os, Status, kotlin.String, kotlin.String, kotlin.String, Logger, Dd, Usr? = null, Account? = null, Network? = null, Error? = null, kotlin.String? = null, kotlin.String, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
   fun toJson(): com.google.gson.JsonElement
   companion object 
     fun fromJson(kotlin.String): LogEvent
     fun fromJsonObject(com.google.gson.JsonObject): LogEvent
-  data class Device
+  data class LogEventDevice
     constructor(Type? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.List<kotlin.String>? = null, kotlin.String? = null, kotlin.Number? = null, kotlin.Boolean? = null, kotlin.Number? = null)
     fun toJson(): com.google.gson.JsonElement
     companion object 
-      fun fromJson(kotlin.String): Device
-      fun fromJsonObject(com.google.gson.JsonObject): Device
+      fun fromJson(kotlin.String): LogEventDevice
+      fun fromJsonObject(com.google.gson.JsonObject): LogEventDevice
   data class Os
     constructor(kotlin.String, kotlin.String, kotlin.String? = null, kotlin.String)
     fun toJson(): com.google.gson.JsonElement
@@ -58,6 +58,12 @@ data class com.datadog.android.log.model.LogEvent
     companion object 
       fun fromJson(kotlin.String): Logger
       fun fromJsonObject(com.google.gson.JsonObject): Logger
+  data class Dd
+    constructor(DdDevice)
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): Dd
+      fun fromJsonObject(com.google.gson.JsonObject): Dd
   data class Usr
     constructor(kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.collections.MutableMap<kotlin.String, kotlin.Any?> = mutableMapOf())
     fun toJson(): com.google.gson.JsonElement
@@ -82,6 +88,12 @@ data class com.datadog.android.log.model.LogEvent
     companion object 
       fun fromJson(kotlin.String): Error
       fun fromJsonObject(com.google.gson.JsonObject): Error
+  data class DdDevice
+    constructor(kotlin.String)
+    fun toJson(): com.google.gson.JsonElement
+    companion object 
+      fun fromJson(kotlin.String): DdDevice
+      fun fromJsonObject(com.google.gson.JsonObject): DdDevice
   data class Client
     constructor(SimCarrier? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String? = null, kotlin.String)
     fun toJson(): com.google.gson.JsonElement