Merge pull request #2245 from DataDog/release/2.13.0

Release/2.13.0

Author: xgouchet

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

@@ -183,12 +183,16 @@ internal class DataOkHttpUploader(
     ): UploadStatus {
         return when (code) {
             HTTP_ACCEPTED -> UploadStatus.Success(code)
-            HTTP_BAD_REQUEST -> UploadStatus.HttpClientError(code)
-            HTTP_UNAUTHORIZED -> UploadStatus.InvalidTokenError(code)
+
+            HTTP_UNAUTHORIZED,
             HTTP_FORBIDDEN -> UploadStatus.InvalidTokenError(code)
-            HTTP_CLIENT_TIMEOUT -> UploadStatus.HttpClientRateLimiting(code)
-            HTTP_ENTITY_TOO_LARGE -> UploadStatus.HttpClientError(code)
+
+            HTTP_CLIENT_TIMEOUT,
             HTTP_TOO_MANY_REQUESTS -> UploadStatus.HttpClientRateLimiting(code)
+
+            HTTP_BAD_REQUEST,
+            HTTP_ENTITY_TOO_LARGE -> UploadStatus.HttpClientError(code)
+
             HTTP_INTERNAL_ERROR,
             HTTP_BAD_GATEWAY,
             HTTP_UNAVAILABLE,

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

@@ -15,6 +15,7 @@ internal sealed class UploadStatus(
 ) {
 
     internal class Success(responseCode: Int) : UploadStatus(shouldRetry = false, code = responseCode)
+
     internal class NetworkError(throwable: Throwable) : UploadStatus(shouldRetry = true, throwable = throwable)
     internal class DNSError(throwable: Throwable) : UploadStatus(shouldRetry = true, throwable = throwable)
     internal class RequestCreationError(throwable: Throwable?) :
@@ -26,6 +27,7 @@ internal sealed class UploadStatus(
     internal class HttpServerError(responseCode: Int) : UploadStatus(shouldRetry = true, code = responseCode)
     internal class HttpClientRateLimiting(responseCode: Int) : UploadStatus(shouldRetry = true, code = responseCode)
     internal class UnknownHttpError(responseCode: Int) : UploadStatus(shouldRetry = false, code = responseCode)
+
     internal class UnknownException(throwable: Throwable) : UploadStatus(shouldRetry = true, throwable = throwable)
 
     internal object UnknownStatus : UploadStatus(shouldRetry = false, code = UNKNOWN_RESPONSE_CODE)

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

@@ -97,8 +97,10 @@ internal class UploadWorker(
                     RemovalReason.IntakeCode(uploadStatus.code),
                     deleteBatch = !uploadStatus.shouldRetry
                 )
-                @Suppress("UnsafeThirdPartyFunctionCall") // safe to add
-                taskQueue.offer(UploadNextBatchTask(taskQueue, sdkCore, feature))
+                if (uploadStatus is UploadStatus.Success) {
+                    @Suppress("UnsafeThirdPartyFunctionCall") // safe to add
+                    taskQueue.offer(UploadNextBatchTask(taskQueue, sdkCore, feature))
+                }
             }
         }
 

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

@@ -11,7 +11,7 @@ internal sealed class RemovalReason {
     internal fun includeInMetrics(): Boolean {
         return this !is Flushed
     }
-    internal class IntakeCode(private val responseCode: Int) : RemovalReason() {
+    internal data class IntakeCode(private val responseCode: Int) : RemovalReason() {
         override fun toString(): String {
             return "intake-code-$responseCode"
         }