Skip to content

[NOJIRA] [CHORE] Bump Android SDK to v3.13.1 #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marco-saia-datadog merged 4 commits into from
Sep 2, 2026
Merged

[NOJIRA] [CHORE] Bump Android SDK to v3.13.1 #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
707bc5f
Bump Android SDK version to v3.13.1
marco-saia-datadog Aug 31, 2026
32f5b42
fix: UnparsedFlag breaking change
marco-saia-datadog Aug 31, 2026
9a6c9c5
fix: internal-testing-tools breaking changes
marco-saia-datadog Aug 31, 2026
b995509
fix: detekt DdFlagsImplementation issue
marco-saia-datadog Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmarks/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ dependencies {

// Benchmark tools from dd-sdk-android are used for vitals recording
// Remember to bump this alongside the main dd-sdk-android dependencies
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.12.1")
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.13.1")
// Required for compile-time access to Datadog.getInstance() required by BenchmarkVitalsModuleImpl
implementation("com.datadoghq:dd-sdk-android-core:3.12.1")
implementation("com.datadoghq:dd-sdk-android-core:3.13.1")
}
16 changes: 8 additions & 8 deletions packages/core/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ dependencies {
// This breaks builds if the React Native target is below 0.76.0. as it relies on Gradle 8.5.0.
// To avoid this, we enforce 1.0.0-beta01 on RN < 0.76.0
if (reactNativeMinorVersion < 76) {
implementation("com.datadoghq:dd-sdk-android-rum:3.12.1") {
implementation("com.datadoghq:dd-sdk-android-rum:3.13.1") {
exclude group: "androidx.metrics", module: "metrics-performance"
}
implementation "androidx.metrics:metrics-performance:1.0.0-beta01"
Expand All @@ -233,14 +233,14 @@ dependencies {
}
}
} else {
implementation "com.datadoghq:dd-sdk-android-rum:3.12.1"
implementation "com.datadoghq:dd-sdk-android-rum:3.13.1"
}
implementation "com.datadoghq:dd-sdk-android-logs:3.12.1"
implementation "com.datadoghq:dd-sdk-android-trace:3.12.1"
implementation "com.datadoghq:dd-sdk-android-webview:3.12.1"
implementation "com.datadoghq:dd-sdk-android-ndk:3.12.1"
implementation "com.datadoghq:dd-sdk-android-flags:3.12.1"
implementation "com.datadoghq:dd-sdk-android-internal:3.12.1"
implementation "com.datadoghq:dd-sdk-android-logs:3.13.1"
implementation "com.datadoghq:dd-sdk-android-trace:3.13.1"
implementation "com.datadoghq:dd-sdk-android-webview:3.13.1"
implementation "com.datadoghq:dd-sdk-android-ndk:3.13.1"
implementation "com.datadoghq:dd-sdk-android-flags:3.13.1"
implementation "com.datadoghq:dd-sdk-android-internal:3.13.1"
Comment thread
marco-saia-datadog marked this conversation as resolved.
implementation "com.google.code.gson:gson:2.11.0"
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
Expand Down
7 changes: 7 additions & 0 deletions packages/core/android/src/main/kotlin/com/datadog/reactnative/DdFlagsImplementation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ private fun buildEvaluationContext(
return EvaluationContext(targetingKey, parsed)
}

private const val SERIAL_ID_KEY = "serialId"

private fun convertUnparsedFlagToMap(
flagKey: String,
flag: UnparsedFlag,
Expand Down Expand Up @@ -222,6 +224,8 @@ private fun convertUnparsedFlagToMap(
"reason" to flag.reason,
"doLog" to flag.doLog,
"extraLogging" to flag.extraLogging.toMap(),
// Serialized as a String because the React Native bridge converts Long values to Double
SERIAL_ID_KEY to flag.serialId?.toString()
)
Comment thread
marco-saia-datadog marked this conversation as resolved.
}

Expand All @@ -237,4 +241,7 @@ private fun convertMapToUnparsedFlag(map: Map<String, Any>): UnparsedFlag =
(map["extraLogging"] as? Map<String, Any>)?.toJSONObject()
?: JSONObject()
override val reason: String = map["reason"] as? String ?: ""
override val serialId: Long? =
(map[SERIAL_ID_KEY] as? String)?.toLongOrNull()
?: (map[SERIAL_ID_KEY] as? Number)?.toLong()
}
2 changes: 1 addition & 1 deletion packages/internal-testing-tools/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ dependencies {
}
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation project(path: ':datadog_mobile-react-native')
implementation "com.datadoghq:dd-sdk-android-core:3.12.1"
implementation "com.datadoghq:dd-sdk-android-core:3.13.1"
implementation "com.google.code.gson:gson:2.11.0"

testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
Expand Down
2 changes: 0 additions & 2 deletions ...rc/main/kotlin/com/datadog/reactnative/internaltesting/DdInternalTestingImplementation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ internal class EventWriteScopeInterceptor : EventWriteScope {
}

private val writer = object : EventBatchWriter {
override fun currentMetadata(): ByteArray? = null

override fun write(
event: RawBatchEvent,
batchMetadata: ByteArray?,
Expand Down
9 changes: 5 additions & 4 deletions ...est/kotlin/com/datadog/reactnative/internaltesting/DdInternalTestingImplementationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,11 @@ internal class MockFeatureScope(private val feature: Feature) : FeatureScope {
) {
}

override fun getWriteContextSync(
withFeatureContexts: Set<String>
): Pair<DatadogContext, EventWriteScope>? {
return TODO("Provide the return value")
override fun withWriteContextSync(
withFeatureContexts: Set<String>,
callback: (datadogContext: DatadogContext, write: EventWriteScope) -> Unit
): Boolean {
return false
Comment thread
marco-saia-datadog marked this conversation as resolved.
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-session-replay/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ dependencies {
api "com.facebook.react:react-android:$reactNativeVersion"
}
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.datadoghq:dd-sdk-android-session-replay:3.12.1"
implementation "com.datadoghq:dd-sdk-android-internal:3.12.1"
implementation "com.datadoghq:dd-sdk-android-session-replay:3.13.1"
implementation "com.datadoghq:dd-sdk-android-internal:3.13.1"
implementation project(path: ':datadog_mobile-react-native')

testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-webview/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ dependencies {
implementation "com.facebook.react:react-android:$reactNativeVersion"
}

implementation "com.datadoghq:dd-sdk-android-webview:3.12.1"
implementation "com.datadoghq:dd-sdk-android-webview:3.13.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

implementation project(path: ':datadog_mobile-react-native')
Expand Down