elastic
diff --git a/‎.buildkite/hooks/pre-command‎
Lines changed: 7 additions & 3 deletions b/‎.buildkite/hooks/pre-command‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎.buildkite/hooks/prepare-common.sh‎
Lines changed: 12 additions & 2 deletions b/‎.buildkite/hooks/prepare-common.sh‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎.buildkite/release.yml‎
Lines changed: 4 additions & 0 deletions b/‎.buildkite/release.yml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎.buildkite/snapshot.yml‎
Lines changed: 4 additions & 0 deletions b/‎.buildkite/snapshot.yml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎.ci/published-artifacts-list.sh‎
Lines changed: 21 additions & 0 deletions b/‎.ci/published-artifacts-list.sh‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎.ci/release.sh‎
Lines changed: 7 additions & 1 deletion b/‎.ci/release.sh‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎.ci/snapshot.sh‎
Lines changed: 7 additions & 1 deletion b/‎.ci/snapshot.sh‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 10 additions & 1 deletion b/‎.github/workflows/main.yml‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎.github/workflows/opentelemetry.yml‎
Lines changed: 0 additions & 22 deletions b/‎.github/workflows/opentelemetry.yml‎
Lines changed: 0 additions & 22 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 52 additions & 31 deletions b/‎.github/workflows/release.yml‎
Lines changed: 52 additions & 31 deletions
@@ -14,8 +14,15 @@ if [[ "$BUILDKITE_COMMAND" =~ .*"upload".* ]]; then
   exit 0
 fi
 
+# Run always
+source .buildkite/hooks/prepare-common.sh
+
 if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-opentelemetry-benchmark" ]; then
     source .buildkite/hooks/prepare-benchmark.sh
+    # NOTE: https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11323 might
+    #       support .java-version, if so then it might be worthy to read the file.
+    JAVA_VERSION=21
+    source .buildkite/hooks/prepare-common.sh
 fi
 
 if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-snapshot" ]; then
@@ -25,6 +32,3 @@ fi
 if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-release" ]; then
     source .buildkite/hooks/prepare-release.sh
 fi
-
-# Run always
-source .buildkite/hooks/prepare-common.sh
 
@@ -1,9 +1,19 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -eo pipefail
 
 # Configure the java version
-JAVA_VERSION=$(cat .java-version | xargs | tr -dc '[:print:]')
+if [ -z "$JAVA_VERSION" ] ; then
+  JAVA_VERSION=$(cat .java-version | xargs | tr -dc '[:print:]')
+fi
+set +u
+# In case the HOME is not available in the context of the runner.
+if [ -z "${HOME}" ] ; then
+  HOME="${BUILDKITE_BUILD_CHECKOUT_PATH}"
+  export HOME
+fi
 JAVA_HOME="${HOME}/.java/openjdk${JAVA_VERSION}"
+set -u
+
 export JAVA_HOME
 PATH="${JAVA_HOME}/bin:${PATH}"
 export PATH
 
@@ -2,13 +2,17 @@ agents:
   provider: "gcp"
   image: "family/apm-agent-java-ubuntu-2204"
 
+env:
+  TARBALL_FILE: ${TARBALL_FILE:-artifacts.tar}
+
 steps:
   - label: "Run the release"
     key: "release"
     commands: .ci/release.sh
     artifact_paths:
       - "release.txt"
       - "**/target/*"
+      - "${TARBALL_FILE}"
 
 notify:
   - slack: "#apm-agent-java"
 
@@ -2,13 +2,17 @@ agents:
   provider: "gcp"
   image: "family/apm-agent-java-ubuntu-2204"
 
+env:
+  TARBALL_FILE: ${TARBALL_FILE:-artifacts.tar}
+
 steps:
   - label: "Run the snapshot"
     key: "release"
     commands: .ci/snapshot.sh
     artifact_paths:
       - "snapshot.txt"
       - "**/target/*"
+      - "${TARBALL_FILE}"
 
 notify:
   - slack: "#apm-agent-java"
 
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+targets="$(find . -type d -name 'target'|grep -v apm-agent-plugins|grep -v integration-tests|sort)"
+
+for t in ${targets}; do
+    find "${t}" \
+        -name '*.jar' \
+        | grep -v '\-sources.jar' \
+        | grep -v '\-tests.jar' \
+        | grep -v '\-javadoc.jar' \
+        | grep -v 'original-' \
+        | grep -v 'classes/' \
+        | grep -v 'benchmarks' \
+        | grep -v 'apm-agent-bootstrap' \
+        | grep -v 'apm-agent-builds' \
+        | grep -v 'apm-agent-cached-lookup-key' \
+        | grep -v 'apm-agent-core' \
+        | grep -v 'apm-agent-common' \
+        | grep -v 'apm-agent-lambda-layer' \
+        | grep -v 'apm-agent-premain'
+done
@@ -10,7 +10,7 @@ set -eo pipefail
 clean_up () {
   ARG=$?
   echo "--- Deleting tmp workspace"
-  rm -rf $TMP_WORKSPACE
+  rm -rf $TMP_WORKSPACE || true
   exit $ARG
 }
 trap clean_up EXIT
@@ -32,3 +32,9 @@ fi
 
 echo "--- Deploy the release :package: [./mvnw $GOAL)] $DRY_RUN_MSG"
 ./mvnw -V -s .ci/settings.xml -Pgpg clean $GOAL -DskipTests --batch-mode | tee release.txt
+
+echo "--- Archive the target folder with jar files"
+echo 'gather artifacts'
+.ci/published-artifacts-list.sh | tee artifacts.list
+echo 'create tarbal'
+tar -cvf "${TARBALL_FILE:-artifacts.tar}" -T artifacts.list
@@ -12,7 +12,7 @@ set -eo pipefail
 clean_up () {
   ARG=$?
   echo "--- Deleting tmp workspace"
-  rm -rf $TMP_WORKSPACE
+  rm -rf $TMP_WORKSPACE || true
   exit $ARG
 }
 trap clean_up EXIT
@@ -34,3 +34,9 @@ fi
 
 echo "--- Deploy the snapshot :package: [./mvnw $GOAL)] $DRY_RUN_MSG"
 ./mvnw -V -s .ci/settings.xml -Pgpg clean $GOAL -DskipTests --batch-mode | tee snapshot.txt
+
+echo "--- Archive the target folder with jar files"
+echo 'gather artifacts'
+.ci/published-artifacts-list.sh | tee artifacts.list
+echo 'create tarbal'
+tar -cvf "${TARBALL_FILE:-artifacts.tar}" -T artifacts.list
@@ -63,6 +63,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/maven-goal
@@ -128,6 +129,7 @@ jobs:
     name: License
     runs-on: ubuntu-latest
     needs: build
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/unstash
@@ -148,6 +150,7 @@ jobs:
     # When undefined, we need to emulate the default value
     if: inputs.test_ci == true || inputs.test_ci == null
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: build
     steps:
       - uses: actions/checkout@v4
@@ -169,6 +172,7 @@ jobs:
 
   non-app-server-integration-tests:
     name: Non-Application Server integration tests
+    timeout-minutes: 60
     if: |
       contains(github.event.pull_request.labels.*.name, 'ci:agent-integration')
       || github.event.pull_request.draft == false
@@ -207,6 +211,7 @@ jobs:
 
   app-server-integration-tests:
     name: Application Server integration tests
+    timeout-minutes: 60
     if: |
       contains(github.event.pull_request.labels.*.name, 'ci:agent-integration')
       || github.event.pull_request.draft == false
@@ -248,6 +253,7 @@ jobs:
     name: Javadoc
     runs-on: ubuntu-latest
     needs: build
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/unstash
@@ -260,6 +266,7 @@ jobs:
 
   unit-tests-windows:
     name: Build & Test Windows
+    timeout-minutes: 60
     # Inputs aren't defined on some events
     # When undefined, we need to emulate the default value
     if: |
@@ -287,6 +294,7 @@ jobs:
 
   jdk-compatibility-tests:
     name: JDK Compatibility Tests
+    timeout-minutes: 60
     if: |
       contains(github.event.pull_request.labels.*.name, 'ci:jdk-compatibility')
       || inputs.jdk_compatibility_ci == true
@@ -301,7 +309,7 @@ jobs:
             distribution: 'temurin'
           - version: 21
             distribution: 'temurin'
-          - version: 22-ea
+          - version: 22
             distribution: 'temurin'
     steps:
       - uses: actions/checkout@v4
@@ -324,6 +332,7 @@ jobs:
   jboss:
     name: JBoss integration tests
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: build
     # If no PR event or if a PR event that's caused by a non-fork and non dependabot actor
     if: github.event_name != 'pull_request' || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' )
 
@@ -74,6 +74,12 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - validate-tag
+    permissions:
+      attestations: write
+      contents: write
+      id-token: write
+    env:
+      TARBALL_FILE: artifacts.tar
     steps:
       - id: buildkite
         continue-on-error: true
@@ -86,8 +92,23 @@ jobs:
           pipeline: apm-agent-java-release
           waitFor: true
           printBuildLogs: false
+          artifactName: releases
+          artifactPath: ${{ env.TARBALL_FILE }}
           buildEnvVars: |
             dry_run=${{ inputs.dry_run || 'false' }}
+            TARBALL_FILE=${{ env.TARBALL_FILE }}
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: releases
+
+      - name: untar the buildkite tarball
+        run: tar xvf ${{ env.TARBALL_FILE }}
+
+      - name: generate build provenance
+        uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d  # v1.1.2
+        with:
+          subject-path: "${{ github.workspace }}/**/target/*.jar"
 
   await-maven-central-artifact:
     name: "Wait for artifacts to be available on maven central"
@@ -101,37 +122,12 @@ jobs:
           artifactid: 'elastic-apm-agent'
           version: ${{ env.RELEASE_VERSION }}
 
-  update-major-branch:
-    name: "Update Major Branch"
-    runs-on: ubuntu-latest
-    needs:
-      - await-maven-central-artifact
-    permissions:
-      contents: write
-    steps:
-      - uses: elastic/apm-pipeline-library/.github/actions/github-token@current
-        with:
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
-      - uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
-        with:
-          username: ${{ env.GIT_USER }}
-          email: ${{ env.GIT_EMAIL }}
-          token: ${{ env.GITHUB_TOKEN }}
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-          token: ${{ env.GITHUB_TOKEN }}
-      - name: Update major branch
-        if: ${{ ! inputs.dry_run }}
-        run: .ci/release/update-major-branch.sh ${{ env.RELEASE_VERSION }}
-
   build-and-push-docker-images:
     name: "Build and push docker images"
     runs-on: ubuntu-latest
     needs:
       - await-maven-central-artifact
+      - create-github-release
     env:
       SONATYPE_FALLBACK: 1
     steps:
@@ -148,11 +144,11 @@ jobs:
           secretId: ${{ secrets.VAULT_SECRET_ID }}
       - name: "Build docker image"
         shell: bash
-        run: ./scripts/docker-release/build_docker.sh
+        run: ./scripts/docker-release/build_docker.sh "${{ env.RELEASE_VERSION }}"
       - name: "Push docker image"
         if: ${{ ! inputs.dry_run }}
         shell: bash
-        run: ./scripts/docker-release/push_docker.sh
+        run: ./scripts/docker-release/push_docker.sh "${{ env.RELEASE_VERSION }}"
 
   publish-aws-lambda:
     name: "Publish AWS Lambda"
@@ -186,7 +182,7 @@ jobs:
         if: ${{ ! inputs.dry_run }}
         run: |
           # Convert v1.2.3 to ver-1-2-3
-          VERSION=${RELEASE_VERSION/v/ver-}
+          VERSION=${RELEASE_VERSION_TAG/v/ver-}
           VERSION=${VERSION//./-}
           
           ELASTIC_LAYER_NAME="elastic-apm-java-${VERSION}" .ci/publish-aws.sh
@@ -217,10 +213,35 @@ jobs:
       phase: 'post'
     secrets: inherit
 
+  update-major-branch:
+    name: "Update Major Branch"
+    runs-on: ubuntu-latest
+    needs:
+      - post-release
+    permissions:
+      contents: write
+    steps:
+      - uses: elastic/apm-pipeline-library/.github/actions/github-token@current
+        with:
+          url: ${{ secrets.VAULT_ADDR }}
+          roleId: ${{ secrets.VAULT_ROLE_ID }}
+          secretId: ${{ secrets.VAULT_SECRET_ID }}
+      - uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
+        with:
+          username: ${{ env.GIT_USER }}
+          email: ${{ env.GIT_EMAIL }}
+          token: ${{ env.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          token: ${{ env.GITHUB_TOKEN }}
+      - name: Update major branch
+        if: ${{ ! inputs.dry_run }}
+        run: .ci/release/update-major-branch.sh ${{ env.RELEASE_VERSION }}
+
   create-github-release:
     name: "Create GitHub Release"
     needs:
-      - post-release
       - publish-aws-lambda
       - update-major-branch
     runs-on: ubuntu-latest
@@ -247,7 +268,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release create ${{ env.RELEASE_VERSION }} \
+          gh release create ${{ env.RELEASE_VERSION_TAG }} \
             --title="Release ${{ env.RELEASE_VERSION }}" \
             --notes="[Release Notes for ${{ env.RELEASE_VERSION }}](https://www.elastic.co/guide/en/apm/agent/java/current/release-notes-${{ steps.get_dotx_branch.outputs.dotx_branch }}.html#release-notes-${{ env.RELEASE_VERSION }})
             ${{ needs.publish-aws-lambda.outputs.arn_content }}"