Merge pull request #2104 from DataDog/xgouchet/RUM-4822/prepare_release

RUM-4822 Prepare debug build
DataDog · Jun 24, 2024 · ece1a60 · ece1a60
2 parents ded9b52 + 5b64821
commit ece1a60
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
@@ -19,7 +19,7 @@ object AndroidConfig {
     const val MIN_SDK_FOR_WEAR = 23
     const val BUILD_TOOLS_VERSION = "34.0.0"
 
-    val VERSION = Version(2, 11, 0, Version.Type.Snapshot)
+    val VERSION = Version(2, 11, 0, Version.Type.Release)
 }
 
 // TODO RUM-628 Switch to Java 17 bytecode

diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt
@@ -49,7 +49,7 @@ fun Project.publishingConfig(projectDescription: String) {
 
                 groupId = MavenConfig.GROUP_ID
                 artifactId = projectName
-                version = AndroidConfig.VERSION.name
+                version = AndroidConfig.VERSION.name + "-debug"
 
                 pom {
                     name.set(projectName)

diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
@@ -230,10 +230,13 @@ class SampleApplication : Application() {
             }
             .setResourceEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
-                if (KEEP_UPLOAD_REQUEST_AS_RESOURCES) {
-                    event
-                } else {
+                val isDdResource = event.resource.url.contains(
+                    DatadogSite.valueOf(BuildConfig.DD_SITE_NAME).intakeEndpoint
+                )
+                if (isDdResource && !KEEP_UPLOAD_REQUEST_AS_RESOURCES) {
                     null
+                } else {
+                    event
                 }
             }
             .setErrorEventMapper { event ->