Merge remote-tracking branch 'origin/develop' into feature/v3

Author: satween

.github/workflows/changelog-to-confluence.yaml

@@ -0,0 +1,31 @@
+name: Publish Changelog to Confluence
+on:
+    pull_request:
+        branches:
+            - develop
+        paths:
+            - 'CHANGELOG.md'
+permissions:
+    contents: read
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+
+            - name: Prepare Only Changelog
+              run: |
+                  mkdir -p publish_folder
+                  cp CHANGELOG.md publish_folder/
+                  echo "Publishing only CHANGELOG.md"
+
+            - name: Publish Markdown to Confluence
+              uses: markdown-confluence/publish-action@7767a0a7f438bb1497ee7ffd7d3d685b81dfe700 # v5
+              with:
+                  confluenceBaseUrl: ${{ secrets.CONFLUENCE_BASE_URL }}
+                  confluenceParentId: ${{ secrets.CONFLUENCE_PARENT_ID }}
+                  atlassianUserName: ${{ secrets.ATLASSIAN_USERNAME }}
+                  atlassianApiToken: ${{ secrets.ATLASSIAN_API_TOKEN }}
+                  contentRoot: '.'
+                  folderToPublish: 'publish_folder'

.gitignore

@@ -26,6 +26,9 @@ config/*
 # .log
 *.log
 
+# Kotlin
+.kotlin/
+
 gh_token
 sdk_classpath
 detekt_classpath

.gitlab-ci.yml

@@ -4,7 +4,7 @@ include:
 # SETUP
 
 variables:
-  CURRENT_CI_IMAGE: "14"
+  CURRENT_CI_IMAGE: "16"
   CI_IMAGE_DOCKER: registry.ddbuild.io/ci/dd-sdk-android:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 
@@ -19,7 +19,7 @@ variables:
 
   EMULATOR_NAME: "android_emulator"
   ANDROID_ARCH: "arm64-v8a"
-  ANDROID_API: "35"
+  ANDROID_API: "36"
   ANDROID_SDK_VERSION: "commandlinetools-mac-11076708_latest"
 
 stages:
@@ -235,7 +235,7 @@ test-pyramid:core-it-latest-api:
   stage: test-pyramid
   timeout: 1h
   variables:
-    ANDROID_API: "35"
+    ANDROID_API: "36"
     ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
     ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
     ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
@@ -360,7 +360,7 @@ test-pyramid:legacy-integration-instrumented-latest-api:
   stage: test-pyramid
   timeout: 1h
   variables:
-    ANDROID_API: "35"
+    ANDROID_API: "36"
     ANDROID_EMULATOR_IMAGE: "system-images;android-$ANDROID_API;google_apis;${ANDROID_ARCH}"
     ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
     ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"

CHANGELOG.md

@@ -1,3 +1,69 @@
+# 2.21.0 / 2025-05-06
+
+* [FEATURE] Add Compose instrumentation API for view tracking and image recording. See [#2570](https://github.com/DataDog/dd-sdk-android/pull/2570)
+* [FEATURE] Add `ActionTrackingStrategy` interface to decouple find view logic. See [#2573](https://github.com/DataDog/dd-sdk-android/pull/2573)
+* [FEATURE] Add Compose actions tracking strategy API in `RumConfiguration`. See [#2575](https://github.com/DataDog/dd-sdk-android/pull/2575)
+* [FEATURE] Implement Compose actions tracking strategy. See [#2586](https://github.com/DataDog/dd-sdk-android/pull/2586)
+* [FEATURE] Change `TrackViews` and `RecordImages` annotations to `ComposeInstrumentation`. See [#2595](https://github.com/DataDog/dd-sdk-android/pull/2595)
+* [BUGFIX] Fix Rum Action Tap is added twice for every `ACTION_UP`. See [#2579](https://github.com/DataDog/dd-sdk-android/pull/2579)
+* [BUGFIX] Cover `IndexOutOfBoundsException` in `DrawableUtils`. See [#2604](https://github.com/DataDog/dd-sdk-android/pull/2604)
+* [BUGFIX] Let `AndroidTracer.logErrorMessage()` send an ERROR log. See [#2605](https://github.com/DataDog/dd-sdk-android/pull/2605)
+* [BUGFIX] Fix artifacts in Jetpack Compose scrolling. See [#2610](https://github.com/DataDog/dd-sdk-android/pull/2610)
+* [BUGFIX] Fix `ViewTarget` is garbage collected during actions tracking. See [#2608](https://github.com/DataDog/dd-sdk-android/pull/2608)
+* [BUGFIX] Fix the memory leak in the `PendingTrace#cleaner`. See [#2607](https://github.com/DataDog/dd-sdk-android/pull/2607)
+* [BUGFIX] Fix Session Replay is not resumed after the session has expired before. See [#2611](https://github.com/DataDog/dd-sdk-android/pull/2611)
+* [BUGFIX] Catch NPE when drawing cloned drawable in Session Replay. See [#2622](https://github.com/DataDog/dd-sdk-android/pull/2622)
+* [BUGFIX] Revert: Remove shared `ThreadLocal` scopes. See [#2603](https://github.com/DataDog/dd-sdk-android/pull/2603)
+* [IMPROVEMENT] Remove test fixtures content root duplication in `dd-sdk-android-session-replay-compose` module. See [#2592](https://github.com/DataDog/dd-sdk-android/pull/2592)
+* [IMPROVEMENT] Minor improvements. See [#2609](https://github.com/DataDog/dd-sdk-android/pull/2609)
+* [IMPROVEMENT] Propagate session ID in baggage header. See [#2602](https://github.com/DataDog/dd-sdk-android/pull/2602)
+* [MAINTENANCE] Add workflow: Changelog update to Confluence. See [#2596](https://github.com/DataDog/dd-sdk-android/pull/2596)
+* [MAINTENANCE] Add telemetry for Compose instrumentation functions. See [#2601](https://github.com/DataDog/dd-sdk-android/pull/2601)
+* [MAINTENANCE] Add Android Auto and Android XR support to the sample app. See [#2606](https://github.com/DataDog/dd-sdk-android/pull/2606)
+* [MAINTENANCE] Add metrics for internal benchmarking. See [#2581](https://github.com/DataDog/dd-sdk-android/pull/2581)
+* [MAINTENANCE] Sample telemetry for `RecordedDataQueueHandler`. See [#2600](https://github.com/DataDog/dd-sdk-android/pull/2600)
+* [MAINTENANCE] Remove the noisy warning log as for some views it is normal to not have ITV. See [#2617](https://github.com/DataDog/dd-sdk-android/pull/2617)
+* [MAINTENANCE] Fix semantics of `ExecutorService.submit` vs `Executor.execute` usage. See [#2616](https://github.com/DataDog/dd-sdk-android/pull/2616)
+* [MAINTENANCE] Integrate Datadog Plugin in benchmark application. See [#2618](https://github.com/DataDog/dd-sdk-android/pull/2618)
+* [MAINTENANCE] Merge `feature/compose-instrumentation-api` into `feature/actions-tracking`. See [#2583](https://github.com/DataDog/dd-sdk-android/pull/2583)
+* [MAINTENANCE] Merge 2.20.0 into `develop`. See [#2588](https://github.com/DataDog/dd-sdk-android/pull/2588)
+* [MAINTENANCE] Merge `Feature/actions-tracking` into `develop`. See [#2598](https://github.com/DataDog/dd-sdk-android/pull/2598)
+* [MAINTENANCE] Bump version to 2.21.0-SNAPSHOT. See [#2585](https://github.com/DataDog/dd-sdk-android/pull/2585)
+* [MAINTENANCE] Bump `targetSdk` to 36. See [#2589](https://github.com/DataDog/dd-sdk-android/pull/2589)
+
+# 2.20.0 / 2025-04-07
+
+* [FEATURE] Slow frames collection support. See [#2518](https://github.com/DataDog/dd-sdk-android/pull/2518)
+* [FEATURE] Introduce `UISlownessMetricDispatcher`. See [#2567](https://github.com/DataDog/dd-sdk-android/pull/2567)
+* [BUGFIX] Remove double computation of the `RUM` payload. See [#2528](https://github.com/DataDog/dd-sdk-android/pull/2528)
+* [BUGFIX] Add try-catch in `drawOnCanvas` in order to catch exceptions from `draw(canvas)` method. See [#2549](https://github.com/DataDog/dd-sdk-android/pull/2549)
+* [BUGFIX] Fix issue with missing freeze rate and slow frames rate. See [#2557](https://github.com/DataDog/dd-sdk-android/pull/2557)
+* [BUGFIX] Ignore secondary displays in `Session Replay`. See [#2574](https://github.com/DataDog/dd-sdk-android/pull/2574)
+* [IMPROVEMENT] Set the `local-ci` script to check for specific version of KtLint. See [#2526](https://github.com/DataDog/dd-sdk-android/pull/2526)
+* [IMPROVEMENT] Add missing builder function for anonymous user tracking. See [#2540](https://github.com/DataDog/dd-sdk-android/pull/2540)
+* [IMPROVEMENT] Add telemetry for pending batch files. See [#2548](https://github.com/DataDog/dd-sdk-android/pull/2548)
+* [IMPROVEMENT] Remove the possibility to read the `Tracer` config from `env` and from the config file. See [#2564](https://github.com/DataDog/dd-sdk-android/pull/2564)
+* [IMPROVEMENT] Add `traceSampleRate` to the telemetry `Configuration` events. See [#2563](https://github.com/DataDog/dd-sdk-android/pull/2563)
+* [IMPROVEMENT] Report configured distributed tracing headers as part of `Configuration` telemetry. See [#2572](https://github.com/DataDog/dd-sdk-android/pull/2572)
+* [IMPROVEMENT] Optimize features context reads in `TelemetryEventHandler`. See [#2576](https://github.com/DataDog/dd-sdk-android/pull/2576)
+* [IMPROVEMENT] Optimize `OkHttp` configuration telemetry. See [#2578](https://github.com/DataDog/dd-sdk-android/pull/2578)
+* [IMPROVEMENT] Make SDK support 16Kb page sizes. See [#2580](https://github.com/DataDog/dd-sdk-android/pull/2580)
+* [MAINTENANCE] Update AndroidX `Metrics` library to 1.0.0-beta02. See [#2546](https://github.com/DataDog/dd-sdk-android/pull/2546) 
+* [MAINTENANCE] Remove `RUM` feature check in `AndroidTracer` builder. [#2539](https://github.com/DataDog/dd-sdk-android/pull/2539)
+* [MAINTENANCE] Change `TraceWriter#write` type from `MutableList` to `List`. See [#2568](https://github.com/DataDog/dd-sdk-android/pull/2568)
+* [MAINTENANCE] Fix flaky `TraceWriterTest` M log error and proceed W write() { serialization failed }. See [#2565](https://github.com/DataDog/dd-sdk-android/pull/2565)
+* [MAINTENANCE] Fix flaky tests in `OtelTraceWriter`. See [#2571](https://github.com/DataDog/dd-sdk-android/pull/2571)
+* [MAINTENANCE] Change `OtelTraceWriter#write type` from `MutableList` to `List`. See [#2577](https://github.com/DataDog/dd-sdk-android/pull/2577)
+* [MAINTENANCE] Fix negative values in slow frames, adjusting telemetry. See [#2582](https://github.com/DataDog/dd-sdk-android/pull/2582)
+
+# 2.19.2 / 2025-03-20
+
+* [BUGFIX] Fix NPE with Metrics listener on older APIs. See[#2558](https://github.com/DataDog/dd-sdk-android/pull/2558)
+
+# 2.19.1 / 2025-03-17
+
+* [BUGFIX] Fix NPE when `Drawable.getCurrent` returns null. See[#2545](https://github.com/DataDog/dd-sdk-android/pull/2545)
+
 # 2.19.0 / 2025-03-10
 
 * [FEATURE] Core: Introduce anonymous RUM Identifier. See [#2487](https://github.com/DataDog/dd-sdk-android/pull/2487)

Dockerfile.gitlab

@@ -25,11 +25,11 @@ RUN set -x \
  && apt-get -y clean \
  && rm -rf /var/lib/apt/lists/*
 
-ENV GRADLE_VERSION 8.10.2
-ENV ANDROID_COMPILE_SDK 35
-ENV ANDROID_BUILD_TOOLS 35.0.0
+ENV GRADLE_VERSION 8.11.1
+ENV ANDROID_COMPILE_SDK 36
+ENV ANDROID_BUILD_TOOLS 36.0.0
 ENV ANDROID_SDK_TOOLS 11076708
-ENV NDK_VERSION 25.1.8937393
+ENV NDK_VERSION 28.0.13004108
 ENV CMAKE_VERSION 3.22.1
 ENV DD_TRACER_VERSION 1.41.0
 # requires build with BuildKit to be available https://docs.docker.com/build/building/variables/#multi-platform-build-arguments

LICENSE-3rdparty.csv

@@ -138,7 +138,10 @@ build,com.fasterxml.jackson.module,Apache-2.0,"Copyright (c) 2007- Tatu Salorant
 build,com.fasterxml.woodstox,Apache-2.0,"Copyright (c) 2007- Tatu Saloranta"
 build,com.google.android,Apache-2.0,Copyright (C) 2013 The Android Open Source Project
 build,com.google.api.grpc,Apache-2.0,Copyright 2020 Google LLC
+build,com.google.auto,Apache-2.0,"Copyright 2014 Google LLC"
+build,com.google.auto.service,Apache-2.0,"Copyright 2013 Google LLC"
 build,com.google.crypto.tink,Apache-2.0,Copyright 2023 Google LLC
+build,com.google.dagger,Apache-2.0,"Copyright (C) 2018 The Dagger Authors"
 build,com.google.devtools.ksp,Apache-2.0,"Copyright 2020 Google LLC, Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors."
 build,com.google.testing.platform,Apache-2.0,Copyright (C) 2021 The Android Open Source Project
 build,com.pinterest,MIT,"Copyright 2019 Pinterest Inc, Copyright 2016-2019 Stanley Shyiko"
@@ -148,6 +151,7 @@ build,io.github.microutils,Apache-2.0,Copyright (c) 2016-2018 Ohad Shai
 build,io.gitlab.arturbosch.detekt,Apache-2.0,Copyright 2016-2019 the original author or authors
 build,io.grpc,Apache-2.0,Copyright 2014 The gRPC Authors
 build,io.netty,Apache-2.0,Copyright 2014 The Netty Project
+build,io.opencensus,Apache-2.0,"Copyright 2017, OpenCensus Authors"
 build,io.perfmark,Apache-2.0,Copyright 2019 Google LLC
 build,jakarta.activation,BSD 3-Clause,"Copyright (c) 2017, 2018 Oracle and/or its affiliates"
 build,jakarta.xml.bind,BSD 3-Clause,"Copyright (c) 2017, 2018 Oracle and/or its affiliates"
@@ -161,3 +165,4 @@ build,org.jetbrains.dokka,Apache-2.0,"Copyright 2014-2019 JetBrains s.r.o. and D
 build,org.jetbrains.intellij.deps,LGPL-2.1-only,"Copyright (c) 2001-2002, Eric D. Friedman, Jason Baldridge, Copyright (c) 1999 CERN - European Organization for Nuclear Research"
 build,org.ow2.asm,BSD-3-Clause,"Copyright (c) 2000-2011 INRIA, France Telecom"
 build,org.slf4j,MIT,"Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)"
+

build.gradle.kts

@@ -32,7 +32,6 @@ buildscript {
         classpath(libs.kotlinSPGradlePlugin)
         classpath(libs.dokkaGradlePlugin)
         classpath(libs.unmockGradlePlugin)
-        classpath(libs.realmGradlePlugin)
         classpath(libs.sqlDelightGradlePlugin)
         classpath(libs.binaryCompatibilityGradlePlugin)
     }
@@ -59,7 +58,7 @@ nexusPublishing {
 }
 
 task<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 tasks.register("checkAll") {

buildSrc/build.gradle.kts

@@ -32,7 +32,6 @@ dependencies {
     implementation(libs.kotlinGradlePlugin)
     implementation(libs.androidToolsGradlePlugin)
     implementation(libs.versionsGradlePlugin)
-    implementation(libs.fuzzyWuzzy)
     implementation(libs.dokkaGradlePlugin)
     implementation(libs.dependencyLicenseGradlePlugin)
     implementation(libs.kover)

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

@@ -11,7 +11,7 @@ object Dependencies {
     object Versions {
 
         // NDK
-        const val Ndk = "25.1.8937393"
+        const val Ndk = "28.0.13004108"
         const val CMake = "3.22.1"
     }
 

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

@@ -15,12 +15,12 @@ import org.gradle.api.Project
 
 object AndroidConfig {
 
-    const val TARGET_SDK = 35
+    const val TARGET_SDK = 36
     const val MIN_SDK = 21
     const val MIN_SDK_FOR_WEAR = 23
-    const val BUILD_TOOLS_VERSION = "35.0.0"
+    const val BUILD_TOOLS_VERSION = "36.0.0"
 
-    val VERSION = Version(2, 20, 0, Version.Type.Snapshot)
+    val VERSION = Version(2, 22, 0, Version.Type.Snapshot)
 }
 
 // TODO RUM-628 Switch to Java 17 bytecode
@@ -70,6 +70,11 @@ fun Project.androidLibraryConfig() {
             checkReleaseBuilds = false
             checkGeneratedSources = true
             ignoreTestSources = true
+            disable.addAll(
+                listOf(
+                    "UseKtx" // https://googlesamples.github.io/android-custom-lint-rules/checks/UseKtx.md.html
+                )
+            )
         }
 
         packaging {