RUMM-407 Use app package name as default service name value

dd-sdk-android/apiSurface

@@ -27,7 +27,6 @@ class com.datadog.android.DatadogConfig
     fun useCustomRumEndpoint(String): Builder
     fun trackGestures(Array<com.datadog.android.rum.tracking.ViewAttributesProvider> = emptyArray()): Builder
     fun useViewTrackingStrategy(com.datadog.android.rum.tracking.ViewTrackingStrategy): Builder
-  companion object
 object com.datadog.android.DatadogEndpoint
   const val LOGS_US: String
   const val LOGS_EU: String

dd-sdk-android/src/main/kotlin/com/datadog/android/Datadog.kt

@@ -87,7 +87,7 @@ object Datadog {
         val appContext = context.applicationContext
 
         // always initialize Core Features first
-        CoreFeature.initialize(appContext, config.needsClearTextHttp)
+        CoreFeature.initialize(appContext, config.coreConfig)
 
         config.logsConfig?.let { featureConfig ->
             LogsFeature.initialize(

dd-sdk-android/src/main/kotlin/com/datadog/android/DatadogConfig.kt

@@ -23,26 +23,29 @@ import java.util.UUID
  */
 class DatadogConfig
 private constructor(
-    internal val needsClearTextHttp: Boolean,
     internal val logsConfig: FeatureConfig?,
     internal val tracesConfig: FeatureConfig?,
     internal val crashReportConfig: FeatureConfig?,
-    internal val rumConfig: RumConfig?
+    internal val rumConfig: RumConfig?,
+    internal var coreConfig: CoreConfig
 ) {
 
+    internal data class CoreConfig(
+        var needsClearTextHttp: Boolean = false,
+        val serviceName: String? = null
+    )
+
     internal data class FeatureConfig(
         val clientToken: String,
         val applicationId: UUID,
         val endpointUrl: String,
-        val serviceName: String,
         val envName: String
     )
 
     internal data class RumConfig(
         val clientToken: String,
         val applicationId: UUID,
         val endpointUrl: String,
-        val serviceName: String,
         val envName: String,
         val gesturesTracker: GesturesTracker? = null,
         val userActionTrackingStrategy: UserActionTrackingStrategy? = null,
@@ -71,7 +74,7 @@ private constructor(
          * (e.g. "staging" vs. "production").
          */
         constructor(clientToken: String, envName: String) :
-                this(clientToken, envName, UUID(0, 0))
+            this(clientToken, envName, UUID(0, 0))
 
         /**
          * A Builder class for a [DatadogConfig].
@@ -82,54 +85,51 @@ private constructor(
          * @param applicationId your applicationId for RUM events
          */
         constructor(clientToken: String, envName: String, applicationId: String) :
-                this(clientToken, envName, UUID.fromString(applicationId))
+            this(clientToken, envName, UUID.fromString(applicationId))
 
         private var logsConfig: FeatureConfig = FeatureConfig(
             clientToken,
             applicationId,
             DatadogEndpoint.LOGS_US,
-            DEFAULT_SERVICE_NAME,
             envName
         )
         private var tracesConfig: FeatureConfig = FeatureConfig(
             clientToken,
             applicationId,
             DatadogEndpoint.TRACES_US,
-            DEFAULT_SERVICE_NAME,
             envName
         )
         private var crashReportConfig: FeatureConfig = FeatureConfig(
             clientToken,
             applicationId,
             DatadogEndpoint.LOGS_US,
-            DEFAULT_SERVICE_NAME,
             envName
         )
         private var rumConfig: RumConfig = RumConfig(
             clientToken,
             applicationId,
             DatadogEndpoint.RUM_US,
-            DEFAULT_SERVICE_NAME,
             envName
         )
 
+        private var coreConfig = CoreConfig()
+
         private var logsEnabled: Boolean = true
         private var tracesEnabled: Boolean = true
         private var crashReportsEnabled: Boolean = true
         private var rumEnabled: Boolean = applicationId != UUID(0, 0)
-        private var needsClearTextHttp: Boolean = false
 
         /**
          * Builds a [DatadogConfig] based on the current state of this Builder.
          */
         fun build(): DatadogConfig {
 
             return DatadogConfig(
-                needsClearTextHttp = needsClearTextHttp,
                 logsConfig = if (logsEnabled) logsConfig else null,
                 tracesConfig = if (tracesEnabled) tracesConfig else null,
                 crashReportConfig = if (crashReportsEnabled) crashReportConfig else null,
-                rumConfig = if (rumEnabled) rumConfig else null
+                rumConfig = if (rumEnabled) rumConfig else null,
+                coreConfig = coreConfig
             )
         }
 
@@ -182,10 +182,7 @@ private constructor(
          * @param serviceName the service name (default = "android")
          */
         fun setServiceName(serviceName: String): Builder {
-            logsConfig = logsConfig.copy(serviceName = serviceName)
-            tracesConfig = tracesConfig.copy(serviceName = serviceName)
-            crashReportConfig = crashReportConfig.copy(serviceName = serviceName)
-            rumConfig = rumConfig.copy(serviceName = serviceName)
+            coreConfig = coreConfig.copy(serviceName = serviceName)
             return this
         }
 
@@ -215,7 +212,7 @@ private constructor(
             tracesConfig = tracesConfig.copy(endpointUrl = DatadogEndpoint.TRACES_EU)
             crashReportConfig = crashReportConfig.copy(endpointUrl = DatadogEndpoint.LOGS_EU)
             rumConfig = rumConfig.copy(endpointUrl = DatadogEndpoint.RUM_EU)
-            needsClearTextHttp = false
+            coreConfig = coreConfig.copy(needsClearTextHttp = false)
             return this
         }
 
@@ -229,7 +226,7 @@ private constructor(
             tracesConfig = tracesConfig.copy(endpointUrl = DatadogEndpoint.TRACES_US)
             crashReportConfig = crashReportConfig.copy(endpointUrl = DatadogEndpoint.LOGS_US)
             rumConfig = rumConfig.copy(endpointUrl = DatadogEndpoint.RUM_US)
-            needsClearTextHttp = false
+            coreConfig = coreConfig.copy(needsClearTextHttp = false)
             return this
         }
 
@@ -305,14 +302,14 @@ private constructor(
 
         private fun checkCustomEndpoint(endpoint: String) {
             if (endpoint.startsWith("http://")) {
-                needsClearTextHttp = true
+                coreConfig = coreConfig.copy(needsClearTextHttp = true)
             }
         }
 
         private fun provideUserTrackingStrategy(
             gesturesTracker: GesturesTracker
         ):
-                UserActionTrackingStrategy {
+            UserActionTrackingStrategy {
             return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 GesturesTrackingStrategyApi29(gesturesTracker)
             } else {
@@ -322,8 +319,4 @@ private constructor(
     }
 
     // endregion
-
-    companion object {
-        internal const val DEFAULT_SERVICE_NAME = "android"
-    }
 }

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

@@ -8,6 +8,7 @@ package com.datadog.android.core.internal
 
 import android.content.Context
 import android.os.Build
+import com.datadog.android.DatadogConfig
 import com.datadog.android.core.internal.net.GzipRequestInterceptor
 import com.datadog.android.core.internal.net.NetworkTimeInterceptor
 import com.datadog.android.core.internal.net.info.BroadcastReceiverNetworkInfoProvider
@@ -56,25 +57,27 @@ internal object CoreFeature {
 
     internal var packageName: String = ""
     internal var packageVersion: String = ""
+    internal var serviceName: String = ""
 
     internal lateinit var dataUploadScheduledExecutor: ScheduledThreadPoolExecutor
     internal lateinit var dataPersistenceExecutorService: ExecutorService
 
     fun initialize(
         appContext: Context,
-        needsClearTextHttp: Boolean
+        config: DatadogConfig.CoreConfig
     ) {
         if (initialized.get()) {
             return
         }
 
+        serviceName = config.serviceName ?: appContext.packageName
         contextRef = WeakReference(appContext)
 
         readApplicationInformation(appContext)
 
         setupInfoProviders(appContext)
 
-        setupOkHttpClient(needsClearTextHttp)
+        setupOkHttpClient(config.needsClearTextHttp)
         dataUploadScheduledExecutor = ScheduledThreadPoolExecutor(CORE_DEFAULT_POOL_SIZE)
         dataPersistenceExecutorService =
             ThreadPoolExecutor(
@@ -99,6 +102,9 @@ internal object CoreFeature {
             systemInfoProvider = NoOpSystemInfoProvider()
             networkInfoProvider = NoOpNetworkInfoProvider()
             userInfoProvider = NoOpMutableUserInfoProvider()
+            serviceName = ""
+            packageName = ""
+            packageVersion = ""
             shutDownExecutors()
             initialized.set(false)
         }

dd-sdk-android/src/main/kotlin/com/datadog/android/error/internal/CrashReportsFeature.kt

@@ -32,7 +32,6 @@ internal object CrashReportsFeature {
 
     internal var clientToken: String = ""
     internal var endpointUrl: String = DatadogEndpoint.LOGS_US
-    internal var serviceName: String = DatadogConfig.DEFAULT_SERVICE_NAME
     internal var envName: String = ""
         set(value) {
             field = value
@@ -67,7 +66,6 @@ internal object CrashReportsFeature {
 
         clientToken = config.clientToken
         endpointUrl = config.endpointUrl
-        serviceName = config.serviceName
         envName = config.envName
 
         persistenceStrategy = CrashLogFileStrategy(appContext)
@@ -94,7 +92,6 @@ internal object CrashReportsFeature {
             clientToken = ""
             envName = ""
             endpointUrl = DatadogEndpoint.LOGS_US
-            serviceName = DatadogConfig.DEFAULT_SERVICE_NAME
 
             initialized.set(false)
         }
@@ -137,10 +134,4 @@ internal object CrashReportsFeature {
     }
 
     // endregion
-
-    // region Constants
-
-    internal const val CRASH_REPORTS_UPLOAD_THREAD_NAME = "ddog-crash-upload"
-
-    // endregion
 }

dd-sdk-android/src/main/kotlin/com/datadog/android/error/internal/DatadogExceptionHandler.kt

@@ -7,6 +7,7 @@
 package com.datadog.android.error.internal
 
 import android.content.Context
+import com.datadog.android.core.internal.CoreFeature
 import com.datadog.android.core.internal.data.Writer
 import com.datadog.android.core.internal.net.info.NetworkInfoProvider
 import com.datadog.android.core.internal.time.TimeProvider
@@ -61,7 +62,7 @@ internal class DatadogExceptionHandler(
 
     private fun createLog(thread: Thread, throwable: Throwable): Log {
         return Log(
-            serviceName = CrashReportsFeature.serviceName,
+            serviceName = CoreFeature.serviceName,
             level = Log.CRASH,
             loggerName = LOGGER_NAME,
             message = MESSAGE,

dd-sdk-android/src/main/kotlin/com/datadog/android/log/Logger.kt

@@ -173,7 +173,7 @@ internal constructor(private val handler: LogHandler) {
      */
     class Builder {
 
-        private var serviceName: String = LogsFeature.serviceName
+        private var serviceName: String = CoreFeature.serviceName
         private var datadogLogsEnabled: Boolean = true
         private var logcatLogsEnabled: Boolean = false
         private var networkInfoEnabled: Boolean = false

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

@@ -32,7 +32,6 @@ internal object LogsFeature {
 
     internal var clientToken: String = ""
     internal var endpointUrl: String = DatadogEndpoint.LOGS_US
-    internal var serviceName: String = DatadogConfig.DEFAULT_SERVICE_NAME
     internal var envName: String = ""
         set(value) {
             field = value
@@ -65,7 +64,6 @@ internal object LogsFeature {
 
         clientToken = config.clientToken
         endpointUrl = config.endpointUrl
-        serviceName = config.serviceName
         envName = config.envName
 
         persistenceStrategy = LogFileStrategy(
@@ -95,7 +93,6 @@ internal object LogsFeature {
             clientToken = ""
             envName = ""
             endpointUrl = DatadogEndpoint.LOGS_US
-            serviceName = DatadogConfig.DEFAULT_SERVICE_NAME
 
             initialized.set(false)
         }

dd-sdk-android/src/main/kotlin/com/datadog/android/rum/internal/RumFeature.kt

@@ -48,7 +48,6 @@ internal object RumFeature {
 
     internal var clientToken: String = ""
     internal var endpointUrl: String = DatadogEndpoint.RUM_US
-    internal var serviceName: String = DatadogConfig.DEFAULT_SERVICE_NAME
     internal var envName: String = ""
     internal var applicationId: UUID = UUID(0, 0)
 
@@ -83,7 +82,6 @@ internal object RumFeature {
 
         clientToken = config.clientToken
         endpointUrl = config.endpointUrl
-        serviceName = config.serviceName
         envName = config.envName
 
         config.gesturesTracker?.let { gesturesTracker = it }
@@ -120,7 +118,6 @@ internal object RumFeature {
             dataUploadScheduler = NoOpUploadScheduler()
             clientToken = ""
             endpointUrl = DatadogEndpoint.RUM_US
-            serviceName = DatadogConfig.DEFAULT_SERVICE_NAME
             envName = ""
             // reset rum monitor to NoOp and reset the flag
             GlobalRum.isRegistered.set(false)

dd-sdk-android/src/main/kotlin/com/datadog/android/tracing/AndroidTracer.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.android.tracing
 
+import com.datadog.android.core.internal.CoreFeature
 import com.datadog.android.log.LogAttributes
 import com.datadog.android.log.Logger
 import com.datadog.android.rum.GlobalRum
@@ -66,7 +67,7 @@ class AndroidTracer internal constructor(
     class Builder {
 
         private var bundleWithRumEnabled: Boolean = true
-        private var serviceName: String = TracesFeature.serviceName
+        private var serviceName: String = CoreFeature.serviceName
         private var partialFlushThreshold = DEFAULT_PARTIAL_MIN_FLUSH
         private var random: Random = SecureRandom()
         private val logsHandler: LogHandler

dd-sdk-android/src/main/kotlin/com/datadog/android/tracing/internal/TracesFeature.kt

@@ -34,7 +34,6 @@ internal object TracesFeature {
 
     internal var clientToken: String = ""
     internal var endpointUrl: String = DatadogEndpoint.TRACES_US
-    internal var serviceName: String = DatadogConfig.DEFAULT_SERVICE_NAME
 
     internal var persistenceStrategy: PersistenceStrategy<DDSpan> = NoOpPersistenceStrategy()
     internal var uploader: DataUploader = NoOpDataUploader()
@@ -58,7 +57,6 @@ internal object TracesFeature {
 
         clientToken = config.clientToken
         endpointUrl = config.endpointUrl
-        serviceName = config.serviceName
         val envSuffix = if (config.envName.isEmpty()) "" else ", \"env\": \"${config.envName}\""
 
         persistenceStrategy = TracingFileStrategy(
@@ -87,7 +85,6 @@ internal object TracesFeature {
             dataUploadScheduler = NoOpUploadScheduler()
             clientToken = ""
             endpointUrl = DatadogEndpoint.TRACES_US
-            serviceName = DatadogConfig.DEFAULT_SERVICE_NAME
             initialized.set(false)
         }
     }