Merge pull request #2747 from DataDog/nogorodnikov/merge-develop-into-feature-sync-200625

Merge `develop` branch into feature sync branch

Author: 0xnm

.github/chainguard/self.gitlab.read.sts.yaml

@@ -0,0 +1,6 @@
+issuer: https://gitlab.ddbuild.io
+
+subject_pattern: "project_path:DataDog/dd-sdk-android:ref_type:branch:ref:.*"
+
+permissions:
+  contents: read

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

@@ -23,9 +23,9 @@ jobs:
             - name: Publish Markdown to Confluence
               uses: markdown-confluence/publish-action@7767a0a7f438bb1497ee7ffd7d3d685b81dfe700 # v5
               with:
-                  confluenceBaseUrl: ${{ secrets.CONFLUENCE_BASE_URL }}
+                  confluenceBaseUrl: ${{ secrets.DATADOG_CONFLUENCE_BASE_URL }}
                   confluenceParentId: ${{ secrets.CONFLUENCE_PARENT_ID }}
-                  atlassianUserName: ${{ secrets.ATLASSIAN_USERNAME }}
-                  atlassianApiToken: ${{ secrets.ATLASSIAN_API_TOKEN }}
+                  atlassianUserName: ${{ secrets.CONFLUENCE_ROBOT_RUM_EMAIL }}
+                  atlassianApiToken: ${{ secrets.CONFLUENCE_ROBOT_RUM_API_KEY }}
                   contentRoot: '.'
                   folderToPublish: 'publish_folder'

.gitlab-ci.yml

@@ -95,6 +95,7 @@ tasks.register("assembleSampleRelease") {
         ":sample:kotlin:assembleUs1Release",
         ":sample:wear:assembleUs1Release",
         ":sample:vendor-lib:assembleRelease",
+        ":sample:automotive:assembleRelease",
         ":sample:tv:assembleRelease"
     )
 }
@@ -223,3 +224,21 @@ tasks.register("printSdkDebugRuntimeClasspath") {
         File("sdk_classpath").writeText(result.joinToString(File.pathSeparator) { it.absolutePath })
     }
 }
+
+tasks.register("listAllPublishedArtifactIds") {
+    doLast {
+        val artifactIds = rootProject.subprojects.flatMap { subproject ->
+            val publishing = subproject.extensions.findByType<PublishingExtension>()
+            publishing?.publications?.mapNotNull { publication ->
+                if (publication is MavenPublication) {
+                    publication.artifactId
+                } else {
+                    null
+                }
+            }.orEmpty()
+        }
+        artifactIds.forEach {
+            println(it)
+        }
+    }
+}

build.gradle.kts

@@ -18,6 +18,7 @@ object AndroidConfig {
     const val TARGET_SDK = 36
     const val MIN_SDK = 21
     const val MIN_SDK_FOR_WEAR_AND_TV = 23
+    const val MIN_SDK_FOR_AUTO = 29
     const val BUILD_TOOLS_VERSION = "36.0.0"
 
     val VERSION = Version(2, 23, 0, Version.Type.Snapshot)

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

@@ -122,3 +122,20 @@ fun ApplicationDefaultConfig.configureFlavorForTvApp(
         "\"${config.token}\""
     )
 }
+
+@Suppress("UnstableApiUsage")
+fun ApplicationDefaultConfig.configureFlavorForAutoApp(
+    rootDir: File
+) {
+    val config = sampleAppConfig("${rootDir.absolutePath}/config/auto.json")
+    buildConfigField(
+        "String",
+        "DD_RUM_APPLICATION_ID",
+        "\"${config.rumApplicationId}\""
+    )
+    buildConfigField(
+        "String",
+        "DD_CLIENT_TOKEN",
+        "\"${config.token}\""
+    )
+}

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

@@ -40,7 +40,7 @@ RUN apt update && apt install -y python3
 
 #  Install pip for aws
 RUN set -x \
- && curl -OL https://bootstrap.pypa.io/get-pip.py \
+ && curl -OL https://bootstrap.pypa.io/pip/3.8/get-pip.py \
  && python3 get-pip.py \
  && rm get-pip.py
 
@@ -106,3 +106,5 @@ RUN npm install -g @datadog/datadog-ci
 ENV DD_TRACER_FOLDER $PWD/dd-java-agent
 RUN mkdir -p $DD_TRACER_FOLDER
 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
+
+COPY --from=registry.ddbuild.io/dd-octo-sts:v1.8.2 /usr/local/bin/dd-octo-sts /usr/local/bin/dd-octo-sts

Dockerfile.gitlab renamed to ci/Dockerfile.gitlab

@@ -0,0 +1,27 @@
+include:
+  - "ci/pipelines/common-snippets.yml"
+  - 'https://gitlab-templates.ddbuild.io/slack-notifier/v1/template.yml'
+
+stages:
+  - check-release
+  - notify
+
+check-release:is-published:
+  tags: [ "arch:amd64" ]
+  image: $CI_IMAGE_DOCKER
+  stage: check-release
+  id_tokens:
+    DDOCTOSTS_ID_TOKEN:
+      aud: dd-octo-sts
+  script:
+    - export GITHUB_TOKEN=$(dd-octo-sts token --scope DataDog/dd-sdk-android --policy self.gitlab.read)
+    - bash ./ci/scripts/check_latest_release_is_published.sh
+
+notify:report-failure-to-slack:
+  extends: .slack-notifier-base
+  stage: notify
+  when: on_failure
+  script:
+    - BUILD_URL="$CI_PROJECT_URL/pipelines/$CI_PIPELINE_ID"
+    - 'MESSAGE_TEXT=":status_alert: Some release artifacts were not published to maven. $BUILD_URL"'
+    - postmessage "#mobile-sdk-ops" "$MESSAGE_TEXT"

ci/pipelines/check-release-pipeline.yml

@@ -0,0 +1,5 @@
+.common-snippets:
+  set-github-installation-token:
+    - export GITHUB_APP_CLIENT_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-sdk-android.gh_app_client_id --with-decryption --query "Parameter.Value" --out text)
+    - export GITHUB_APP_INSTALLATION_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-sdk-android.gh_app_installation_id --with-decryption --query "Parameter.Value" --out text)
+    - export GITHUB_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.dd-sdk-android.gh_app_private_key --with-decryption --query "Parameter.Value" --out text | bash ./ci/scripts/create_github_installation_token.sh "$GITHUB_APP_CLIENT_ID" "$GITHUB_APP_INSTALLATION_ID")