RUM-9491: Merge develop

Author: satween

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

@@ -524,7 +524,6 @@ internal class CoreFeature(
         accountInfoProvider = DatadogAccountInfoProvider(internalLogger)
     }
 
-
     private fun setupNetworkInfoProviders(appContext: Context) {
         networkInfoProvider = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             CallbackNetworkInfoProvider(internalLogger = internalLogger)

features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/LogsFeature.kt

@@ -19,8 +19,6 @@ import com.datadog.android.api.storage.DataWriter
 import com.datadog.android.api.storage.EventType
 import com.datadog.android.api.storage.FeatureStorageConfiguration
 import com.datadog.android.api.storage.NoOpDataWriter
-import com.datadog.android.core.feature.event.JvmCrash
-import com.datadog.android.core.internal.utils.NULL_MAP_VALUE
 import com.datadog.android.event.EventMapper
 import com.datadog.android.event.MapperSerializer
 import com.datadog.android.internal.utils.NULL_MAP_VALUE

features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/internal/LogsFeatureTest.kt

@@ -16,9 +16,6 @@ import com.datadog.android.api.storage.DataWriter
 import com.datadog.android.api.storage.EventBatchWriter
 import com.datadog.android.api.storage.EventType
 import com.datadog.android.api.storage.FeatureStorageConfiguration
-import com.datadog.android.core.feature.event.JvmCrash
-import com.datadog.android.core.feature.event.ThreadDump
-import com.datadog.android.core.internal.utils.NULL_MAP_VALUE
 import com.datadog.android.event.EventMapper
 import com.datadog.android.event.MapperSerializer
 import com.datadog.android.internal.utils.NULL_MAP_VALUE

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt

@@ -57,7 +57,7 @@ internal open class RumViewScope(
     private val sessionEndedMetricDispatcher: SessionMetricDispatcher,
     internal val key: RumScopeKey,
     eventTime: Time,
-    initialAttributes: Map<String, Any?>,
+    private val initialAttributes: Map<String, Any?>,
     private val viewChangedListener: RumViewChangedListener?,
     internal val firstPartyHostHeaderTypeResolver: FirstPartyHostHeaderTypeResolver,
     internal val cpuVitalMonitor: VitalMonitor,
@@ -252,7 +252,7 @@ internal open class RumViewScope(
             sessionEndedMetricDispatcher = sessionEndedMetricDispatcher,
             key = key,
             eventTime = newEventTime,
-            initialAttributes = eventAttributes,
+            initialAttributes = initialAttributes,
             viewChangedListener = viewChangedListener,
             firstPartyHostHeaderTypeResolver = firstPartyHostHeaderTypeResolver,
             cpuVitalMonitor = cpuVitalMonitor,

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt

@@ -8356,7 +8356,7 @@ internal class RumViewScopeTest {
         assertThat(newScope.type).isEqualTo(testedScope.type)
         assertThat(newScope.sampleRate).isEqualTo(testedScope.sampleRate)
         assertThat(newScope.url).isEqualTo(testedScope.url)
-        assertThat(newScope.eventAttributes).isEqualTo(testedScope.eventAttributes)
+        assertThat(newScope.viewAttributes).isEqualTo(testedScope.viewAttributes)
         assertThat(newScope.stoppedNanos).isEqualTo(expectedTime.nanoTime)
         assertThat(newScope.viewLoadingTime).isNull()
         assertThat(newScope.activeActionScope).isNull()

features/dd-sdk-android-trace-internal/build.gradle.kts

@@ -84,4 +84,4 @@ dependencyUpdateConfig()
 publishingConfig(
     "Internal APM support library for Android applications."
 )
-detektCustomConfig(":dd-sdk-android-core", ":dd-sdk-android-internal")
+detektCustomConfig()

integrations/dd-sdk-android-okhttp/src/test/kotlin/com/datadog/android/okhttp/internal/utils/SpanSamplingIdProviderTest.kt

@@ -6,7 +6,7 @@
 
 package com.datadog.android.okhttp.internal.utils
 
-import com.datadog.android.core.internal.utils.toHexString
+import com.datadog.android.internal.utils.toHexString
 import com.datadog.android.log.LogAttributes
 import com.datadog.opentracing.DDSpanContext
 import com.datadog.tools.unit.forge.BaseConfigurator

sample/tv/src/main/java/com/datadog/android/tv/sample/TvSampleApplication.kt

@@ -118,13 +118,15 @@ class TvSampleApplication : Application() {
 
     private fun initializeOkHttp() {
         okHttpClient = OkHttpClient.Builder()
-            .addInterceptor(DatadogInterceptor(traceSampler = RateBasedSampler(FULL_SAMPLING_RATE)))
+            .addInterceptor(
+                DatadogInterceptor.Builder(emptyMap())
+                    .setTraceSampler(RateBasedSampler(FULL_SAMPLING_RATE))
+                    .build()
+            )
             .addNetworkInterceptor(
-                TracingInterceptor(
-                    traceSampler = RateBasedSampler(
-                        FULL_SAMPLING_RATE
-                    )
-                )
+                TracingInterceptor.Builder(emptyMap())
+                    .setTraceSampler(RateBasedSampler(FULL_SAMPLING_RATE))
+                    .build()
             )
             .eventListenerFactory(DatadogEventListener.Factory())
             .build()