[release] release-step-4 1.52.2

.github/workflows/comment-on-asciidoc-changes.yml

@@ -0,0 +1,21 @@
+---
+name: Comment on PR for .asciidoc changes
+
+on:
+  # We need to use pull_request_target to be able to comment on PRs from forks
+  pull_request_target:
+    types:
+      - synchronize
+      - opened
+      - reopened
+    branches:
+      - main
+      - master
+      - "9.0"
+
+jobs:
+  comment-on-asciidoc-change:
+    permissions:
+      contents: read
+      pull-requests: write
+    uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main

.github/workflows/labeler.yml

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

.github/workflows/main.yml

@@ -216,8 +216,7 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'ci:agent-integration')
       || github.event.pull_request.draft == false
       || inputs.agent_integration_tests_ci == true
-    # Pinned to ubuntu 20.04 until https://github.com/elastic/apm-agent-java/issues/3035 is solved.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
     steps:
       - uses: actions/checkout@v4

.github/workflows/microbenchmark.yml

@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Run microbenchmark
-        uses: elastic/oblt-actions/buildkite/run@v1.5.0
+        uses: elastic/oblt-actions/buildkite/run@v1
         env:
           JAVA_VERSION: ${{ inputs.java_version || 'openjdk-17+35-linux' }}
         with:

.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@520d128f165991a6c774bcb264f323e3d70747f4  # v2.2.0
         with:
           subject-path: "${{ github.workspace }}/**/target/*.jar"
 
@@ -168,7 +168,7 @@ jobs:
         uses: ./.github/workflows/maven-goal
         with:
           command: ./mvnw dependency:purge-local-repository package -pl apm-agent-lambda-layer
-      - uses: elastic/oblt-actions/aws/auth@v1.10.0
+      - uses: elastic/oblt-actions/aws/auth@v1
         with:
           aws-account-id: '267093732750'
       - name: Publish
@@ -240,6 +240,8 @@ jobs:
       - name: Update major branch
         if: ${{ ! inputs.dry_run }}
         run: .ci/release/update-major-branch.sh ${{ env.RELEASE_VERSION }}
+        env:
+          GH_TOKEN: ${{ steps.get_token.outputs.token }}
 
   create-github-release:
     name: "Create GitHub Release"

.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@520d128f165991a6c774bcb264f323e3d70747f4  # v2.2.0
         with:
           subject-path: "${{ github.workspace }}/**/target/*.jar"
 

.github/workflows/updatecli.yml

@@ -38,12 +38,14 @@ jobs:
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: --experimental compose diff
+          version-file: .tool-versions
         env:
           GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: --experimental compose apply
+          version-file: .tool-versions
         env:
           GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
 

.tool-versions

@@ -0,0 +1 @@
+updatecli v0.94.1

CHANGELOG.asciidoc

@@ -34,6 +34,16 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[[release-notes-1.52.2]]
+==== 1.52.2 - 2025/02/27
+
+[float]
+===== Bug fixes
+* Prevent NPE in OpenTelemetry metrics bridge in case of asynchronous agent start - {pull}3880[#3880]
+* Fix random Weblogic ClassNotFoundException related to thread context classloader - {pull}3870[#3870]
+* Skips using NOFOLLOW_LINKS file open option when running on OS/400 as it's unsupported there - {pull}3905[#3905]
+* Add framework name and version for Spring Webflux transactions - {pull}3936[#3936]
+
 [[release-notes-1.52.1]]
 ==== 1.52.1 - 2024/11/18
 

Dockerfile.wolfi

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:26caa6beaee2bbf739a82e91a35173892dfe888d0a744b9e46cdc19a90d8656f
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:0801a437e721bebdd2d5be62e3f63f60fc9d1d82efacabe4c5b8792d74ae7006
 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.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</version>
     </parent>
 
     <artifactId>apm-agent-attach</artifactId>
@@ -59,9 +59,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <dependencies>

apm-agent-benchmarks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</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.24.1</version>
+                <version>2.24.3</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.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -314,7 +314,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>apm-rabbitmq-spring</artifactId>
+            <artifactId>apm-rabbitmq-spring5</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

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.1</version>
+        <version>1.52.2</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.1</version>
+        <version>1.52.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-agent-common/src/main/java/co/elastic/apm/agent/common/JvmRuntimeInfo.java

@@ -39,6 +39,7 @@ public class JvmRuntimeInfo {
     private final boolean isHpUx;
     private final boolean isCoretto;
     private final boolean isZos;
+    private final boolean isOs400;
 
     public static JvmRuntimeInfo ofCurrentVM() {
         return CURRENT_VM;
@@ -68,6 +69,7 @@ private JvmRuntimeInfo(String version, String vmName, String vendorName, @Nullab
         isHpUx = version.endsWith("-hp-ux");
         isCoretto = vendorName != null && vendorName.contains("Amazon");
         isZos = (osName != null) && osName.toLowerCase().contains("z/os");
+        isOs400 = (osName != null) && osName.toLowerCase().contains("os/400");
 
         if (isHpUx) {
             // remove extra hp-ux suffix for parsing
@@ -153,7 +155,7 @@ public boolean isJ9VM() {
         return isJ9;
     }
 
-    public boolean isHpUx(){
+    public boolean isHpUx() {
         return isHpUx;
     }
 
@@ -173,6 +175,10 @@ public boolean isZos() {
         return isZos;
     }
 
+    public boolean isOs400() {
+        return isOs400;
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", javaVersion, javaVmName, javaVmVersion);

apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java

@@ -37,7 +37,8 @@ public class AgentInfo {
         "com.lmax.disruptor",
         "com.dslplatform.json",
         "com.googlecode.concurrentlinkedhashmap",
-        "co.elastic.otel"
+        "co.elastic.otel",
+        "codes.rafael.asmjdkbridge"
     ));
 
     private static final Set<String> agentRootPackages = new HashSet<>(Arrays.asList(

apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/ResourceExtractionUtil.java

@@ -101,9 +101,10 @@ public static synchronized Path extractResourceToDirectory(String resource, Stri
                     }
                 }
             } catch (FileAlreadyExistsException e) {
-                try (FileChannel channel = JvmRuntimeInfo.ofCurrentVM().isZos() ?
-                        FileChannel.open(tempFile, READ) :
-                        FileChannel.open(tempFile, READ, NOFOLLOW_LINKS)) {
+                JvmRuntimeInfo jvmRuntimeInfo = JvmRuntimeInfo.ofCurrentVM();
+                try (FileChannel channel = (jvmRuntimeInfo.isZos() || jvmRuntimeInfo.isOs400()) ?
+                    FileChannel.open(tempFile, READ) :
+                    FileChannel.open(tempFile, READ, NOFOLLOW_LINKS)) {
                     // wait until other JVM instances have fully written the file
                     // multiple JVMs can read the file at the same time
                     try (FileLock readLock = channel.lock(0, Long.MAX_VALUE, true)) {

apm-agent-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.52.1</version>
+        <version>1.52.2</version>
     </parent>
 
     <artifactId>apm-agent-core</artifactId>
@@ -58,11 +58,6 @@
             <artifactId>jctools-core</artifactId>
             <version>4.0.5</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-            <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <version>1.4.2</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/IndyBootstrap.java

@@ -219,6 +219,7 @@ public class IndyBootstrap {
     static Method bootstrapLoggingMethod;
 
     private static final CallDepth callDepth = CallDepth.get(IndyBootstrap.class);
+    private static final CallDepth loggingForNestedCall = CallDepth.get("indy-bootstrap-nested-logging");
 
     private static Logger logger() {
         // must not be a static field as it would initialize logging before it's ready
@@ -430,7 +431,12 @@ private static ConstantCallSite internalBootstrap(MethodHandles.Lookup lookup, S
                 // avoid re-entrancy and stack overflow errors
                 // may happen when bootstrapping an instrumentation that also gets triggered during the bootstrap
                 // for example, adding correlation ids to the thread context when executing logger.debug.
-                logger().warn("Nested instrumented invokedynamic instruction linkage detected", new Throwable());
+                if (!loggingForNestedCall.isNestedCallAndIncrement()) {
+                    // We might be unlucky and cause an infinite recurison through logger()
+                    // for this reason we have the loggingForNestedCall in place to prevent this recursion
+                    logger().warn("Nested instrumented invokedynamic instruction linkage detected", new Throwable());
+                }
+                loggingForNestedCall.decrement();
                 return null;
             }
             String adviceClassName = (String) args[0];
@@ -498,7 +504,7 @@ private static ConstantCallSite internalBootstrap(MethodHandles.Lookup lookup, S
             // When calling findStatic now, the lookup class will be one that is loaded by the plugin class loader
             MethodHandle methodHandle = indyLookup.findStatic(adviceInPluginCL, adviceMethodName, adviceMethodType);
             return new ConstantCallSite(methodHandle);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             logger().error(e.getMessage(), e);
             return null;
         } finally {

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

@@ -25,7 +25,13 @@
 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.*;
+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 org.stagemonitor.configuration.ConfigurationOption;
 import org.stagemonitor.configuration.ConfigurationOptionProvider;
 import org.stagemonitor.configuration.converter.AbstractValueConverter;
@@ -696,7 +702,8 @@ 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.")
+        .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.")
         .dynamic(true)
         .buildWithDefault(true);