[mq] working branch - merge e01dad1 on top of feature/flags-ofeat at 8410eca

{"baseBranch":"feature/flags-ofeat","baseCommit":"8410ecacba235d4e46f241df21528c8638ee042e","createdAt":"2025-12-17T22:50:14.320229Z","headSha":"e01dad1639917d3b9024cd7f001a07c5901c2cc7","id":"0eeba7c9-1145-4b61-b553-1300352bea34","nextMergeabilityCheckAt":"2025-12-17T22:51:14.041753Z","priority":"200","pullRequestNumber":"3065","queuedAt":"2025-12-17T23:35:22.737725Z","status":"STATUS_QUEUED"}

Author: dd-mergequeue[bot]

CHANGELOG.md

@@ -1,3 +1,67 @@
+# 3.4.0 / 2025-12-11
+
+* [FEATURE] State change notification for flags client. See [#3025](https://github.com/DataDog/dd-sdk-android/pull/3025)
+* [BUGFIX] Fix crash in `KronosTimeProvider`. See [#3014](https://github.com/DataDog/dd-sdk-android/pull/3014)
+* [BUGFIX] Fix RUM resource duration breakdown. See [#3010](https://github.com/DataDog/dd-sdk-android/pull/3010)
+* [BUGFIX] Handle potential `StackOverflowError`. See [#2990](https://github.com/DataDog/dd-sdk-android/pull/2990)
+* [IMPROVEMENT] Send text truncation mode in Session Replay. See [#2978](https://github.com/DataDog/dd-sdk-android/pull/2978)
+* [IMPROVEMENT] Support svgs with `navigation3`. See [#3027](https://github.com/DataDog/dd-sdk-android/pull/3027)
+* [IMPROVEMENT] Support content scaling in Jetpack Compose. See [#3035](https://github.com/DataDog/dd-sdk-android/pull/3035)
+* [IMPROVEMENT] Support non-ASCII GraphQL headers. See [#3041](https://github.com/DataDog/dd-sdk-android/pull/3041)
+* [IMPROVEMENT] Add service name to `ddtags` of `LogEvent`. See [#3006](https://github.com/DataDog/dd-sdk-android/pull/3006)
+* [IMPROVEMENT] Add `versionCode` and `buildId` in more places. See [#3007](https://github.com/DataDog/dd-sdk-android/pull/3007)
+* [IMPROVEMENT] Add `anonymousId` to the empty `UserInfo` object check. See [#3012](https://github.com/DataDog/dd-sdk-android/pull/3012)
+* [IMPROVEMENT] Override Metrics telemetry sample rate. See [#3022](https://github.com/DataDog/dd-sdk-android/pull/3022)
+* [IMPROVEMENT] Stop using process importance when distinguishing between cold and warm launches. See [#3030](https://github.com/DataDog/dd-sdk-android/pull/3030)
+* [MAINTENANCE] Merge `release/3.3.0` into `develop`. See [#3016](https://github.com/DataDog/dd-sdk-android/pull/3016)
+* [MAINTENANCE] Remove `resolveMeta` & `resolveMetrics` methods in tests. See [#3005](https://github.com/DataDog/dd-sdk-android/pull/3005)
+* [MAINTENANCE] Revive Session Replay instrumentation tests. See [#2965](https://github.com/DataDog/dd-sdk-android/pull/2965)
+* [MAINTENANCE] Next dev iteration. See [#3009](https://github.com/DataDog/dd-sdk-android/pull/3009)
+
+# 3.3.0 / 2025-11-18
+
+* [FEATURE] Feature flags. See [#2982](https://github.com/DataDog/dd-sdk-android/pull/2982) and [#2879](https://github.com/DataDog/dd-sdk-android/pull/2879) 
+* [FEATURE] Feature flags: Apply readme suggestions. See [#2988](https://github.com/DataDog/dd-sdk-android/pull/2988)
+* [FEATURE] Feature flags: Fix detekt violations in the flags module. See [#2994](https://github.com/DataDog/dd-sdk-android/pull/2994)
+* [FEATURE] Feature flags context management. See [#2886](https://github.com/DataDog/dd-sdk-android/pull/2886)
+* [FEATURE] Feature flags: Send exposures as batches. See [#2895](https://github.com/DataDog/dd-sdk-android/pull/2895)
+* [FEATURE] Feature flags: Add a persistence layer. See [#2898](https://github.com/DataDog/dd-sdk-android/pull/2898)
+* [FEATURE] Feature flags: `DatadogSite` extension for Flags endpoint. See [#2922](https://github.com/DataDog/dd-sdk-android/pull/2922)
+* [FEATURE] Feature flags: `Flags.enable` and `FlagsClient` APIs. See [#2900](https://github.com/DataDog/dd-sdk-android/pull/2900)
+* [FEATURE] Feature flags: Support custom endpoints for exposures. See [#2942](https://github.com/DataDog/dd-sdk-android/pull/2942)
+* [FEATURE] Feature flags: Custom flagging endpoint and assignment download refactoring. See [#2917](https://github.com/DataDog/dd-sdk-android/pull/2917)
+* [FEATURE] Feature flags: RUM Evaluation Tracking. See [#2926](https://github.com/DataDog/dd-sdk-android/pull/2926)
+* [FEATURE] Feature flags: Add `CountDownLatch` to `FlagsRepository`. See [#2947](https://github.com/DataDog/dd-sdk-android/pull/2947)
+* [FEATURE] Feature flags: Add telemetry for critical paths. See [#2952](https://github.com/DataDog/dd-sdk-android/pull/2952)
+* [FEATURE] Feature flags: Generic resolve method. See [#2923](https://github.com/DataDog/dd-sdk-android/pull/2923)
+* [FEATURE] Feature flags: Generate `ExposureEvent` from schema. See [#2957](https://github.com/DataDog/dd-sdk-android/pull/2957)
+* [FEATURE] Feature flags: Remove redundant `featureflags` subpackage. See [#2966](https://github.com/DataDog/dd-sdk-android/pull/2966)
+* [FEATURE] Feature flags: Support for `PROVIDER_NOT_READY` state. See [#2967](https://github.com/DataDog/dd-sdk-android/pull/2967)
+* [FEATURE] Feature flags: Graceful mode and error logging policies. See [#2963](https://github.com/DataDog/dd-sdk-android/pull/2963)
+* [FEATURE] Feature flags: Update documentation. See [#2955](https://github.com/DataDog/dd-sdk-android/pull/2955)
+* [FEATURE] Feature flags: Allow blank targeting keys. See [#2981](https://github.com/DataDog/dd-sdk-android/pull/2981)
+* [BUGFIX] Fix GraphQL operation type header. See [#2956](https://github.com/DataDog/dd-sdk-android/pull/2956)
+* [BUGFIX] Fix synthetic ids logging in `RumViewScope`. See [#2958](https://github.com/DataDog/dd-sdk-android/pull/2958)
+* [BUGFIX] Fix `RumWindowCallbacksRegistry` for multiple SDK instances. See [#3003](https://github.com/DataDog/dd-sdk-android/pull/3003)
+* [BUGFIX] Fix vital events duplication in Feature Operations. See [#2977](https://github.com/DataDog/dd-sdk-android/pull/2977)
+* [IMPROVEMENT] Support sending anonymous user ids in logs. See [#2945](https://github.com/DataDog/dd-sdk-android/pull/2945)
+* [IMPROVEMENT] Feature flags: Fix and improve tests, context management. See [#2896](https://github.com/DataDog/dd-sdk-android/pull/2896)
+* [IMPROVEMENT] Refactor `FlagsProvider` and `FlagsClient` into one. See [#2899](https://github.com/DataDog/dd-sdk-android/pull/2899)
+* [IMPROVEMENT] Support long task reporting for multiple SDK instances. See [#2934](https://github.com/DataDog/dd-sdk-android/pull/2934)
+* [IMPROVEMENT] `MIGRATION.MD` update for missing SDK v3 changes. See [#2936](https://github.com/DataDog/dd-sdk-android/pull/2936)
+* [IMPROVEMENT] Update RUM Schema to include app launch vitals. See [#2937](https://github.com/DataDog/dd-sdk-android/pull/2937)
+* [IMPROVEMENT] Trace: Handle OTEL reserved attributes when using `AttributeKeys`. See [#2946](https://github.com/DataDog/dd-sdk-android/pull/2946)
+* [IMPROVEMENT] Use stub `Executor` for `WorkerParameters` forgery factory. See [#2949](https://github.com/DataDog/dd-sdk-android/pull/2949)
+* [IMPROVEMENT] Do not create a new session for TTID. See [#2954](https://github.com/DataDog/dd-sdk-android/pull/2954)
+* [IMPROVEMENT] Add support of `oneOf(primitive|object)` in the json parser generator. See [#2972](https://github.com/DataDog/dd-sdk-android/pull/2972)
+* [IMPROVEMENT] Pass synthetic ids to RUM earlier in benchmark app. See [#2959](https://github.com/DataDog/dd-sdk-android/pull/2959)
+* [IMPROVEMENT] Update RUM schema. See [#2976](https://github.com/DataDog/dd-sdk-android/pull/2976)
+* [IMPROVEMENT] Updating `MIGRATION.MD` with the default sampling rate. See [#2995](https://github.com/DataDog/dd-sdk-android/pull/2995)
+* [IMPROVEMENT] Add internal `disableJankStats` config option. See [#3000](https://github.com/DataDog/dd-sdk-android/pull/3000)
+* [MAINTENANCE] Provide SDK commit SHA1 to the Shopist App. See [#2993](https://github.com/DataDog/dd-sdk-android/pull/2993)
+* [MAINTENANCE] Fix detekt issues. See [#2885](https://github.com/DataDog/dd-sdk-android/pull/2885)
+* [MAINTENANCE] Remove unused `isConstantClass` variable. See [#2984](https://github.com/DataDog/dd-sdk-android/pull/2984)
+
 # 3.2.0 / 2025-10-13
 
 * [FEATURE] Support Apollo GraphQL. See [#2845](https://github.com/DataDog/dd-sdk-android/pull/2845)

LICENSE-3rdparty.csv

@@ -50,6 +50,7 @@ import,com.benasher44,MIT,"Copyright (c) 2019 Ben Asher"
 import,com.github.bumptech.glide,"BSD 3-Clause","Copyright 2014 Google, Inc. All rights reserved, Copyright (c) 2013. Bump Technologies Inc. All Rights Reserved."
 import,com.facebook.fresco,MIT,"Copyright (c) Facebook, Inc. and its affiliates"
 import,com.github.spotbugs,"GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1","Copyright (C) 1991, 1999 Free Software Foundation, Inc."
+import,com.google.android.gms,Apache-2.0,Copyright 2018 The Android Open Source Project
 import,com.google.android.material,Apache-2.0,Copyright 2018 The Android Open Source Project
 import,com.google.code.gson,Apache-2.0,Copyright 2008 Google Inc
 import,com.google.guava,Apache-2.0,Copyright 2009 The Guava Authors
@@ -71,6 +72,7 @@ import,io.reactivex.rxjava3.android,Apache-2.0,Copyright 2015 The RxAndroid auth
 import,org.jetbrains,Apache-2.0,Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors
 import,org.jetbrains.kotlin,Apache-2.0,Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors
 import,org.jetbrains.kotlinx,Apache-2.0,Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors
+import,org.chromium.net,Apache-2.0,"Copyright 2015 The Chromium Authors"
 import,org.reactivestreams,CC0,Copyright 2014 Reactive Streams
 import(test),androidx.autofill,Apache-2.0,Copyright 2018 The Android Open Source Project
 import(test),androidx.concurrent,Apache-2.0,Copyright 2018 The Android Open Source Project

MIGRATION.MD

@@ -155,6 +155,23 @@ Replacement hints:
 
 The OkHttp instrumentation (`com.datadoghq:dd-sdk-android-okhttp:x.x.x`) doesn't require desugaring support. However few migration actions may be necessary.
 
+The default sample rate for the `traceSampler` got increased to 100% with the Android SDK version `3.0.0`.
+
+To keep 20% sampling rate you have to specify it explicitly:
+```kotlin
+private val okHttpClient = OkHttpClient.Builder()
+    .addInterceptor(
+        DatadogInterceptor.Builder(tracedHosts)
+            .setTraceSampleRate(20f)
+            .build()
+    )
+    .addNetworkInterceptor(
+        TracingInterceptor.Builder(tracedHosts)
+            .setTraceSampleRate(20f)
+            .build()
+    )
+
+```
 
 API changes:
 

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

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

buildSrc/src/test/kotlin/com/datadog/gradle/utils/VersionTest.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.gradle.utils
 
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class VersionTest {
@@ -27,72 +28,99 @@ class VersionTest {
 
     @Test
     fun computesName() {
+        // When
         val name = Version(3, 12, 7).name
-        assert(name == "3.12.7")
+
+        // Then
+        assertThat(name).isEqualTo("3.12.7")
     }
 
     @Test
     fun computesCode() {
+        // When
         val code = Version(3, 12, 7).code
 
-        assert(code == 3127) { "expected code to be 3127 but was $code" }
+        // Then
+        assertThat(code).isEqualTo(3127)
     }
 
     @Test
     fun ensureCodeSequenceHotfix() {
+        // When
         val code = Version(3, 12, Version.MAX_HOTFIX - 1).code
         val next = Version(3, 13, 0).code
 
-        assert(code == next - 1) { "expected code to be next - 1 = ${next - 1} but was $code (@next:$next)" }
+        // Then
+        assertThat(code).isEqualTo(next - 1)
     }
 
     @Test
     fun ensureCodeSequenceMinor() {
+        // When
         val code = Version(3, Version.MAX_MINOR - 1, Version.MAX_HOTFIX - 1).code
         val next = Version(4, 0, 0).code
 
-        assert(code == next - 1) { "expected code to be next - 1 = ${next - 1} but was $code (@next:$next)" }
+        // Then
+        assertThat(code).isEqualTo(next - 1)
     }
 
     @Test
     fun addNoSuffixForRelease() {
+        // When
         val name = Version(3, 12, 7, Version.Type.Release).name
+
+        // Then
         val expected = "3.12.7"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 
     @Test
     fun addSuffixForRC() {
+        // When
         val name = Version(3, 12, 7, Version.Type.ReleaseCandidate(1)).name
+
+        // Then
         val expected = "3.12.7-rc1"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 
     @Test
     fun addSuffixForBeta() {
+        // When
         val name = Version(3, 12, 7, Version.Type.Beta(5)).name
+
+        // Then
         val expected = "3.12.7-beta5"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 
     @Test
     fun addSuffixForAlpha() {
+        // When
         val name = Version(3, 12, 7, Version.Type.Alpha(3)).name
+
+        // Then
         val expected = "3.12.7-alpha3"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 
     @Test
     fun addSuffixForDev() {
+        // When
         val name = Version(3, 12, 7, Version.Type.Dev).name
+
+        // Then
         val expected = "3.12.7-dev"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 
     @Test
     fun addSuffixForSnapshot() {
+        // When
         val name = Version(4, 11, 5, Version.Type.Snapshot).name
+
+        // Then
         val expected = "4.11.5-SNAPSHOT"
-        assert(name == expected) { " expected name to be $expected but was $name" }
+        assertThat(name).isEqualTo(expected)
     }
 }

ci/pipelines/default-pipeline.yml

@@ -102,6 +102,7 @@ analysis:detekt-custom:
     - curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.4/detekt-cli-1.23.4-all.jar
     - ./gradlew :dd-sdk-android-core:customDetektRules
     - ./gradlew :dd-sdk-android-internal:customDetektRules
+    - ./gradlew :features:dd-sdk-android-flags:customDetektRules
     - ./gradlew :features:dd-sdk-android-logs:customDetektRules
     - ./gradlew :features:dd-sdk-android-ndk:customDetektRules
     - ./gradlew :features:dd-sdk-android-rum:customDetektRules
@@ -115,6 +116,7 @@ analysis:detekt-custom:
     - ./gradlew :features:dd-sdk-android-flags-openfeature:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-coil:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-compose:customDetektRules
+    - ./gradlew :integrations:dd-sdk-android-cronet:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-fresco:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-glide:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-okhttp:customDetektRules
@@ -788,6 +790,23 @@ publish:release-compose:
     paths:
       - integrations/dd-sdk-android-compose/verification-metadata.xml
 
+publish:release-cronet:
+  tags: [ "arch:amd64" ]
+  only:
+    - tags
+    - develop
+  image: $CI_IMAGE_DOCKER
+  stage: publish
+  timeout: 30m
+  script:
+    - !reference [.snippets, set-publishing-credentials]
+    - ./gradlew :integrations:dd-sdk-android-cronet:publishToSonatype closeSonatypeStagingRepository --stacktrace --no-daemon
+  artifacts:
+    when: on_success
+    expire_in: 7 days
+    paths:
+      - integrations/dd-sdk-android-cronet/verification-metadata.xml
+
 publish:release-fresco:
   tags: [ "arch:amd64" ]
   only:
@@ -1089,6 +1108,7 @@ notify:merge-verification-metadata:
     - publish:release-webview
     - publish:release-coil
     - publish:release-compose
+    - publish:release-cronet
     - publish:release-fresco
     - publish:release-glide
     - publish:release-trace-coroutines

dd-sdk-android-core/api/apiSurface

@@ -31,6 +31,7 @@ class com.datadog.android._InternalProxy
     fun error(String, Throwable? = null)
     fun error(String, String?, String?)
   val _telemetry: _TelemetryProxy
+  fun setMetricTelemetrySampleRateBypass(Float)
   fun setCustomAppVersion(String)
   companion object 
     fun allowClearTextHttp(com.datadog.android.core.configuration.Configuration.Builder): com.datadog.android.core.configuration.Configuration.Builder
@@ -68,7 +69,7 @@ interface com.datadog.android.api.SdkCore
 data class com.datadog.android.api.context.AccountInfo
   constructor(String, String? = null, Map<String, Any?> = emptyMap())
 data class com.datadog.android.api.context.DatadogContext
-  constructor(com.datadog.android.DatadogSite, String, String, String, String, String, String, String, TimeInfo, ProcessInfo, NetworkInfo, DeviceInfo, UserInfo, AccountInfo?, com.datadog.android.privacy.TrackingConsent, String?, Map<String, Map<String, Any?>>)
+  constructor(com.datadog.android.DatadogSite, String, String, String, String, Int, String, String, String, TimeInfo, ProcessInfo, NetworkInfo, DeviceInfo, UserInfo, AccountInfo?, com.datadog.android.privacy.TrackingConsent, String?, Map<String, Map<String, Any?>>)
 data class com.datadog.android.api.context.DeviceInfo
   constructor(String, String, String, DeviceType, String, String, String, String, String, Int?, LocaleInfo)
 enum com.datadog.android.api.context.DeviceType
@@ -146,6 +147,21 @@ interface com.datadog.android.api.feature.FeatureSdkCore : com.datadog.android.a
 interface com.datadog.android.api.feature.StorageBackedFeature : Feature
   val requestFactory: com.datadog.android.api.net.RequestFactory
   val storageConfiguration: com.datadog.android.api.storage.FeatureStorageConfiguration
+interface com.datadog.android.api.instrumentation.network.ExtendedRequestInfo
+  fun <T> tag(Class<T>): T?
+fun <T> HttpRequestInfo.tag(Class<T>): T?
+interface com.datadog.android.api.instrumentation.network.HttpRequestInfo
+  val url: String
+  val headers: Map<String, List<String>>
+  val contentType: String?
+  val method: String
+  fun contentLength(): Long?
+interface com.datadog.android.api.instrumentation.network.HttpResponseInfo
+  val url: String
+  val statusCode: Int
+  val headers: Map<String, List<String>>
+  val contentType: String?
+  val contentLength: Long?
 data class com.datadog.android.api.net.Request
   constructor(String, String, String, Map<String, String>, ByteArray, String? = null)
 data class com.datadog.android.api.net.RequestExecutionContext
@@ -201,6 +217,7 @@ interface com.datadog.android.core.InternalSdkCore : com.datadog.android.api.fea
   val lastViewEvent: com.google.gson.JsonObject?
   val lastFatalAnrSent: Long?
   val appStartTimeNs: Long
+  val appUptimeNs: Long
   fun writeLastViewEvent(ByteArray)
   fun deleteLastViewEvent()
   fun writeLastFatalAnrSent(Long)
@@ -289,6 +306,29 @@ interface com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
   fun headerTypesForUrl(okhttp3.HttpUrl): Set<com.datadog.android.trace.TracingHeaderType>
   fun getAllHeaderTypes(): Set<com.datadog.android.trace.TracingHeaderType>
   fun isEmpty(): Boolean
+object com.datadog.android.core.internal.net.HttpSpec
+  object Method
+    const val GET: String
+    const val POST: String
+    const val PATCH: String
+    const val PUT: String
+    const val HEAD: String
+    const val DELETE: String
+    const val TRACE: String
+    const val OPTIONS: String
+    const val CONNECT: String
+    fun values()
+  object Headers
+    const val CONTENT_TYPE: String
+    const val CONTENT_LENGTH: String
+    const val WEBSOCKET_ACCEPT_HEADER: String
+  object ContentType
+    const val TEXT_PLAIN: String
+    const val TEXT_EVENT_STREAM: String
+    const val APPLICATION_GRPC: String
+    const val APPLICATION_GRPC_PROTO: String
+    const val APPLICATION_GRPC_JSON: String
+    fun isStream(String?): Boolean
 interface com.datadog.android.core.internal.persistence.Deserializer<P: Any, R: Any>
   fun deserialize(P): R?
 fun java.io.File.canReadSafe(com.datadog.android.api.InternalLogger): Boolean
@@ -378,6 +418,7 @@ object com.datadog.android.log.LogAttributes
   const val APPLICATION_PACKAGE: String
   const val APPLICATION_VERSION: String
   const val ENV: String
+  const val SERVICE: String
   const val DATE: String
   const val DB_INSTANCE: String
   const val DB_OPERATION: String