Revert "[release] release-step-4 1.52.0 (elastic#3814)"

This reverts commit 95eb8cf.

.ci/updatecli/values.d/apm-data-spec.yml

@@ -1 +1,2 @@
-apm_schema_specs_path: apm-agent-core/src/test/resources/apm-server-schema/current
+apm_schema_specs_path: apm-agent-core/src/test/resources/apm-server-schema/current
+signedcommit: true

.ci/updatecli/values.d/apm-gherkin.yml

@@ -1 +1,2 @@
-apm_gherkin_specs_path: apm-agent-core/src/test/resources/specs
+apm_gherkin_specs_path: apm-agent-core/src/test/resources/specs
+signedcommit: true

.ci/updatecli/values.d/apm-json-specs.yml

@@ -1 +1,2 @@
-apm_json_specs_path: apm-agent-core/src/test/resources/json-specs
+apm_json_specs_path: apm-agent-core/src/test/resources/json-specs
+signedcommit: true

.ci/updatecli/values.d/scm.yml

@@ -4,7 +4,6 @@ scm:
   repository: apm-agent-java
   apm_repository: apm
   branch: main
-  commitusingapi: true
   # begin update-compose policy values
   user: obltmachine
   email: [email protected]

.ci/updatecli/values.d/update-compose.yml

@@ -1,3 +1,3 @@
 spec:
   files:
-    - "updatecli-compose.yaml"
+    - "update-compose.yaml"

.github/workflows/labeler.yml

@@ -30,7 +30,7 @@ jobs:
         username: ${{ github.actor }}
         token: ${{ secrets.APM_TECH_USER_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]'
+      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]'
       uses: actions/github-script@v7
       with:
         script: |
@@ -41,7 +41,7 @@ jobs:
             labels: ["community", "triage"]
           })
     - name: Add comment for community PR
-      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
+      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]'
       uses: wow-actions/auto-comment@v1
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

@@ -340,7 +340,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Log in to the Elastic Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
           registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
           username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}

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

@@ -105,7 +105,7 @@ jobs:
         run: tar xvf ${{ env.TARBALL_FILE }}
 
       - name: generate build provenance
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c  # v1.4.3
+        uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0  # v1.3.3
         with:
           subject-path: "${{ github.workspace }}/**/target/*.jar"
 
@@ -115,10 +115,10 @@ jobs:
     needs:
       - validate-tag
     steps:
-      - uses: elastic/oblt-actions/maven/await-artifact@v1
+      - uses: elastic/apm-pipeline-library/.github/actions/await-maven-artifact@current
         with:
-          group-id: 'co.elastic.apm'
-          artifact-id: 'elastic-apm-agent'
+          groupid: 'co.elastic.apm'
+          artifactid: 'elastic-apm-agent'
           version: ${{ env.RELEASE_VERSION }}
 
   build-and-push-docker-images:
@@ -136,7 +136,7 @@ jobs:
           fetch-depth: 0 # Load entire history as it is required for the push-script
 
       - name: Log in to the Elastic Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
           registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
           username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}

.github/workflows/snapshot.yml

@@ -69,7 +69,7 @@ jobs:
         run: tar xvf ${{ env.TARBALL_FILE }}
 
       - name: generate build provenance
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c  # v1.4.3
+        uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0  # v1.3.3
         with:
           subject-path: "${{ github.workspace }}/**/target/*.jar"
 
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Log in to the Elastic Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
           registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
           username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}

.github/workflows/stash/action.yml

@@ -17,7 +17,7 @@ runs:
       shell: bash
 
     - name: Upload stash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ inputs.name }}
         path: ${{ runner.temp }}/${{ inputs.name }}.tar.zst

.github/workflows/test-reporter.yml

@@ -17,7 +17,7 @@ jobs:
   report:
     runs-on: ubuntu-latest
     steps:
-      - uses: elastic/oblt-actions/test-report@v1
+      - uses: elastic/apm-pipeline-library/.github/actions/test-report@current
         with:
           artifact: /test-results-(.*)/
           name: 'Test Results $1'

.github/workflows/unstash/action.yml

@@ -13,7 +13,7 @@ runs:
   using: "composite"
   steps:
     - name: Download stash
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: ${{ inputs.name }}
         path: ${{ runner.temp }}

.github/workflows/updatecli.yml

@@ -17,19 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - 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"
-            }
-
-      - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+      - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -39,13 +27,13 @@ jobs:
         with:
           command: --experimental compose diff
         env:
-          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: --experimental compose apply
         env:
-          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
 
       - if: failure()
         uses: elastic/oblt-actions/slack/send@v1

CHANGELOG.asciidoc

@@ -34,19 +34,6 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
-[[release-notes-1.52.0]]
-==== 1.52.0 - 2024/09/23
-
-[float]
-===== Bug fixes
-* Fix log4j2 log correlation with shaded application jar - {pull}3764[#3764]
-* Improve automatic span class name detection for Scala and nested/anonymous classes - {pull}3746[#3746]
-
-[float]
-===== Features
-* Added experimental option to capture HTTP client request bodies for Apache Http Client v4 and v5, HttpUrlConnection and Spring WebClient - {pull}3776[#3776], {pull}3962[#3962], {pull}3724[#3724], {pull}3754[#3754], {pull}3767[#3767]
-* Agent health metrics now GA - {pull}3802[#3802]
-
 [[release-notes-1.51.0]]
 ==== 1.51.0 - 2024/07/24
 
@@ -62,7 +49,6 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 ===== Features
 * Added option to make routing-key part of RabbitMQ transaction/span names - {pull}3636[#3636]
 * Added internal option for capturing request bodies for apache httpclient v4 - {pull}3692[#3692]
-* Added automatic module name to apm-agent-attach - {pull}3743[#3743]
 
 [[release-notes-1.50.0]]
 ==== 1.50.0 - 2024/05/28

Dockerfile.wolfi

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:d4def25f2fd3b0ff9bc68091cd1d89524e41b7d3fc0d3b3a665720eb92145f3b
+FROM docker.elastic.co/wolfi/chainguard-base@sha256:9f940409f96296ef56140bcc4665c204dd499af4c32c96cc00e792558097c3f1
 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.51.0</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.51.0</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.51.0</version>
     </parent>
 
     <artifactId>apm-agent-attach</artifactId>
@@ -165,13 +165,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>${project.groupId}.attach</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
         </plugins>
     </build>

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.51.0</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.51.0</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.51.0</version>
     </parent>
 
     <artifactId>apm-agent-java8</artifactId>

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.51.0</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.51.0</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.51.0</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.51.0</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.51.0</version>
     </parent>
 
     <artifactId>apm-agent-core</artifactId>

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

@@ -93,15 +93,15 @@ public void assertValid(List<Double> buckets) {
         .key("agent_reporter_health_metrics")
         .configurationCategory(METRICS_CATEGORY)
         .description("Enables metrics which capture the health state of the agent's event reporting mechanism.")
-        .tags("added[1.35.0]")
+        .tags("added[1.35.0]", "experimental")
         .dynamic(false)
         .buildWithDefault(false);
 
     private final ConfigurationOption<Boolean> overheadMetricsEnabled = ConfigurationOption.booleanOption()
         .key("agent_background_overhead_metrics")
         .configurationCategory(METRICS_CATEGORY)
         .description("Enables metrics which capture the resource consumption of agent background tasks.")
-        .tags("added[1.35.0]")
+        .tags("added[1.35.0]", "experimental")
         .dynamic(false)
         .buildWithDefault(false);