RUMM-2501: Use SDK v2 components in the upload pipeline

dd-sdk-android/apiSurface

@@ -1729,6 +1729,15 @@ data class com.datadog.android.v2.api.Request
   constructor(String, String, String, Map<String, String>, ByteArray, String? = null)
 interface com.datadog.android.v2.api.RequestFactory
   fun create(com.datadog.android.v2.api.context.DatadogContext, List<ByteArray>, ByteArray?): Request
+  companion object 
+    const val CONTENT_TYPE_JSON: String
+    const val CONTENT_TYPE_TEXT_UTF8: String
+    const val HEADER_API_KEY: String
+    const val HEADER_EVP_ORIGIN: String
+    const val HEADER_EVP_ORIGIN_VERSION: String
+    const val HEADER_REQUEST_ID: String
+    const val QUERY_PARAM_SOURCE: String
+    const val QUERY_PARAM_TAGS: String
 interface com.datadog.android.v2.api.SDKCore
   fun registerFeature(String, FeatureStorageConfiguration, FeatureUploadConfiguration)
   fun getFeature(String): FeatureScope?
@@ -1750,7 +1759,7 @@ enum com.datadog.android.v2.api.SDKEndpoint
 data class com.datadog.android.v2.api.context.CarrierInfo
   constructor(String?, String?)
 data class com.datadog.android.v2.api.context.DatadogContext
-  constructor(com.datadog.android.DatadogSite, String, String, String, String, String, String, TimeInfo, ProcessInfo, NetworkInfo, DeviceInfo, UserInfo, com.datadog.android.privacy.TrackingConsent, Map<String, Map<String, Any?>>)
+  constructor(com.datadog.android.DatadogSite, String, String, String, String, String, String, String, TimeInfo, ProcessInfo, NetworkInfo, DeviceInfo, UserInfo, com.datadog.android.privacy.TrackingConsent, Map<String, Map<String, Any?>>)
 data class com.datadog.android.v2.api.context.DeviceInfo
   constructor(String, String, String, DeviceType, String, String, String, String, String)
 enum com.datadog.android.v2.api.context.DeviceType

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

@@ -65,6 +65,9 @@ import com.datadog.android.rum.internal.ndk.NdkNetworkInfoDataWriter
 import com.datadog.android.rum.internal.ndk.NdkUserInfoDataWriter
 import com.datadog.android.rum.internal.ndk.NoOpNdkCrashHandler
 import com.datadog.android.security.Encryption
+import com.datadog.android.v2.core.internal.ContextProvider
+import com.datadog.android.v2.core.internal.DatadogContextProvider
+import com.datadog.android.v2.core.internal.NoOpContextProvider
 import com.lyft.kronos.AndroidClockFactory
 import com.lyft.kronos.KronosClock
 import java.io.File
@@ -94,6 +97,7 @@ internal class CoreFeature {
     internal var timeProvider: TimeProvider = NoOpTimeProvider()
     internal var trackingConsentProvider: ConsentProvider = NoOpConsentProvider()
     internal var userInfoProvider: MutableUserInfoProvider = NoOpMutableUserInfoProvider()
+    internal var contextProvider: ContextProvider = NoOpContextProvider()
 
     internal lateinit var okHttpClient: OkHttpClient
     internal lateinit var kronosClock: KronosClock
@@ -160,6 +164,7 @@ internal class CoreFeature {
         prepareNdkCrashData()
         setupInfoProviders(appContext, consent)
         initialized.set(true)
+        contextProvider = DatadogContextProvider(this)
     }
 
     fun stop() {
@@ -186,6 +191,7 @@ internal class CoreFeature {
             initialized.set(false)
             ndkCrashHandler = NoOpNdkCrashHandler()
             trackingConsentProvider = NoOpConsentProvider()
+            contextProvider = NoOpContextProvider()
         }
     }
 

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

@@ -10,16 +10,19 @@ package com.datadog.android.core.internal
 
 import android.content.Context
 import com.datadog.android.core.configuration.Configuration
-import com.datadog.android.core.internal.data.upload.DataUploadScheduler
 import com.datadog.android.core.internal.data.upload.NoOpUploadScheduler
 import com.datadog.android.core.internal.data.upload.UploadScheduler
-import com.datadog.android.core.internal.net.DataUploader
-import com.datadog.android.core.internal.net.NoOpDataUploader
 import com.datadog.android.core.internal.persistence.NoOpPersistenceStrategy
 import com.datadog.android.core.internal.persistence.PersistenceStrategy
 import com.datadog.android.core.internal.privacy.ConsentProvider
+import com.datadog.android.core.internal.utils.sdkLogger
 import com.datadog.android.plugin.DatadogPlugin
 import com.datadog.android.plugin.DatadogPluginConfig
+import com.datadog.android.v2.api.RequestFactory
+import com.datadog.android.v2.core.internal.data.upload.DataUploadScheduler
+import com.datadog.android.v2.core.internal.net.DataOkHttpUploader
+import com.datadog.android.v2.core.internal.net.DataUploader
+import com.datadog.android.v2.core.internal.net.NoOpDataUploader
 import java.util.concurrent.atomic.AtomicBoolean
 
 @Suppress("TooManyFunctions")
@@ -109,7 +112,7 @@ internal abstract class SdkFeature<T : Any, C : Configuration.Feature>(
         configuration: C
     ): PersistenceStrategy<T>
 
-    abstract fun createUploader(configuration: C): DataUploader
+    abstract fun createRequestFactory(configuration: C): RequestFactory
 
     // endregion
 
@@ -136,10 +139,18 @@ internal abstract class SdkFeature<T : Any, C : Configuration.Feature>(
 
     private fun setupUploader(configuration: C) {
         uploadScheduler = if (coreFeature.isMainProcess) {
-            uploader = createUploader(configuration)
+            val requestFactory = createRequestFactory(configuration)
+            uploader = DataOkHttpUploader(
+                requestFactory,
+                internalLogger = sdkLogger,
+                callFactory = coreFeature.okHttpClient,
+                sdkVersion = coreFeature.sdkVersion,
+                androidInfoProvider = coreFeature.androidInfoProvider
+            )
             DataUploadScheduler(
-                persistenceStrategy.getReader(),
+                persistenceStrategy.getStorage(),
                 uploader,
+                coreFeature.contextProvider,
                 coreFeature.networkInfoProvider,
                 coreFeature.systemInfoProvider,
                 coreFeature.uploadFrequency,

dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/data/upload/UploadWorker.kt

@@ -88,7 +88,7 @@ internal class UploadWorker(
             @Suppress("UnsafeThirdPartyFunctionCall") // safe to create, argument is not negative
             val lock = CountDownLatch(1)
 
-            storage.readNextBatch(context, noBatchCallback = {
+            storage.readNextBatch(noBatchCallback = {
                 lock.countDown()
             }) { batchId, reader ->
                 val batch = reader.read()

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

@@ -6,7 +6,8 @@
 
 package com.datadog.android.core.internal.persistence
 
-import com.datadog.android.core.internal.data.upload.Flusher
+import com.datadog.android.v2.core.internal.data.upload.Flusher
+import com.datadog.android.v2.core.internal.storage.Storage
 import com.datadog.tools.annotation.NoOpImplementation
 
 /**
@@ -21,4 +22,6 @@ internal interface PersistenceStrategy<T : Any> {
     fun getReader(): DataReader
 
     fun getFlusher(): Flusher
+
+    fun getStorage(): Storage
 }

dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFilePersistenceStrategy.kt

@@ -6,26 +6,36 @@
 
 package com.datadog.android.core.internal.persistence.file.batch
 
-import com.datadog.android.core.internal.data.upload.DataFlusher
-import com.datadog.android.core.internal.data.upload.Flusher
 import com.datadog.android.core.internal.persistence.DataReader
 import com.datadog.android.core.internal.persistence.DataWriter
 import com.datadog.android.core.internal.persistence.PayloadDecoration
 import com.datadog.android.core.internal.persistence.PersistenceStrategy
 import com.datadog.android.core.internal.persistence.Serializer
 import com.datadog.android.core.internal.persistence.file.FileMover
 import com.datadog.android.core.internal.persistence.file.FileOrchestrator
+import com.datadog.android.core.internal.persistence.file.FilePersistenceConfig
+import com.datadog.android.core.internal.persistence.file.FileReaderWriter
+import com.datadog.android.core.internal.persistence.file.advanced.ConsentAwareFileOrchestrator
 import com.datadog.android.core.internal.persistence.file.advanced.ScheduledWriter
 import com.datadog.android.log.Logger
+import com.datadog.android.v2.api.NoOpBatchWriterListener
+import com.datadog.android.v2.api.NoOpInternalLogger
+import com.datadog.android.v2.core.internal.ContextProvider
+import com.datadog.android.v2.core.internal.data.upload.DataFlusher
+import com.datadog.android.v2.core.internal.data.upload.Flusher
+import com.datadog.android.v2.core.internal.storage.ConsentAwareStorage
+import com.datadog.android.v2.core.internal.storage.Storage
 import java.util.concurrent.ExecutorService
 
 internal open class BatchFilePersistenceStrategy<T : Any>(
-    private val fileOrchestrator: FileOrchestrator,
+    private val contextProvider: ContextProvider,
+    private val fileOrchestrator: ConsentAwareFileOrchestrator,
     private val executorService: ExecutorService,
     serializer: Serializer<T>,
-    private val payloadDecoration: PayloadDecoration,
-    internalLogger: Logger,
+    payloadDecoration: PayloadDecoration,
+    internal val internalLogger: Logger,
     internal val fileReaderWriter: BatchFileReaderWriter,
+    internal val metadataFileReaderWriter: FileReaderWriter,
     val fileMover: FileMover
 ) : PersistenceStrategy<T> {
 
@@ -57,7 +67,13 @@ internal open class BatchFilePersistenceStrategy<T : Any>(
     }
 
     override fun getFlusher(): Flusher {
-        return DataFlusher(fileOrchestrator, payloadDecoration, fileReaderWriter, fileMover)
+        return DataFlusher(
+            contextProvider,
+            fileOrchestrator,
+            fileReaderWriter,
+            metadataFileReaderWriter,
+            fileMover
+        )
     }
 
     // endregion
@@ -82,5 +98,20 @@ internal open class BatchFilePersistenceStrategy<T : Any>(
         )
     }
 
+    override fun getStorage(): Storage {
+        return ConsentAwareStorage(
+            grantedOrchestrator = fileOrchestrator.grantedOrchestrator,
+            pendingOrchestrator = fileOrchestrator.pendingOrchestrator,
+            batchEventsReaderWriter = fileReaderWriter,
+            batchMetadataReaderWriter = metadataFileReaderWriter,
+            fileMover = fileMover,
+            // TODO RUMM-2504 register listener
+            listener = NoOpBatchWriterListener(),
+            // TODO RUMM-0000 create internal logger
+            internalLogger = NoOpInternalLogger(),
+            filePersistenceConfig = FilePersistenceConfig()
+        )
+    }
+
     //
 }

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

@@ -8,6 +8,7 @@ package com.datadog.android.error.internal
 
 import com.datadog.android.core.internal.persistence.PayloadDecoration
 import com.datadog.android.core.internal.persistence.file.FileMover
+import com.datadog.android.core.internal.persistence.file.FileReaderWriter
 import com.datadog.android.core.internal.persistence.file.advanced.FeatureFileOrchestrator
 import com.datadog.android.core.internal.persistence.file.batch.BatchFilePersistenceStrategy
 import com.datadog.android.core.internal.persistence.file.batch.BatchFileReaderWriter
@@ -17,16 +18,19 @@ import com.datadog.android.log.Logger
 import com.datadog.android.log.internal.domain.event.LogEventSerializer
 import com.datadog.android.log.model.LogEvent
 import com.datadog.android.security.Encryption
+import com.datadog.android.v2.core.internal.ContextProvider
 import java.io.File
 import java.util.concurrent.ExecutorService
 
 internal class CrashReportFilePersistenceStrategy(
+    contextProvider: ContextProvider,
     consentProvider: ConsentProvider,
     storageDir: File,
     executorService: ExecutorService,
     internalLogger: Logger,
     localDataEncryption: Encryption?
 ) : BatchFilePersistenceStrategy<LogEvent>(
+    contextProvider,
     FeatureFileOrchestrator(
         consentProvider,
         storageDir,
@@ -39,5 +43,6 @@ internal class CrashReportFilePersistenceStrategy(
     PayloadDecoration.JSON_ARRAY_DECORATION,
     sdkLogger,
     BatchFileReaderWriter.create(sdkLogger, localDataEncryption),
+    FileReaderWriter.create(sdkLogger, localDataEncryption),
     FileMover(sdkLogger)
 )

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

@@ -10,12 +10,12 @@ import android.content.Context
 import com.datadog.android.core.configuration.Configuration
 import com.datadog.android.core.internal.CoreFeature
 import com.datadog.android.core.internal.SdkFeature
-import com.datadog.android.core.internal.net.DataUploader
 import com.datadog.android.core.internal.persistence.PersistenceStrategy
 import com.datadog.android.core.internal.utils.sdkLogger
 import com.datadog.android.log.internal.domain.DatadogLogGenerator
-import com.datadog.android.log.internal.net.LogsOkHttpUploaderV2
 import com.datadog.android.log.model.LogEvent
+import com.datadog.android.v2.api.RequestFactory
+import com.datadog.android.v2.log.internal.net.LogsRequestFactory
 
 internal class CrashReportsFeature(
     coreFeature: CoreFeature
@@ -38,6 +38,7 @@ internal class CrashReportsFeature(
         configuration: Configuration.Feature.CrashReport
     ): PersistenceStrategy<LogEvent> {
         return CrashReportFilePersistenceStrategy(
+            coreFeature.contextProvider,
             coreFeature.trackingConsentProvider,
             coreFeature.storageDir,
             coreFeature.persistenceExecutorService,
@@ -46,19 +47,12 @@ internal class CrashReportsFeature(
         )
     }
 
-    override fun createUploader(configuration: Configuration.Feature.CrashReport): DataUploader {
-        return LogsOkHttpUploaderV2(
-            configuration.endpointUrl,
-            coreFeature.clientToken,
-            coreFeature.sourceName,
-            coreFeature.sdkVersion,
-            coreFeature.okHttpClient,
-            coreFeature.androidInfoProvider,
-            sdkLogger
-        )
+    override fun createRequestFactory(configuration: Configuration.Feature.CrashReport):
+        RequestFactory {
+        return LogsRequestFactory(configuration.endpointUrl)
     }
 
-    override fun onPostInitialized(context: Context) { }
+    override fun onPostInitialized(context: Context) {}
 
     // endregion
 

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

@@ -10,12 +10,12 @@ import android.content.Context
 import com.datadog.android.core.configuration.Configuration
 import com.datadog.android.core.internal.CoreFeature
 import com.datadog.android.core.internal.SdkFeature
-import com.datadog.android.core.internal.net.DataUploader
 import com.datadog.android.core.internal.persistence.PersistenceStrategy
 import com.datadog.android.core.internal.utils.sdkLogger
 import com.datadog.android.log.internal.domain.LogFilePersistenceStrategy
-import com.datadog.android.log.internal.net.LogsOkHttpUploaderV2
 import com.datadog.android.log.model.LogEvent
+import com.datadog.android.v2.api.RequestFactory
+import com.datadog.android.v2.log.internal.net.LogsRequestFactory
 
 internal class LogsFeature(
     coreFeature: CoreFeature
@@ -28,6 +28,7 @@ internal class LogsFeature(
         configuration: Configuration.Feature.Logs
     ): PersistenceStrategy<LogEvent> {
         return LogFilePersistenceStrategy(
+            coreFeature.contextProvider,
             coreFeature.trackingConsentProvider,
             coreFeature.storageDir,
             coreFeature.persistenceExecutorService,
@@ -37,19 +38,11 @@ internal class LogsFeature(
         )
     }
 
-    override fun createUploader(configuration: Configuration.Feature.Logs): DataUploader {
-        return LogsOkHttpUploaderV2(
-            configuration.endpointUrl,
-            coreFeature.clientToken,
-            coreFeature.sourceName,
-            coreFeature.sdkVersion,
-            coreFeature.okHttpClient,
-            coreFeature.androidInfoProvider,
-            sdkLogger
-        )
+    override fun createRequestFactory(configuration: Configuration.Feature.Logs): RequestFactory {
+        return LogsRequestFactory(configuration.endpointUrl)
     }
 
-    override fun onPostInitialized(context: Context) { }
+    override fun onPostInitialized(context: Context) {}
 
     // endregion
 

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

@@ -8,6 +8,7 @@ package com.datadog.android.log.internal.domain
 
 import com.datadog.android.core.internal.persistence.PayloadDecoration
 import com.datadog.android.core.internal.persistence.file.FileMover
+import com.datadog.android.core.internal.persistence.file.FileReaderWriter
 import com.datadog.android.core.internal.persistence.file.advanced.FeatureFileOrchestrator
 import com.datadog.android.core.internal.persistence.file.batch.BatchFilePersistenceStrategy
 import com.datadog.android.core.internal.persistence.file.batch.BatchFileReaderWriter
@@ -21,29 +22,32 @@ import com.datadog.android.log.internal.domain.event.LogEventMapperWrapper
 import com.datadog.android.log.internal.domain.event.LogEventSerializer
 import com.datadog.android.log.model.LogEvent
 import com.datadog.android.security.Encryption
+import com.datadog.android.v2.core.internal.ContextProvider
 import java.io.File
 import java.util.concurrent.ExecutorService
 
 internal class LogFilePersistenceStrategy(
+    contextProvider: ContextProvider,
     consentProvider: ConsentProvider,
     storageDir: File,
     executorService: ExecutorService,
     internalLogger: Logger,
     logEventMapper: EventMapper<LogEvent>,
     localDataEncryption: Encryption?
-) :
-    BatchFilePersistenceStrategy<LogEvent>(
-        FeatureFileOrchestrator(
-            consentProvider,
-            storageDir,
-            LogsFeature.LOGS_FEATURE_NAME,
-            executorService,
-            internalLogger
-        ),
+) : BatchFilePersistenceStrategy<LogEvent>(
+    contextProvider,
+    FeatureFileOrchestrator(
+        consentProvider,
+        storageDir,
+        LogsFeature.LOGS_FEATURE_NAME,
         executorService,
-        MapperSerializer(LogEventMapperWrapper(logEventMapper), LogEventSerializer()),
-        PayloadDecoration.JSON_ARRAY_DECORATION,
-        sdkLogger,
-        BatchFileReaderWriter.create(sdkLogger, localDataEncryption),
-        FileMover(internalLogger)
-    )
+        internalLogger
+    ),
+    executorService,
+    MapperSerializer(LogEventMapperWrapper(logEventMapper), LogEventSerializer()),
+    PayloadDecoration.JSON_ARRAY_DECORATION,
+    sdkLogger,
+    BatchFileReaderWriter.create(sdkLogger, localDataEncryption),
+    FileReaderWriter.create(sdkLogger, localDataEncryption),
+    FileMover(internalLogger)
+)