Skip to content

Commit 2fcaa92

Browse files
authored
Merge pull request #3646 from DataDog/yl/merge-release-into-develop
Merge release/3.12.0 into develop
2 parents 430f377 + 2485bc6 commit 2fcaa92

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ variables:
77
DD_ENV_TESTS: "ci"
88
DD_CIVISIBILITY_ENABLED: "true"
99
DD_INSIDE_CI: "true"
10-
DD_COMMON_AGENT_CONFIG: "dd.env=ci,dd.trace.enabled=false,dd.jmx.fetch.enabled=false"
10+
# Disable the DD Javac compiler plugin auto-config; it injects annotations into all compiled classes, breaking R8 for consumers.
11+
DD_COMMON_AGENT_CONFIG: "dd.env=ci,dd.trace.enabled=false,dd.jmx.fetch.enabled=false,dd.civisibility.compiler.plugin.auto.configuration.enabled=false"
1112

1213
KUBERNETES_MEMORY_REQUEST: "8Gi"
1314
KUBERNETES_MEMORY_LIMIT: "32Gi"

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 3.12.1 / 2026-07-16
2+
3+
* [BUGFIX] Fix R8 failures due to missing `SourceLines` annotation. See [#3642](https://github.com/DataDog/dd-sdk-android/pull/3642)
4+
15
# 3.12.0 / 2026-07-15
26

37
* [FEATURE] Continuous Profiling: capture profiling sessions correlated with RUM, with app-launch, ANR and long-task triggers, cross-feature sampling, quota checks and clock-drift gating. See [#3622](https://github.com/DataDog/dd-sdk-android/pull/3622)

sample/benchmark/proguard-rules.pro

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
-dontwarn reactor.blockhound.integration.BlockHoundIntegration
2828
# These annotations are introduced by OpenTelemetry API and we need to make sure R8 will not complain about them
2929
-dontwarn com.google.**
30-
# These annotations are injected by dd-java-agent at class-load time for source code profiling.
31-
# They are not present in the build classpath, so R8 must not treat them as errors.
32-
-dontwarn datadog.compiler.annotations.**
3330

3431
-keepattributes RuntimeVisibleAnnotations
3532
-keep class * extends androidx.navigation.Navigator

sample/kotlin/proguard-rules.pro

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@
3232
-dontwarn java.lang.management.RuntimeMXBean
3333
# These annotations are introduced by OpenTelemetry API and we need to make sure R8 will not complain about them
3434
-dontwarn com.google.**
35-
# These annotations are injected by dd-java-agent at class-load time for source code profiling.
36-
# They are not present in the build classpath, so R8 must not treat them as errors.
37-
-dontwarn datadog.compiler.annotations.**

0 commit comments

Comments
 (0)