Merge pull request #3565 from DataDog/jmoskovich/merge-develop-heatmap

Merge develop into feature/heatmaps

Author: jonathanmos

.editorconfig

@@ -3,10 +3,18 @@
 # Copyright 2016-Present Datadog, Inc.
 
 [*.{kt,kts}]
-ktlint_code_style = android_studio
 ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_allow_trailing_comma = false
 ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
+ktlint_code_style = android_studio
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_class-signature = disabled
+ktlint_standard_condition-wrapping = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_statement-wrapping = disabled
 max_line_length = 120
 
 # Code generated by KotlinPoet
@@ -15,4 +23,9 @@ ktlint_standard = disabled
 
 # SPDX License Names
 [buildSrc/src/main/kotlin/com/datadog/gradle/plugin/checklicenses/SPDXLicense.kt]
-ktlint_standard_enum-entry-name-case = disabled
+ktlint_standard_enum-entry-name-case = disabled
+
+# NoOp test fixtures use compound filenames (OuterVisibilityOuterInnerVisibilityInner.kt)
+# to distinguish visibility combinations; the top-level class name stays short on purpose.
+[tools/noopfactory/src/test/resources/**/*.kt]
+ktlint_standard_filename = disabled

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  CURRENT_CI_IMAGE: "24"
+  CURRENT_CI_IMAGE: "25"
   CI_IMAGE_DOCKER: registry.ddbuild.io/ci/dd-sdk-android:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 
@@ -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"
@@ -19,6 +19,15 @@ variables:
 
   CACHE_FALLBACK_KEY: "develop"
 
+  # Magic Mirror Depot proxy URLs. The depot proxies both Maven Central and the Gradle
+  # Plugin Portal for the Java ecosystem from the same endpoint. Setting these routes
+  # dependency/plugin resolution through Datadog's internal mirror to avoid HTTP 429
+  # rate-limits from upstream registries.
+  # Declared as ORG_GRADLE_PROJECT_* so Gradle reads them as
+  # `providers.gradleProperty("<name>")` and they propagate to triggered child pipelines.
+  ORG_GRADLE_PROJECT_mavenRepositoryProxy: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
+  ORG_GRADLE_PROJECT_gradlePluginProxy: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
+
 include:
   - local: 'ci/pipelines/default-pipeline.yml'
     rules:

CHANGELOG.md

@@ -1,3 +1,81 @@
+# 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)
+* [FEATURE] Use rebased `sessionReplaySampleRate` for deterministic Session Replay sampling. See [#3372](https://github.com/DataDog/dd-sdk-android/pull/3372)
+* [BUGFIX] Fix LeakCanary for profileable builds. See [#3378](https://github.com/DataDog/dd-sdk-android/pull/3378)
+* [BUGFIX] Fix evaluation intake endpoint path. See [#3414](https://github.com/DataDog/dd-sdk-android/pull/3414)
+* [BUGFIX] Fix NPE when `SeekBar` thumb is `null`. See [#3419](https://github.com/DataDog/dd-sdk-android/pull/3419)
+* [BUGFIX] Fix GraphQL errors extraction for streaming responses. See [#3410](https://github.com/DataDog/dd-sdk-android/pull/3410)
+* [IMPROVEMENT] Expose `trace` as `api` dependency in `OkHttp` module. See [#3366](https://github.com/DataDog/dd-sdk-android/pull/3366)
+* [IMPROVEMENT] Migrate `OkHttp` to new instrumentation API. See [#3180](https://github.com/DataDog/dd-sdk-android/pull/3180)
+* [IMPROVEMENT] Propagate native `anonymousId` to `Webview` events. See [#3306](https://github.com/DataDog/dd-sdk-android/pull/3306)
+* [IMPROVEMENT] Rename `DatadogTracingToolkit` to `_TraceInternalProxy`. See [#3350](https://github.com/DataDog/dd-sdk-android/pull/3350)
+* [IMPROVEMENT] Use `SecureRandom` for Trace/Span ID generation, remove usage of `SecureRandom.getStrongInstance`. See [#3379](https://github.com/DataDog/dd-sdk-android/pull/3379)
+* [IMPROVEMENT] Add `fed2` endpoint to `DatadogSite`. See [#3383](https://github.com/DataDog/dd-sdk-android/pull/3383)
+* [IMPROVEMENT] Drop word feature from operations APIs. See [#3390](https://github.com/DataDog/dd-sdk-android/pull/3390)
+* [IMPROVEMENT] Make sure `RumAppStartupDetector#destroy` is called on main thread. See [#3397](https://github.com/DataDog/dd-sdk-android/pull/3397)
+* [IMPROVEMENT] Support legacy `OkHttp` network telemetry. See [#3399](https://github.com/DataDog/dd-sdk-android/pull/3399)
+* [IMPROVEMENT] Add request to `HttpResponseInfo`. See [#3382](https://github.com/DataDog/dd-sdk-android/pull/3382)
+* [IMPROVEMENT] Add telemetry to `trackResourceHeaders` instrumentation. See [#3403](https://github.com/DataDog/dd-sdk-android/pull/3403)
+* [IMPROVEMENT] Log task names for the observable queue dump in case of context executor usage. See [#3412](https://github.com/DataDog/dd-sdk-android/pull/3412)
+* [IMPROVEMENT] Move broadcast-receiver dispatch off the main thread to fix ANRs. See [#3420](https://github.com/DataDog/dd-sdk-android/pull/3420)
+* [IMPROVEMENT] Add MAUI source. See [#3423](https://github.com/DataDog/dd-sdk-android/pull/3423)
+* [IMPROVEMENT] Replace GraphQL chain wrapper with request tag. See [#3424](https://github.com/DataDog/dd-sdk-android/pull/3424)
+* [IMPROVEMENT] Add integration test for `OkHttp` resource timing feature. See [#3428](https://github.com/DataDog/dd-sdk-android/pull/3428)
+* [MAINTENANCE] Update dependency `org.assertj:assertj-core` to `v3.27.7`. See [#3385](https://github.com/DataDog/dd-sdk-android/pull/3385)
+* [MAINTENANCE] Remove shadow reviewer workflow. See [#3384](https://github.com/DataDog/dd-sdk-android/pull/3384)
+* [MAINTENANCE] Cleanup in `core` and `internal` modules. See [#3417](https://github.com/DataDog/dd-sdk-android/pull/3417)
+* [MAINTENANCE] Add execution of NDK instrumented tests on CI. See [#3418](https://github.com/DataDog/dd-sdk-android/pull/3418)
+* [MAINTENANCE] Don't run Java API generation task on CI for non-release builds. See [#3421](https://github.com/DataDog/dd-sdk-android/pull/3421)
+* [MAINTENANCE] Sync Detekt configs with a `static-analysis` template version. See [#3439](https://github.com/DataDog/dd-sdk-android/pull/3439)
+* [MAINTENANCE] Compilation fix. See [#3375](https://github.com/DataDog/dd-sdk-android/pull/3375)
+
 # 3.9.1 / 2026-04-23
 
 * [BUGFIX] Cache reflection lookups in `LayoutNodeUtils`. See [#3381](https://github.com/DataDog/dd-sdk-android/pull/3381)

CONTRIBUTING.md

@@ -194,14 +194,14 @@ same feature from a Java source code.
 Our code uses [Detekt](https://detekt.dev/) static analysis with a shared configuration, slightly
 stricter than the default one. A Detekt check is ran on every on every PR to ensure that all new code
 follow this rule.
-Current Detekt version: 1.23.4
+Current Detekt version: 1.23.8
 
 ### Code style
 
 Our coding style is ensured by [KtLint](https://ktlint.github.io/), with the
 default settings. A KtLint check is ran on every PR to ensure that all new code
 follow this rule.
-Current KtLint version: 0.50.0
+Current KtLint version: 1.5.0
 
 Classes should group their methods in folding regions named after the declaring
 class. Private methods should be grouped in an `Internal` named folding region. 

LICENSE-3rdparty.csv

@@ -139,6 +139,7 @@ import(test),com.google.re2j,"Go License","Copyright (c) 2009 The Go Authors. Al
 import(test),com.jakewharton.android.repackaged,Apache-2.0,"Copyright (C) 2007 The Android Open Source Project"
 import(test),com.parse.bolts,"BSD License","Copyright (c) Facebook, Inc. and its affiliates."
 import(test),com.squareup,Apache-2.0,"Copyright 2015 Square, Inc."
+import(test),dev.drewhamilton.poko,Apache-2.0,Copyright 2020-Present Drew Hamilton
 import(test),greatest,ICT,"Copyright (c) 2011-2018 Scott Vokes <vokes.s@gmail.com>"
 import(test),io.github.davidburstrom.contester,Apache-2.0,"Copyright 2022-2024 David Burström"
 import(test),io.github.detekt.sarif4k,Apache-2.0,"Copyright 2021 Artur Bosch & Contributors"

build.gradle.kts

@@ -7,6 +7,7 @@
 
 import com.android.build.gradle.LibraryExtension
 import com.datadog.gradle.config.AndroidConfig
+import com.datadog.gradle.config.depotProxied
 import com.datadog.gradle.config.registerSubModuleAggregationTask
 import org.gradle.api.internal.file.UnionFileTree
 import org.gradle.api.internal.tasks.DefaultTaskDependencyFactory
@@ -37,6 +38,11 @@ version = AndroidConfig.VERSION.name
 
 buildscript {
     repositories {
+        // Magic Mirror Depot proxy (only set in CI via `.gitlab-ci.yml`).
+        // Inlined here because `buildscript {}` runs before buildSrc classes are on the classpath.
+        listOf("gradlePluginProxy", "mavenRepositoryProxy")
+            .mapNotNull { providers.gradleProperty(it).orNull?.takeIf { url -> url.isNotBlank() } }
+            .forEach { url -> maven { setUrl(url) } }
         google()
         mavenCentral()
         maven { setUrl(com.datadog.gradle.Dependencies.Repositories.Gradle) }
@@ -48,7 +54,7 @@ buildscript {
 }
 
 allprojects {
-    repositories {
+    repositories.depotProxied(providers) {
         google()
         mavenCentral()
         maven { setUrl(com.datadog.gradle.Dependencies.Repositories.Jitpack) }

buildSrc/build.gradle.kts

@@ -14,11 +14,19 @@ plugins {
 
 buildscript {
     repositories {
+        // Magic Mirror Depot proxy (only set in CI via `.gitlab-ci.yml`).
+        listOf("gradlePluginProxy", "mavenRepositoryProxy")
+            .mapNotNull { providers.gradleProperty(it).orNull?.takeIf { url -> url.isNotBlank() } }
+            .forEach { url -> maven { setUrl(url) } }
         mavenCentral()
     }
 }
 
 repositories {
+    // Magic Mirror Depot proxy (only set in CI via `.gitlab-ci.yml`).
+    listOf("gradlePluginProxy", "mavenRepositoryProxy")
+        .mapNotNull { providers.gradleProperty(it).orNull?.takeIf { url -> url.isNotBlank() } }
+        .forEach { url -> maven { setUrl(url) } }
     mavenCentral()
     google()
     maven { setUrl("https://plugins.gradle.org/m2/") }

buildSrc/settings.gradle.kts

@@ -4,6 +4,18 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
+pluginManagement {
+    repositories {
+        // Magic Mirror Depot proxy (only set in CI via `.gitlab-ci.yml`).
+        listOf("gradlePluginProxy", "mavenRepositoryProxy")
+            .mapNotNull { providers.gradleProperty(it).orNull?.takeIf { url -> url.isNotBlank() } }
+            .forEach { url -> maven(url) }
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {

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, 10, 0, Version.Type.Snapshot)
+    val VERSION = Version(3, 12, 0, Version.Type.Snapshot)
 }
 
 // TODO RUM-628 Switch to Java 17 bytecode