Skip to content

Commit a8be215

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/v3
# Conflicts: # .gitlab-ci.yml
2 parents ab7d8b8 + 1de5d19 commit a8be215

File tree

38 files changed

+2077
-1076
lines changed

38 files changed

+2077
-1076
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
issuer: https://gitlab.ddbuild.io
2+
3+
subject_pattern: "project_path:DataDog/dd-sdk-android:ref_type:branch:ref:.*"
4+
5+
permissions:
6+
contents: read

.gitlab-ci.yml

Lines changed: 8 additions & 1043 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
1+
# 2.23.0 / 2025-06-23
2+
3+
* [FEATURE] Global: Add public APIs for set account information. See [#2694](https://github.com/DataDog/dd-sdk-android/pull/2694)
4+
* [FEATURE] Global: Add `AccountInfo` data class and provider. See [#2696](https://github.com/DataDog/dd-sdk-android/pull/2696)
5+
* [FEATURE] Global: Add `AccountInfo` into `CoreFeature` and `DatadogContext`. See [#2702](https://github.com/DataDog/dd-sdk-android/pull/2702)
6+
* [FEATURE] RUM: Add account information into RUM events. See [#2706](https://github.com/DataDog/dd-sdk-android/pull/2706)
7+
* [FEATURE] Logs: Add Account Information in Logs. See [#2710](https://github.com/DataDog/dd-sdk-android/pull/2710)
8+
* [FEATURE] Traces: Add account information in Trace. See [#2709](https://github.com/DataDog/dd-sdk-android/pull/2709)
9+
* [FEATURE] Global: Add `AP2` datacenter support. See [#2734](https://github.com/DataDog/dd-sdk-android/pull/2734)
10+
* [BUGFIX] RUM: Report resource with size 0. See [#2688](https://github.com/DataDog/dd-sdk-android/pull/2688)
11+
* [BUGFIX] Session Replay: Fix `NullPointerException` in `isOnSecondaryDisplay` method. See [#2701](https://github.com/DataDog/dd-sdk-android/pull/2701)
12+
* [BUGFIX] Session Replay: Defer drawable copy to work thread in Session Replay. See [#2723](https://github.com/DataDog/dd-sdk-android/pull/2723)
13+
* [BUGFIX] RUM: Create a new `RumViewScope` when the session is renewed. See [#2699](https://github.com/DataDog/dd-sdk-android/pull/2699)
14+
* [BUGFIX] RUM: Fix effective sample rate calculation for `SessionEndedMetricDispatcher`. See [#2744](https://github.com/DataDog/dd-sdk-android/pull/2744)
15+
* [IMPROVEMENT] RUM: Allow 24h batch backlog for RUM. See [#2690](https://github.com/DataDog/dd-sdk-android/pull/2690)
16+
* [IMPROVEMENT] RumAuto scenario for Android Benchmark app. See [#2689](https://github.com/DataDog/dd-sdk-android/pull/2689)
17+
* [IMPROVEMENT] Fix Proguard rules for Method Called Metrics. See [#2691](https://github.com/DataDog/dd-sdk-android/pull/2691)
18+
* [IMPROVEMENT] RUM: Enhancement of Compose Actions tracking reflection. See [#2692](https://github.com/DataDog/dd-sdk-android/pull/2692)
19+
* [IMPROVEMENT] Add Account Info fragment for sample app. See [#2703](https://github.com/DataDog/dd-sdk-android/pull/2703)
20+
* [IMPROVEMENT] Add Android TV sample app. See [#2697](https://github.com/DataDog/dd-sdk-android/pull/2697)
21+
* [IMPROVEMENT] Session Replay: Remove `ContentPainterElement` Class Reflection from Telemetry. See [#2714](https://github.com/DataDog/dd-sdk-android/pull/2714)
22+
* [IMPROVEMENT] Global: Update `setUserInfo` and `setAccountInfo` documentation. See [#2715](https://github.com/DataDog/dd-sdk-android/pull/2715)
23+
* [IMPROVEMENT] Session Replay: Avoid copying hardware bitmap in Session Replay. See [#2732](https://github.com/DataDog/dd-sdk-android/pull/2732)
24+
* [IMPROVEMENT] Add integration tests of set account information in `reliability` module. See [#2725](https://github.com/DataDog/dd-sdk-android/pull/2725)
25+
* [IMPROVEMENT] Fix Jetpack Compose Auto instrumentation telemetry in benchmark app. See [#2737](https://github.com/DataDog/dd-sdk-android/pull/2737)
26+
* [MAINTENANCE] Next dev iteration 2.23.0. See [#2678](https://github.com/DataDog/dd-sdk-android/pull/2678)
27+
* [MAINTENANCE] Add BackPressured Dump information into Telemetry log. See [#2673](https://github.com/DataDog/dd-sdk-android/pull/2673)
28+
* [MAINTENANCE] Change Benchmark artifact Id to `dd-sdk-android-benchmark`. See [#2686](https://github.com/DataDog/dd-sdk-android/pull/2686)
29+
* [MAINTENANCE] Add Method Called Metric on Rum event handling. See [#2687](https://github.com/DataDog/dd-sdk-android/pull/2687)
30+
* [MAINTENANCE] Bump Datadog Gradle Plugin to 1.17.0. See [#2693](https://github.com/DataDog/dd-sdk-android/pull/2693)
31+
* [MAINTENANCE] Generate checksum xml. See [#2695](https://github.com/DataDog/dd-sdk-android/pull/2695)
32+
* [MAINTENANCE] Generate `verification-metadata` with pgp information. See [#2698](https://github.com/DataDog/dd-sdk-android/pull/2698)
33+
* [MAINTENANCE] Move `LocalAttribute` class and related extension methods to the `internal` module. See [#2705](https://github.com/DataDog/dd-sdk-android/pull/2705)
34+
* [MAINTENANCE] Move public top-level extension functions and properties from `core` module to `internal` module. See [#2707](https://github.com/DataDog/dd-sdk-android/pull/2707)
35+
* [MAINTENANCE] Remove `Project.exec` usage. See [#2674](https://github.com/DataDog/dd-sdk-android/pull/2674)
36+
* [MAINTENANCE] Improve speed of running `core-it` suite. See [#2711](https://github.com/DataDog/dd-sdk-android/pull/2711)
37+
* [MAINTENANCE] Fix `GsonExt` flaky test. See [#2719](https://github.com/DataDog/dd-sdk-android/pull/2719)
38+
* [MAINTENANCE] Add Android Automotive sample. See [#2724](https://github.com/DataDog/dd-sdk-android/pull/2724)
39+
* [MAINTENANCE] GitHub app migration for PAT. See [#2726](https://github.com/DataDog/dd-sdk-android/pull/2726)
40+
* [MAINTENANCE] Fix `RumSessionScope` flaky test. See [#2730](https://github.com/DataDog/dd-sdk-android/pull/2730)
41+
* [MAINTENANCE] Introduce check release pipeline. See [#2731](https://github.com/DataDog/dd-sdk-android/pull/2731)
42+
* [MAINTENANCE] Remove unnecessary comment. See [#2735](https://github.com/DataDog/dd-sdk-android/pull/2735)
43+
* [MAINTENANCE] Add `dd-octo-sts` to Dockerfile. See [#2739](https://github.com/DataDog/dd-sdk-android/pull/2739)
44+
* [MAINTENANCE] Add `dd-octo-sts` policy for read access. See [#2741](https://github.com/DataDog/dd-sdk-android/pull/2741)
45+
* [MAINTENANCE] Fix `dd-octo-sts` pattern. See [#2743](https://github.com/DataDog/dd-sdk-android/pull/2743)
46+
* [MAINTENANCE] Use `dd-octo-sts` to check release. See [#2742](https://github.com/DataDog/dd-sdk-android/pull/2742)
47+
* [MAINTENANCE] Use `dd-octo-sts` to create PRs in `dd-sdk-android-gradle-plugin`. See [#2746](https://github.com/DataDog/dd-sdk-android/pull/2746)
48+
* [MAINTENANCE] Use `dd-octo-sts` to create PRs in Shopist and Mobile app. See [#2750](https://github.com/DataDog/dd-sdk-android/pull/2750)
49+
* [DOCS] Update Publish Changelog to Confluence: Fix issue with already present page. See [#2683](https://github.com/DataDog/dd-sdk-android/pull/2683)
50+
* [DOCS] Update `changelog-to-confluence`: Update secret names. See [#2727](https://github.com/DataDog/dd-sdk-android/pull/2727)
51+
152
# 2.22.0 / 2025-05-28
253

354
* [FEATURE] Session Replay: Support Coil3 for Session Replay image recording. See [#2648](https://github.com/DataDog/dd-sdk-android/pull/2648)

build.gradle.kts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,21 @@ tasks.register("printSdkDebugRuntimeClasspath") {
224224
File("sdk_classpath").writeText(result.joinToString(File.pathSeparator) { it.absolutePath })
225225
}
226226
}
227+
228+
tasks.register("listAllPublishedArtifactIds") {
229+
doLast {
230+
val artifactIds = rootProject.subprojects.flatMap { subproject ->
231+
val publishing = subproject.extensions.findByType<PublishingExtension>()
232+
publishing?.publications?.mapNotNull { publication ->
233+
if (publication is MavenPublication) {
234+
publication.artifactId
235+
} else {
236+
null
237+
}
238+
}.orEmpty()
239+
}
240+
artifactIds.forEach {
241+
println(it)
242+
}
243+
}
244+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object AndroidConfig {
2121
const val MIN_SDK_FOR_AUTO = 29
2222
const val BUILD_TOOLS_VERSION = "36.0.0"
2323

24-
val VERSION = Version(2, 23, 0, Version.Type.Snapshot)
24+
val VERSION = Version(2, 24, 0, Version.Type.Snapshot)
2525
}
2626

2727
// TODO RUM-628 Switch to Java 17 bytecode

Dockerfile.gitlab renamed to ci/Dockerfile.gitlab

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN apt update && apt install -y python3
4040

4141
# Install pip for aws
4242
RUN set -x \
43-
&& curl -OL https://bootstrap.pypa.io/get-pip.py \
43+
&& curl -OL https://bootstrap.pypa.io/pip/3.8/get-pip.py \
4444
&& python3 get-pip.py \
4545
&& rm get-pip.py
4646

@@ -106,3 +106,5 @@ RUN npm install -g @datadog/datadog-ci
106106
ENV DD_TRACER_FOLDER $PWD/dd-java-agent
107107
RUN mkdir -p $DD_TRACER_FOLDER
108108
RUN wget -O $DD_TRACER_FOLDER/dd-java-agent.jar https://repo1.maven.org/maven2/com/datadoghq/dd-java-agent/$DD_TRACER_VERSION/dd-java-agent-$DD_TRACER_VERSION.jar
109+
110+
COPY --from=registry.ddbuild.io/dd-octo-sts:v1.8.2 /usr/local/bin/dd-octo-sts /usr/local/bin/dd-octo-sts
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
include:
2+
- 'https://gitlab-templates.ddbuild.io/slack-notifier/v1/template.yml'
3+
4+
stages:
5+
- check-release
6+
- notify
7+
8+
check-release:is-published:
9+
tags: [ "arch:amd64" ]
10+
image: $CI_IMAGE_DOCKER
11+
stage: check-release
12+
id_tokens:
13+
DDOCTOSTS_ID_TOKEN:
14+
aud: dd-octo-sts
15+
script:
16+
- export GITHUB_TOKEN=$(dd-octo-sts token --scope DataDog/dd-sdk-android --policy self.gitlab.read)
17+
- bash ./ci/scripts/check_latest_release_is_published.sh
18+
19+
notify:report-failure-to-slack:
20+
extends: .slack-notifier-base
21+
stage: notify
22+
when: on_failure
23+
script:
24+
- BUILD_URL="$CI_PROJECT_URL/pipelines/$CI_PIPELINE_ID"
25+
- 'MESSAGE_TEXT=":status_alert: Some release artifacts were not published to maven. $BUILD_URL"'
26+
- postmessage "#mobile-sdk-ops" "$MESSAGE_TEXT"

0 commit comments

Comments
 (0)