Main to 0.x

.buildkite/release.yml

@@ -2,11 +2,16 @@ agents:
   provider: "gcp"
   image: "family/apm-agent-android-ubuntu-2204"
 
+env:
+  TARBALL_FILE: ${TARBALL_FILE:-dist.tar}
+
 steps:
   - label: "Run the release"
     key: "release"
     commands: .ci/release-wrapper.sh
-    artifact_paths: "release.out"
+    artifact_paths:
+      - "release.out"
+      - "${TARBALL_FILE}"
 
 notify:
   - slack:

.ci/release.sh

@@ -25,7 +25,7 @@ if [[ "$target_specifier" == "all" ||  "$target_specifier" == "mavenCentral" ]];
     ./gradlew publishElasticPublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository $COMMON_GRADLE_DEPLOY_PARAMS
   else
     echo "--- Release the binaries to Maven Central :package: (dry-run)"
-    ./gradlew tasks
+    ./gradlew assemble
   fi
 fi
 
@@ -35,7 +35,11 @@ if [[ "$target_specifier" == "all" ||  "$target_specifier" == "pluginPortal" ]];
     ./gradlew publishPlugins -Pgradle.publish.key=$PLUGIN_PORTAL_KEY -Pgradle.publish.secret=$PLUGIN_PORTAL_SECRET $COMMON_GRADLE_DEPLOY_PARAMS
   else
     echo "--- Release the binaries to Gradle Plugin portal :package: (dry-run)"
-    ./gradlew tasks
+    ./gradlew assemble
   fi
 fi
+
+echo "--- Archive the build folders with jar/aar files"
+find . -type d -name build -exec find {} \( -name '*.jar' -o -name '*.aar' \) -print0 \; | xargs -0 tar -cvf "${TARBALL_FILE:-dist.tar}"
+
 set -x

.github/actions/setup/action.yml

@@ -0,0 +1,27 @@
+---
+
+name: common build tasks
+description: Install specific JDK
+
+inputs:
+  java-version:
+    description: 'Testing Java version'
+    required: true
+    default: '17'
+  java-distribution:
+    description: 'Testing Java distribution'
+    required: true
+    default: 'temurin'
+  shell:
+    description: 'Default shell'
+    default: 'bash'
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up testing JDK
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ inputs.java-version }}
+        distribution: ${{ inputs.java-distribution }}

.github/dependabot.yml

@@ -1,3 +1,4 @@
+---
 version: 2
 updates:
 
@@ -14,3 +15,17 @@ updates:
       github-actions:
         patterns:
           - "*"
+
+  # GitHub composite actions
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/setup"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "22:00"
+    reviewers:
+      - "elastic/observablt-ci"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/ci.yml

@@ -22,6 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
       - name: lint
         run: ./gradlew lint
       - name: Verify OSS compliance
@@ -31,6 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
       - name: Build
         run: ./gradlew assemble
       - name: Test
@@ -62,6 +64,12 @@ jobs:
   test-release:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
+    permissions:
+      attestations: write
+      contents: write
+      id-token: write
+    env:
+      TARBALL_FILE: dist.tar
     steps:
       - id: buildkite
         name: Run Release dry-run
@@ -71,9 +79,30 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: apm-agent-android-release
+          pipelineBranch: ${{ github.ref_name }}
           waitFor: true
           printBuildLogs: false
+          artifactName: signed-artifacts
+          artifactPath: ${{ env.TARBALL_FILE }}
           buildEnvVars: |
-            branch_specifier=main
+            branch_specifier=${{ github.ref_name }}
             target_specifier=all
             dry_run=true
+            TARBALL_FILE=${{ env.TARBALL_FILE }}
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: signed-artifacts
+
+      - name: untar the buildkite tarball
+        run: tar xvf ${{ env.TARBALL_FILE }}
+
+      - name: generate build provenance (jar files)
+        uses: actions/attest-build-provenance@951c0c5f8e375ad4efad33405ab77f7ded2358e4  # v1.1.1
+        with:
+          subject-path: "${{ github.workspace }}/**/build/libs/*.jar"
+
+      - name: generate build provenance (aar files)
+        uses: actions/attest-build-provenance@951c0c5f8e375ad4efad33405ab77f7ded2358e4  # v1.1.1
+        with:
+          subject-path: "${{ github.workspace }}/**/build/outputs/aar/*.aar"

.github/workflows/release.yml

@@ -38,7 +38,12 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-
+    env:
+      TARBALL_FILE: dist.tar
+    permissions:
+      attestations: write
+      contents: write
+      id-token: write
     steps:
       - id: notification
         name: Notify that a release will start
@@ -60,13 +65,34 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           pipeline: apm-agent-android-release
+          pipelineBranch: ${{ github.ref_name }}
           waitFor: true
           printBuildLogs: false
+          artifactName: signed-artifacts
+          artifactPath: ${{ env.TARBALL_FILE }}
           buildEnvVars: |
             branch_specifier=${{ inputs.branch_specifier || 'main' }}
             target_specifier=${{ inputs.target_specifier || 'all' }}
             version_override_specifier=${{ inputs.version_override_specifier || '' }}
             dry_run=${{ inputs.dry_run || 'false' }}
+            TARBALL_FILE=${{ env.TARBALL_FILE }}
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: signed-artifacts
+
+      - name: untar the buildkite tarball
+        run: tar xvf ${{ env.TARBALL_FILE }}
+
+      - name: generate build provenance (jar files)
+        uses: actions/attest-build-provenance@951c0c5f8e375ad4efad33405ab77f7ded2358e4  # v1.1.1
+        with:
+          subject-path: "${{ github.workspace }}/**/build/libs/*.jar"
+
+      - name: generate build provenance (aar files)
+        uses: actions/attest-build-provenance@951c0c5f8e375ad4efad33405ab77f7ded2358e4  # v1.1.1
+        with:
+          subject-path: "${{ github.workspace }}/**/build/outputs/aar/*.aar"
 
       - if: ${{ success() }}
         uses: elastic/apm-pipeline-library/.github/actions/slack-message@current
@@ -109,6 +135,6 @@ jobs:
         with:
           ref: ${{ inputs.branch_specifier || 'main' }}
           token: ${{ env.GITHUB_TOKEN }}
-
+      - uses: ./.github/actions/setup
       - if: ${{ ! inputs.dry_run }}
         run: ./gradlew postDeploy -Prelease=true -Pversion_override=${{ inputs.version_override_specifier || '' }}

.github/workflows/snapshoty.yml

@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup
       - name: Assemble
         run: ./gradlew assemble
       - name: Publish snaphosts

.github/workflows/updateVersionBranch.yml

@@ -34,7 +34,13 @@ jobs:
           text: ${{ github.event.pull_request.head.ref }}
           regex: 'post-release/(\d+).+'
 
-      - run: gh pr create --base ${{ env.BASE_BRANCH }} --title 'Merge main into version branch' --body 'Created by Github action' --reviewer elastic/apm-agent-android
+      - run: |
+          CONFLICT_RESOLUTION_BRANCH="post-release/main-to-${{ env.BASE_BRANCH }}"
+          git switch ${{ env.BASE_BRANCH }}
+          git checkout -b $CONFLICT_RESOLUTION_BRANCH
+          git merge main --strategy-option theirs
+          git push -u origin $CONFLICT_RESOLUTION_BRANCH
+          gh pr create --base ${{ env.BASE_BRANCH }} --title 'Merge main into version branch' --body 'Created by Github action :robot:' --reviewer elastic/apm-agent-android
         env:
           GH_TOKEN: ${{ env.GITHUB_TOKEN }}
           BASE_BRANCH: "${{ steps.major-version.outputs.group1 }}.x"

.java-version

@@ -1 +1 @@
-11
+17

CHANGELOG.asciidoc

@@ -35,6 +35,14 @@ ${next_release_notes}
 * New feature: {pull}000[#000]
 ////
 
+[[release-notes-0.17.0]]
+==== 0.17.0 - 2024/05/17
+
+[float]
+===== Features
+
+* Adding consumer R8 rules to address R8 full mode: {pull}309[#309]
+
 [[release-notes-0.16.0]]
 ==== 0.16.0 - 2024/04/03
 

android-sdk-ktx/metadata/notice.properties

@@ -1 +1 @@
-dependencies.hash=AFDBF157F73953F0B7829B5B718072E7
+dependencies.hash=4335DC6BB998D19BBBD590A9B2803A50

android-sdk/build.gradle

@@ -41,10 +41,12 @@ shadowJar {
 dependencies {
     api libs.opentelemetry.sdk
     api libs.opentelemetry.android
-    api libs.opentelemetry.events
+    api libs.opentelemetry.api.incubator
     api libs.stagemonitor.configuration
     api libs.okhttp
     implementation project(':android-common')
+    implementation libs.opentelemetry.android.instrumentation.api
+    implementation libs.opentelemetry.android.instrumentation.lifecycle
     implementation libs.androidx.lifecycle
     implementation libs.weaklockfree
     implementation libs.opentelemetry.exporter.otlp

android-sdk/metadata/notice.properties

@@ -1 +1 @@
-dependencies.hash=77B4570CA3D2C0BA9C3541561D0679C0
+dependencies.hash=A0177AAB7C169836786E530C6453B8A1

android-sdk/src/main/java/co/elastic/apm/android/sdk/ElasticApmAgent.java

@@ -21,6 +21,7 @@
 import android.app.Application;
 import android.content.Context;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.lifecycle.ProcessLifecycleOwner;
 
@@ -42,7 +43,7 @@
 import co.elastic.apm.android.sdk.connectivity.Connectivity;
 import co.elastic.apm.android.sdk.connectivity.opentelemetry.SignalConfiguration;
 import co.elastic.apm.android.sdk.connectivity.opentelemetry.exporters.VisitableExporters;
-import co.elastic.apm.android.sdk.features.persistence.SignalDiskExporter;
+import co.elastic.apm.android.sdk.features.persistence.SignalFromDiskExporter;
 import co.elastic.apm.android.sdk.instrumentation.Instrumentations;
 import co.elastic.apm.android.sdk.internal.api.filter.ComposableFilter;
 import co.elastic.apm.android.sdk.internal.configuration.Configurations;
@@ -67,17 +68,18 @@
 import co.elastic.apm.android.sdk.session.SessionManager;
 import io.opentelemetry.android.OpenTelemetryRum;
 import io.opentelemetry.android.config.OtelRumConfig;
+import io.opentelemetry.android.features.diskbuffering.DiskBufferingConfiguration;
 import io.opentelemetry.android.instrumentation.activity.VisibleScreenTracker;
 import io.opentelemetry.android.instrumentation.lifecycle.AndroidLifecycleInstrumentationBuilder;
 import io.opentelemetry.android.instrumentation.startup.AppStartupTimer;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.events.GlobalEventEmitterProvider;
+import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
-import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
+import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.resources.Resource;
@@ -205,7 +207,7 @@ public static void resetForTest() {
         ConnectionHttpAttributesVisitor.resetForTest();
         ServiceManager.resetForTest();
         GlobalOpenTelemetry.resetForTest();
-        GlobalEventEmitterProvider.resetForTest();
+        GlobalEventLoggerProvider.resetForTest();
         instance = null;
     }
 
@@ -281,9 +283,8 @@ private void initializeOpentelemetry(Application app, AgentDependenciesInjector
         Resource resource = configuration.resource
                 .merge(Resource.create(resourceAttrs));
 
-        OtelRumConfig rumConfig = new OtelRumConfig();
-        rumConfig.disableNetworkAttributes();
-        rumConfig.disableNetworkChangeMonitoring();
+        OtelRumConfig rumConfig = getOtelRumConfig();
+
         OpenTelemetryRum rum = OpenTelemetryRum.builder(app, rumConfig)
                 .addTracerProviderCustomizer((sdkTracerProviderBuilder, application) -> configureTracerProviderBuilder(sdkTracerProviderBuilder, signalConfiguration, resource, globalAttributesVisitor, sampleRateManager))
                 .addMeterProviderCustomizer((sdkMeterProviderBuilder, application) -> configureMeterProviderBuilder(sdkMeterProviderBuilder, signalConfiguration, resource, sampleRateManager))
@@ -302,16 +303,28 @@ private void initializeOpentelemetry(Application app, AgentDependenciesInjector
 
         OpenTelemetry openTelemetry = rum.getOpenTelemetry();
         GlobalOpenTelemetry.set(openTelemetry);
-        GlobalEventEmitterProvider.set(SdkEventEmitterProvider.create(openTelemetry.getLogsBridge(), ntpManager.getClock()));
+        GlobalEventLoggerProvider.set(SdkEventLoggerProvider.create(openTelemetry.getLogsBridge(), ntpManager.getClock()));
 
         if (persistenceInitializer != null) {
-            SignalDiskExporter.set(persistenceInitializer.createSignalDiskExporter());
+            SignalFromDiskExporter.set(persistenceInitializer.createSignalDiskExporter());
             configuration.persistenceConfiguration.exportScheduler.onPersistenceEnabled();
         } else {
             configuration.persistenceConfiguration.exportScheduler.onPersistenceDisabled();
         }
     }
 
+    @NonNull
+    private static OtelRumConfig getOtelRumConfig() {
+        OtelRumConfig rumConfig = new OtelRumConfig();
+        rumConfig.disableNetworkAttributes();
+        rumConfig.disableNetworkChangeMonitoring();
+        rumConfig.disableAnrDetection();
+        rumConfig.disableCrashReporting();
+        rumConfig.disableSlowRenderingDetection();
+        rumConfig.setDiskBufferingConfiguration(DiskBufferingConfiguration.builder().setEnabled(false).build());
+        return rumConfig;
+    }
+
     private PersistenceInitializer tryInitializePersistence(SignalConfiguration signalConfiguration, AgentDependenciesInjector injector) {
         if (configuration.persistenceConfiguration.enabled && signalConfiguration instanceof VisitableExporters) {
             Elog.getLogger().debug("Initializing the persistence feature");