Merge pull request #3592 from DataDog/abrooks/merge-develop-css

Merge develop into feature/client-side-stats

Author: abrooksv

.github/CODEOWNERS

@@ -6,3 +6,8 @@
 
 /docs/ @DataDog/documentation @DataDog/rum-mobile 
 *README.md @DataDog/documentation @DataDog/rum-mobile 
+
+## Feature Flags
+
+/features/dd-sdk-android-flags-openfeature/ @DataDog/rum-mobile @DataDog/rum-mobile-android @DataDog/feature-flags-sdks
+/features/dd-sdk-android-flags-openfeature/README.md @DataDog/documentation @DataDog/rum-mobile @DataDog/rum-mobile-android @DataDog/feature-flags-sdks

.gitlab-ci.yml

@@ -10,7 +10,7 @@ variables:
   DD_COMMON_AGENT_CONFIG: "dd.env=ci,dd.trace.enabled=false,dd.jmx.fetch.enabled=false"
 
   KUBERNETES_MEMORY_REQUEST: "8Gi"
-  KUBERNETES_MEMORY_LIMIT: "13Gi"
+  KUBERNETES_MEMORY_LIMIT: "32Gi"
 
   EMULATOR_NAME: "android_emulator"
   ANDROID_ARCH: "arm64-v8a"

CHANGELOG.md

@@ -1,3 +1,49 @@
+# 3.11.0 / 2026-06-16
+
+* [FEATURE] Support `addEvent` for OpenTelemetry spans (logging events). See [#3377](https://github.com/DataDog/dd-sdk-android/pull/3377)
+* [FEATURE] Add cross-product sampling rebasing for RUM-to-APM correlation. See [#3402](https://github.com/DataDog/dd-sdk-android/pull/3402)
+* [FEATURE] Report carrier info on Android API 24+. See [#3449](https://github.com/DataDog/dd-sdk-android/pull/3449)
+* [FEATURE] Add trace sampling decision to `DatadogEventBridge`. See [#3495](https://github.com/DataDog/dd-sdk-android/pull/3495)
+* [IMPROVEMENT] Preserve custom `DeterministicTraceSampler` subclasses from rebasing. See [#3455](https://github.com/DataDog/dd-sdk-android/pull/3455)
+* [IMPROVEMENT] Rename `last_failure_status` to `retry_after`. See [#3459](https://github.com/DataDog/dd-sdk-android/pull/3459)
+* [IMPROVEMENT] Optimize `isMainProcess` detection. See [#3489](https://github.com/DataDog/dd-sdk-android/pull/3489)
+* [IMPROVEMENT] Add name support for work units in `BackPressureExecutorService#submit`. See [#3492](https://github.com/DataDog/dd-sdk-android/pull/3492)
+* [IMPROVEMENT] Remove regex usage in `MemoryVitalReader`. See [#3499](https://github.com/DataDog/dd-sdk-android/pull/3499)
+* [IMPROVEMENT] Read process importance early. See [#3504](https://github.com/DataDog/dd-sdk-android/pull/3504)
+* [IMPROVEMENT] Enforce schema character set on `vital.name` in Operation APIs. See [#3393](https://github.com/DataDog/dd-sdk-android/pull/3393)
+* [IMPROVEMENT] Route `androidNetworkInstrumentation` through `InternalLogger#logApiUsage`. See [#3516](https://github.com/DataDog/dd-sdk-android/pull/3516)
+* [IMPROVEMENT] Flags: rename flag names to flag keys. See [#3527](https://github.com/DataDog/dd-sdk-android/pull/3527)
+* [IMPROVEMENT] Write `CUSTOM` RUM actions immediately. See [#3525](https://github.com/DataDog/dd-sdk-android/pull/3525)
+* [IMPROVEMENT] Move broadcast-receiver dispatch off the main thread to reduce ANRs. See [#3524](https://github.com/DataDog/dd-sdk-android/pull/3524)
+* [IMPROVEMENT] Flags: thread `allocationKey` into `ResolutionDetails` flag metadata. See [#3534](https://github.com/DataDog/dd-sdk-android/pull/3534)
+* [IMPROVEMENT] Pass `InternalLogger` through the Session Replay mappers. See [#3518](https://github.com/DataDog/dd-sdk-android/pull/3518)
+* [IMPROVEMENT] Add `Context.getSystemServiceAs` extension. See [#3451](https://github.com/DataDog/dd-sdk-android/pull/3451)
+* [BUGFIX] Catch exception on the battery level query. See [#3453](https://github.com/DataDog/dd-sdk-android/pull/3453)
+* [BUGFIX] Catch `Throwable.loggableStackTrace()` throws. See [#3458](https://github.com/DataDog/dd-sdk-android/pull/3458)
+* [BUGFIX] Ignore dropped local active span in RUM-to-APM path. See [#3406](https://github.com/DataDog/dd-sdk-android/pull/3406)
+* [BUGFIX] Atomically write NDK crash logs and catch `NumberFormatException`. See [#3425](https://github.com/DataDog/dd-sdk-android/pull/3425)
+* [BUGFIX] Fix tap target mis-attribution for views clipped by scrolling ancestors. See [#3473](https://github.com/DataDog/dd-sdk-android/pull/3473)
+* [BUGFIX] Make file write atomic. See [#3476](https://github.com/DataDog/dd-sdk-android/pull/3476)
+* [BUGFIX] Catch `IllegalArgumentException` when reading trace input stream for last fatal ANR. See [#3483](https://github.com/DataDog/dd-sdk-android/pull/3483)
+* [BUGFIX] Fix `WorkDatabase` initialization crash in R8 full mode. See [#3502](https://github.com/DataDog/dd-sdk-android/pull/3502)
+* [BUGFIX] Catch errors in `convertToRumViewAttributes`. See [#3497](https://github.com/DataDog/dd-sdk-android/pull/3497)
+* [BUGFIX] Fix gradients not showing in Compose Session Replay. See [#3471](https://github.com/DataDog/dd-sdk-android/pull/3471)
+* [BUGFIX] Fix hidden API reflection noise in Session Replay drawable mappers. See [#3539](https://github.com/DataDog/dd-sdk-android/pull/3539)
+* [BUGFIX] Fix wrong API doc for text and input privacy configuration in Session Replay. See [#3520](https://github.com/DataDog/dd-sdk-android/pull/3520)
+* [MAINTENANCE] `NoOpImplementation` improvements: support for nested interfaces. See [#3468](https://github.com/DataDog/dd-sdk-android/pull/3468)
+* [MAINTENANCE] `NoOpImplementation` improvements: guard NoOp generation against restricted-visibility. See [#3469](https://github.com/DataDog/dd-sdk-android/pull/3469)
+* [MAINTENANCE] `NoOpImplementation` improvements: add name collision detection and `customName` support. See [#3470](https://github.com/DataDog/dd-sdk-android/pull/3470)
+* [MAINTENANCE] Sign automatically created commits. See [#3462](https://github.com/DataDog/dd-sdk-android/pull/3462)
+* [MAINTENANCE] Bump `ktlint` and `detekt` versions. See [#3444](https://github.com/DataDog/dd-sdk-android/pull/3444)
+* [MAINTENANCE] Resolve dependencies through Magic Mirror Depot in CI. See [#3452](https://github.com/DataDog/dd-sdk-android/pull/3452)
+* [MAINTENANCE] Benchmarking: enable RUM for Session Replay baseline run. See [#3467](https://github.com/DataDog/dd-sdk-android/pull/3467)
+* [MAINTENANCE] Add integration test for cross-product trace sampling rebasing. See [#3464](https://github.com/DataDog/dd-sdk-android/pull/3464)
+* [MAINTENANCE] Benchmark: fix app crash when running baseline for the Session Replay scenario. See [#3474](https://github.com/DataDog/dd-sdk-android/pull/3474)
+* [MAINTENANCE] Fix flaky `InternalApiUsageDetectorTest` due to Kotlin reserved keywords in package regex. See [#3522](https://github.com/DataDog/dd-sdk-android/pull/3522)
+* [MAINTENANCE] Fix Detekt stack overflow on wildcard projections. See [#3528](https://github.com/DataDog/dd-sdk-android/pull/3528)
+* [MAINTENANCE] Bump Datadog Gradle Plugin to `1.27.0`. See [#3533](https://github.com/DataDog/dd-sdk-android/pull/3533)
+* [MAINTENANCE] Move `FakeSameThreadExecutorService` into core test fixtures. See [#3536](https://github.com/DataDog/dd-sdk-android/pull/3536)
+
 # 3.10.0 / 2026-05-13
 
 * [FEATURE] Network headers common instrumentation. See [#3338](https://github.com/DataDog/dd-sdk-android/pull/3338)

buildSrc/src/main/kotlin/com/datadog/gradle/KotlinDSLUtils.kt

@@ -19,7 +19,7 @@ object AndroidConfig {
     const val MIN_SDK_FOR_AUTO = 29
     const val BUILD_TOOLS_VERSION = "36.0.0"
 
-    val VERSION = Version(3, 11, 0, Version.Type.Snapshot)
+    val VERSION = Version(3, 12, 0, Version.Type.Snapshot)
 }
 
 // TODO RUM-628 Switch to Java 17 bytecode

buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt

@@ -21,6 +21,7 @@ import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.bundling.Zip
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.register
 import java.io.File
@@ -107,40 +108,53 @@ fun Project.detektCustomConfig() {
         }
 
     tasks.register<Copy>("unzipAarForDetekt") {
-        from(zipTree(layout.buildDirectory.file("outputs/aar/${project.name}-release.aar")))
+        val aarFile = tasks.named<Zip>("bundleReleaseAar", Zip::class.java).flatMap { it.archiveFile }
+        from(zipTree(aarFile))
         into(layout.buildDirectory.dir("extracted"))
     }
 
     tasks.register<JavaExec>("customDetektRules") {
         group = "datadog"
+        maxHeapSize = "2g"
+        dependsOn("printDetektClasspath")
 
         classpath = files("${rootDir.absolutePath}/detekt-cli-1.23.8-all.jar")
 
         args(
             "--config",
             "${rootDir.absolutePath}/detekt_custom_general.yml," +
-                "${rootDir.absolutePath}/detekt_custom_safe_calls.yml," +
+                "${rootDir.absolutePath}/detekt_custom_safe_calls_android.yml," +
+                "${rootDir.absolutePath}/detekt_custom_safe_calls_third_party.yml," +
                 "${rootDir.absolutePath}/detekt_custom_unsafe_calls.yml"
         )
         args("--plugins", "${rootDir.absolutePath}/tools/detekt/build/libs/detekt.jar")
         args("-i", projectDir.absolutePath)
         args("-ex", "**/*.kts")
         args("--jvm-target", "11")
 
+        // Resolve project paths at configuration time (config-cache friendly), but defer all
+        // detekt_classpath file I/O to execution time. The file is produced by the
+        // printDetektClasspath task, so it may not exist when this task is configured (e.g. while
+        // computing the task graph for assembleLibrariesRelease). Reading it here would fail task
+        // creation and break the whole build.
         val moduleDependencies = collectTransitiveProjectDependencies(project)
+        val rootDirPath = rootDir.absolutePath
+        val detektClasspathFile = File("${projectDir.absolutePath}/detekt_classpath")
 
-        val externalDependencies = File("${projectDir.absolutePath}/detekt_classpath").readText()
-        val moduleDependenciesClasses = moduleDependencies.joinToString(":") {
-            "${rootDir.absolutePath}${it.replace(':', '/')}/build/extracted/classes.jar"
-        }
+        doFirst {
+            val externalDependencies = detektClasspathFile.readText()
+            val moduleDependenciesClasses = moduleDependencies.joinToString(":") {
+                "$rootDirPath${it.replace(':', '/')}/build/extracted/classes.jar"
+            }
 
-        val dependencies = if (moduleDependenciesClasses.isBlank()) {
-            externalDependencies
-        } else {
-            "$externalDependencies:$moduleDependenciesClasses"
-        }
+            val dependencies = if (moduleDependenciesClasses.isBlank()) {
+                externalDependencies
+            } else {
+                "$externalDependencies:$moduleDependenciesClasses"
+            }
 
-        args("-cp", dependencies)
+            args("-cp", dependencies)
+        }
     }
 }
 

buildSrc/src/main/kotlin/com/datadog/gradle/config/DetektCustomConfig.kt

@@ -23,7 +23,14 @@ fun Project.registerSubModuleAggregationTask(
                 subProject.name.startsWith(subModuleNamePrefix) &&
                 subProject.path.startsWith(subModulePathPrefix)
             ) {
-                dependsOn("${subProject.path}:$subModuleTaskName")
+                // Lazily depend on the task only when the submodule registers it: `tasks.names`
+                // reads registered task names without creating any task, and `named()` returns a
+                // lazy provider, so unrelated tasks are never configured. The membership check
+                // matters because not every submodule registers every aggregated task (e.g.
+                // printDetektClasspath only exists where detekt is applied).
+                if (subModuleTaskName in subProject.tasks.names) {
+                    dependsOn(subProject.tasks.named(subModuleTaskName))
+                }
             }
         }
         additionalConfiguration()

buildSrc/src/main/kotlin/com/datadog/gradle/config/TestPyramidConfig.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.gradle.utils
 
+import com.android.build.gradle.tasks.ExtractAnnotations
 import com.android.build.gradle.tasks.SourceJarTask
 import com.datadog.gradle.config.taskConfig
 import com.datadog.gradle.plugin.apisurface.GenerateApiSurfaceTask
@@ -100,10 +101,18 @@ fun Project.createJsonModelsGenerationTask(
         dependsOn(task)
     }
 
+    tasks.matching { it.name.startsWith("ksp") && it.name.endsWith("Kotlin") }.configureEach {
+        dependsOn(task)
+    }
+
     // need to add an explicit dependency, otherwise there is an error during publishing
     // Task 'sourceReleaseJar' uses this output of task
     // this task without declaring an explicit or implicit dependency
     taskConfig<SourceJarTask> {
         dependsOn(task)
     }
+
+    taskConfig<ExtractAnnotations> {
+        dependsOn(task)
+    }
 }

buildSrc/src/main/kotlin/com/datadog/gradle/utils/JsonSchemaGenerationTasks.kt

@@ -0,0 +1,20 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+import org.gradle.api.artifacts.VersionCatalogsExtension
+
+// Adds the shared unit-test dependencies (JUnit 5 + the common test-tooling bundle: Elmyr, AssertJ,
+// mockito-kotlin, …) to a module's `test` source set. Apply with `id("unitTest")`.
+//
+// `kotlin-stdlib` is deliberately not added — the Kotlin plugin already contributes it to every
+// source set, so adding it again would duplicate it.
+
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+listOf("jUnit5", "testTools").forEach { bundleName ->
+    libs.findBundle(bundleName).ifPresent { bundle ->
+        dependencies.addProvider("testImplementation", bundle)
+    }
+}