Manual Release Step 4: Update docs

.buildkite/hooks/prepare-common.sh

@@ -37,9 +37,11 @@ fi
 java -version
 
 echo "--- Prepare github secrets :vault:"
-VAULT_SECRET_PATH=kv/ci-shared/observability-ci/github-bot-user
-GITHUB_SECRET=$(vault kv get -field token "${VAULT_SECRET_PATH}")
-GIT_USER=$(vault kv get -field username "${VAULT_SECRET_PATH}")
-GIT_EMAIL=$(vault kv get -field email "${VAULT_SECRET_PATH}")
+# Only accessible by Elastic employees
+# The GitHub Permission Set can be found at:
+# https://github.com/v1v/terrazzo/blob/main/manifests/prod/vault/apm-agent-java-permission-set.yaml
+GITHUB_SECRET=$VAULT_GITHUB_TOKEN
+GIT_USER="elastic-vault-github-plugin-prod"
+GIT_EMAIL="obltmachine@users.noreply.github.com"
 GH_TOKEN=$GITHUB_SECRET
 export GITHUB_SECRET GH_TOKEN GIT_USER GIT_EMAIL

.github/workflows/addToProject.yml

@@ -3,6 +3,7 @@ on:
   issues:
     types:
       - opened, milestoned
+
 permissions:
   contents: read
 
@@ -11,9 +12,21 @@ jobs:
     if: github.event.issue && github.event.issue.milestone
     runs-on: ubuntu-latest
     steps:
+      - name: Get token
+        id: get_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        with:
+          app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
+          permissions: >-
+            {
+              "organization_projects": "write",
+              "issues": "read"
+            }
+
       - name: Get project data
         env:
-          GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
           TEAM: Java
           ORGANIZATION: elastic
           PROJECT_NUMBER: 595
@@ -49,7 +62,7 @@ jobs:
 
       - name: Add issue to project
         env:
-          GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
         run: |
           item_id="$( gh api graphql -f query='
@@ -65,7 +78,7 @@ jobs:
 
       - name: Set fields
         env:
-          GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
+          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
         run: |
           gh api graphql -f query='
             mutation (

.github/workflows/labeler.yml

@@ -24,11 +24,27 @@ jobs:
             repo: context.repo.repo,
             labels: ["agent-java"]
           })
+
+    - name: Get token
+      id: get_token
+      uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+      with:
+        app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
+        private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
+        permissions: >-
+          {
+            "members": "read",
+            "organization_projects": "write",
+            "issues": "read"
+          }
+
     - id: is_elastic_member
-      uses: elastic/apm-pipeline-library/.github/actions/is-member-elastic-org@current
+      uses: elastic/oblt-actions/github/is-member-of@v1
       with:
-        username: ${{ github.actor }}
-        token: ${{ secrets.APM_TECH_USER_TOKEN }}
+        github-org: "elastic"
+        github-user: ${{ github.actor }}
+        github-token: ${{ steps.get_token.outputs.token }}
+
     - name: Add community and triage lables
       if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
       uses: actions/github-script@v7
@@ -55,7 +71,7 @@ jobs:
       uses: elastic/assign-one-project-github-action@1.2.2
       if: contains(steps.is_elastic_member.outputs.result, 'true') && github.event.pull_request
       env:
-        MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
+        MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
       with:
         project: 'https://github.com/orgs/elastic/projects/454'
         project_id: '5882982'

.github/workflows/main.yml

@@ -309,7 +309,7 @@ jobs:
             distribution: 'temurin'
           - version: 21
             distribution: 'temurin'
-          - version: 22
+          - version: 23
             distribution: 'temurin'
     steps:
       - uses: actions/checkout@v4

.github/workflows/pre-post-release.yml

@@ -53,17 +53,29 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - validate-tag
-    permissions:
-      contents: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
     steps:
+      - name: Get token
+        id: get_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        with:
+          app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
+          permissions: >-
+            {
+              "contents": "write",
+              "pull_requests": "write"
+            }
+          repositories: >-
+            ["apm-agent-java"]
+
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
-          token: ${{ env.GITHUB_TOKEN }}
+          token: ${{ steps.get_token.outputs.token }}
 
       - uses: elastic/oblt-actions/git/setup@v1
+        with:
+          github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Create the release tag (post phase)
         if: inputs.phase == 'post'
@@ -95,4 +107,4 @@ jobs:
       - name: Create the ${{ inputs.phase }} release PR
         run: gh pr create --title="${{ inputs.pr_title }}" --base main --head ${{ env.BRANCH_NAME }} -b "${{ inputs.pr_body }}"
         env:
-          GH_TOKEN: ${{ env.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ steps.get_token.outputs.token }}

.github/workflows/release-step-3.yml

@@ -213,17 +213,29 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - post-release
-    permissions:
-      contents: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
     steps:
+      - name: Get token
+        id: get_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+        with:
+          app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
+          permissions: >-
+            {
+              "contents": "write",
+              "pull_requests": "write"
+            }
+          repositories: >-
+            ["apm-agent-java"]
+
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
-          token: ${{ env.GITHUB_TOKEN }}
+          token: ${{ steps.get_token.outputs.token }}
 
       - uses: elastic/oblt-actions/git/setup@v1
+        with:
+          github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Update major branch
         if: ${{ ! inputs.dry_run }}
@@ -276,9 +288,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: check
-        uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
+        uses: elastic/oblt-actions/check-dependent-jobs@v1
         with:
-          needs: ${{ toJSON(needs) }}
+          jobs: ${{ toJSON(needs) }}
       - uses: elastic/oblt-actions/slack/notify-result@v1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/snapshot.yml

@@ -102,9 +102,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - id: check
-        uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
+        uses: elastic/oblt-actions/check-dependent-jobs@v1
         with:
-          needs: ${{ toJSON(needs) }}
+          jobs: ${{ toJSON(needs) }}
       - if: ${{ failure() && ! inputs.dry_run }}
         uses: elastic/oblt-actions/slack/send@v1
         with:

CHANGELOG.asciidoc

@@ -34,6 +34,14 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[[release-notes-1.52.1]]
+==== 1.52.1 - 2024/11/18
+
+[float]
+===== Bug fixes
+* Fix JMX metric warning message about unsupported composite value types - {pull}3849[#3849]
+* Fix JAX-WS transaction naming for @WebMethod annotated methods - {pull}3850[#3850]
+
 [[release-notes-1.52.0]]
 ==== 1.52.0 - 2024/09/23
 

Dockerfile.wolfi

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:d4def25f2fd3b0ff9bc68091cd1d89524e41b7d3fc0d3b3a665720eb92145f3b
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:26caa6beaee2bbf739a82e91a35173892dfe888d0a744b9e46cdc19a90d8656f
 RUN mkdir /usr/agent
 ARG JAR_FILE
 ARG HANDLER_FILE

apm-agent-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-api</artifactId>

apm-agent-attach-cli/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-attach/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-attach</artifactId>

apm-agent-benchmarks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-benchmarks</artifactId>

apm-agent-bootstrap/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-bootstrap</artifactId>

apm-agent-builds/apm-agent-java8/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-agent-builds</artifactId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-java8</artifactId>
@@ -21,7 +21,7 @@
                 <!-- Upgrade log4j2 to non vulnerable version -->
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-bom</artifactId>
-                <version>2.23.1</version>
+                <version>2.24.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

apm-agent-builds/apm-agent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-agent-builds</artifactId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent</artifactId>

apm-agent-builds/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-cached-lookup-key/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
 
     <artifactId>apm-agent-core</artifactId>

apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfigurationImpl.java

@@ -25,13 +25,7 @@
 import co.elastic.apm.agent.matcher.MethodMatcherValueConverter;
 import co.elastic.apm.agent.sdk.logging.Logger;
 import co.elastic.apm.agent.sdk.logging.LoggerFactory;
-import co.elastic.apm.agent.tracer.configuration.CoreConfiguration;
-import co.elastic.apm.agent.tracer.configuration.ListValueConverter;
-import co.elastic.apm.agent.tracer.configuration.RegexValidator;
-import co.elastic.apm.agent.tracer.configuration.RoundedDoubleConverter;
-import co.elastic.apm.agent.tracer.configuration.TimeDuration;
-import co.elastic.apm.agent.tracer.configuration.TimeDurationValueConverter;
-import co.elastic.apm.agent.tracer.configuration.WildcardMatcherValueConverter;
+import co.elastic.apm.agent.tracer.configuration.*;
 import org.stagemonitor.configuration.ConfigurationOption;
 import org.stagemonitor.configuration.ConfigurationOptionProvider;
 import org.stagemonitor.configuration.converter.AbstractValueConverter;
@@ -702,8 +696,7 @@ public String toSafeString(List<WildcardMatcher> value) {
         .key("central_config")
         .tags("added[1.8.0]")
         .configurationCategory(CORE_CATEGORY)
-        .description("When enabled, the agent will make periodic requests to the APM Server to fetch updated configuration.\n"
-                     + "The frequency of the periodic request is driven by the `Cache-Control` header returned from APM Server/Integration, falling back to 5 minutes if not defined.")
+        .description("When enabled, the agent will make periodic requests to the APM Server to fetch updated configuration.")
         .dynamic(true)
         .buildWithDefault(true);
 

apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java

@@ -33,9 +33,9 @@ public class JdkVersionTest {
     private static List<Arguments> releaseSchedule() {
         // from https://www.oracle.com/java/technologies/java-se-support-roadmap.html
         return List.of(
-            Arguments.of(23, LocalDate.parse("2024-10-01")),
             Arguments.of(24, LocalDate.parse("2025-04-01")),
-            Arguments.of(25, LocalDate.parse("2025-10-01"))
+            Arguments.of(25, LocalDate.parse("2025-10-01")),
+            Arguments.of(26, LocalDate.parse("2026-04-01"))
         );
     }
 

apm-agent-lambda-layer/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-plugin-sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.0</version>
+        <version>1.52.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>