[release] release-step-4 1.52.2 (#3985)

* post release: elastic-apm-agent v1.52.1 (#3875) Co-authored-by: obltmachine <[email protected]> * build: bump com.networknt:json-schema-validator from 1.5.2 to 1.5.3 (#3879) Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](networknt/json-schema-validator@1.5.2...1.5.3) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ci: configure gh cli for the major update release step (#3876) * Prevent NPE when using otel metrics bridge asynchronously to agent start (#3880) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 973e72c (#3871) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump version.testcontainers from 1.20.1 to 1.20.3 (#3868) Bumps `version.testcontainers` from 1.20.1 to 1.20.3. Updates `org.testcontainers:testcontainers-bom` from 1.20.1 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.20.1...1.20.3) Updates `org.testcontainers:testcontainers` from 1.20.1 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.20.1...1.20.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [DOCS] Clarify the frequency of config polling (#3799) (#3881) --------- Co-authored-by: Luca Belluccini <[email protected]> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 55b297d (#3882) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump actions/attest-build-provenance from 1.4.3 to 1.4.4 in the github-actions group (#3866) Bumps the github-actions group with 1 update: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 1.4.3 to 1.4.4 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@1c608d1...ef24412) * deps(updatecli): bump all policies (#3886) * chore: deps(updatecli/policy): bump "ghcr.io/elastic/oblt-updatecli-p... ... olicies/apm/apm-data-spec" Updatecli version policy Made with ❤️️ by updatecli * chore: deps(updatecli/policy): bump "ghcr.io/elastic/oblt-updatecli-p... ... olicies/apm/apm-gherkin" Updatecli version policy Made with ❤️️ by updatecli * chore: deps(updatecli/policy): bump "ghcr.io/elastic/oblt-updatecli-p... ... olicies/apm/apm-json-specs" Updatecli version policy Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * build: bump version.log4j from 2.12.4 to 2.24.2 (#3885) * build: bump version.log4j from 2.12.4 to 2.24.2 Bumps `version.log4j` from 2.12.4 to 2.24.2. Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.24.2 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.24.2 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * revert --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jackshirazi <[email protected]> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 32f06b1 (#3887) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * Revert "deps(updatecli): bump all policies" (#3888) This reverts commit b21eeaf. * github-actions: use v1 for the oblt-actions (#3890) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to ad2e15a (#3893) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * Set context CL for reliable weblogic connection (#3870) * set context CL for weblogic * deps(updatecli): bump all policies (#3894) * build: bump io.micrometer:micrometer-core from 1.13.6 to 1.14.1 (#3899) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.13.6 to 1.14.1. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.13.6...v1.14.1) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump version.aws.sdk from 2.29.5 to 2.29.23 in /apm-agent-plugins (#3896) Bumps `version.aws.sdk` from 2.29.5 to 2.29.23. Updates `software.amazon.awssdk:s3` from 2.29.5 to 2.29.23 Updates `software.amazon.awssdk:sqs` from 2.29.5 to 2.29.23 Updates `software.amazon.awssdk:dynamodb` from 2.29.5 to 2.29.23 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ci: use tool-versions file (#3901) * ci: remove elastic-observability-automation from the triage (#3897) * build: bump org.apache.logging.log4j:log4j-bom from 2.24.1 to 2.24.2 (#3909) Bumps [org.apache.logging.log4j:log4j-bom](https://github.com/apache/logging-log4j2) from 2.24.1 to 2.24.2. - [Release notes](https://github.com/apache/logging-log4j2/releases) - [Changelog](https://github.com/apache/logging-log4j2/blob/2.x/RELEASE-NOTES.adoc) - [Commits](apache/logging-log4j2@rel/2.24.1...rel/2.24.2) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump actions/attest-build-provenance in the github-actions group (#3907) Bumps the github-actions group with 1 update: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 1.4.4 to 2.0.1 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@ef24412...c4fbc64) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump version.aws.sdk in /apm-agent-plugins (#3895) Bumps `version.aws.sdk` from 1.12.777 to 1.12.779. Updates `com.amazonaws:aws-java-sdk-s3` from 1.12.777 to 1.12.779 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.777...1.12.779) Updates `com.amazonaws:aws-java-sdk-dynamodb` from 1.12.777 to 1.12.779 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.777...1.12.779) Updates `com.amazonaws:aws-java-sdk-sqs` from 1.12.777 to 1.12.779 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.777...1.12.779) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.amazonaws:aws-java-sdk-dynamodb dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.amazonaws:aws-java-sdk-sqs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump org.springframework.boot:spring-boot-dependencies from 2.7.16 to 3.4.0 (#3898) * build: bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.16 to 3.4.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.16...v3.4.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update pom.xml * Update pom.xml * Update pom.xml * Add explicit okhttp dependency version * Prevent recursion when logging recursive advice bootstrapping * Support unwrapping webflux requests * Remove tests for TRACE option as it seems to be blocked by spring --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jackshirazi <[email protected]> Co-authored-by: Jonas Kunz <[email protected]> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 1b51ff6 (#3910) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * OS/400 avoids using NOFOLLOW_LINKS (#3905) * OS/400 avoids using NOFOLLOW_LINKS * Add changelog entry for os-400-no-follow-links * build: bump io.micrometer:micrometer-core from 1.14.1 to 1.14.2 (#3915) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.1 to 1.14.2. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.14.1...v1.14.2) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump version.byte-buddy from 1.15.10 to 1.15.11 (#3914) * build: bump version.byte-buddy from 1.15.10 to 1.15.11 Bumps `version.byte-buddy` from 1.15.10 to 1.15.11. Updates `net.bytebuddy:byte-buddy` from 1.15.10 to 1.15.11 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.15.10...byte-buddy-1.15.11) Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.15.11 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.9.16...byte-buddy-1.15.11) Updates `net.bytebuddy:byte-buddy-dep` from 1.15.10 to 1.15.11 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.15.10...byte-buddy-1.15.11) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.bytebuddy:byte-buddy-dep dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update pom.xml --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <[email protected]> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to bfdeddb (#3916) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump actions/attest-build-provenance in the github-actions group (#3912) Bumps the github-actions group with 1 update: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 2.0.1 to 2.1.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@c4fbc64...7668571) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 3a6e913 (#3919) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * chore: APM agent json server schema 560cc4b604ede25ec70afd09f213d892f... (#3918) ... 30ceedc Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * build: bump org.assertj:assertj-core from 3.26.3 to 3.27.0 (#3922) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.3 to 3.27.0. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.26.3...assertj-build-3.27.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: deps(updatecli): Bump updatecli version to v0.91.0 (#3924) * build: bump io.opentelemetry.semconv:opentelemetry-semconv (#3925) Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.28.0-alpha to 1.29.0-alpha. - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases) - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits) --- updated-dependencies: - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to eef54b3 (#3927) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump version.aws.sdk in /apm-agent-plugins (#3929) Bumps `version.aws.sdk` from 2.29.23 to 2.29.43. Updates `software.amazon.awssdk:s3` from 2.29.23 to 2.29.43 Updates `software.amazon.awssdk:sqs` from 2.29.23 to 2.29.43 Updates `software.amazon.awssdk:dynamodb` from 2.29.23 to 2.29.43 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump version.log4j from 2.12.4 to 2.24.3 (#3921) * build: bump version.log4j from 2.12.4 to 2.24.3 Bumps `version.log4j` from 2.12.4 to 2.24.3. Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.24.3 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.24.3 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * revert old version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jackshirazi <[email protected]> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 2503e99 (#3930) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump version.aws.sdk in /apm-agent-plugins (#3928) Bumps `version.aws.sdk` from 1.12.779 to 1.12.780. Updates `com.amazonaws:aws-java-sdk-s3` from 1.12.779 to 1.12.780 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.779...1.12.780) Updates `com.amazonaws:aws-java-sdk-dynamodb` from 1.12.779 to 1.12.780 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.779...1.12.780) Updates `com.amazonaws:aws-java-sdk-sqs` from 1.12.779 to 1.12.780 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.779...1.12.780) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.amazonaws:aws-java-sdk-dynamodb dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.amazonaws:aws-java-sdk-sqs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump version.mockito from 5.14.2 to 5.15.2 (#3934) Bumps `version.mockito` from 5.14.2 to 5.15.2. Updates `org.mockito:mockito-core` from 5.14.2 to 5.15.2 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.14.2...v5.15.2) Updates `org.mockito:mockito-subclass` from 5.14.2 to 5.15.2 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.14.2...v5.15.2) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-subclass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add framework info for Spring Webflux (#3936) * Add framework info for Spring Webflux transactions * Update changelog * Fix failing Spring 6 tests * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to f2813ac (#3932) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * chore: deps(updatecli): Bump updatecli version to v0.92.0 (#3937) Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to dd66bee (#3941) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * github-actions: ubuntu-20.04 will be fully retired by April 1, 2025 (#3945) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to ea157dd (#3944) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump org.assertj:assertj-core from 3.27.0 to 3.27.2 (#3938) * build: bump org.assertj:assertj-core from 3.27.0 to 3.27.2 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.0 to 3.27.2. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.27.0...assertj-build-3.27.2) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix missing header --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]> * build: bump org.springframework.boot:spring-boot-dependencies from 2.7.16 to 3.4.1 (#3926) * Fix inferred spans logging config option docs (#3948) * remove obsolete tomcat docker image (#3940) * Investigate incorrect CI failure reporting (#3952) * build: bump actions/attest-build-provenance in the github-actions group (#3955) Bumps the github-actions group with 1 update: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 2.1.0 to 2.2.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@7668571...520d128) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to bd40170 (#3951) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump org.springframework.boot:spring-boot-maven-plugin (#3958) Bumps [org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) from 3.3.0 to 3.4.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.0...v3.4.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add spring boot 3 tests for rabbitMQ / AMQP spring instrumentation (#3961) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 30fd211 (#3962) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 8df3ca6 (#3963) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump version.aws.sdk in /apm-agent-plugins (#3965) Bumps `version.aws.sdk` from 2.29.43 to 2.30.11. Updates `software.amazon.awssdk:s3` from 2.29.43 to 2.30.11 Updates `software.amazon.awssdk:sqs` from 2.29.43 to 2.30.11 Updates `software.amazon.awssdk:dynamodb` from 2.29.43 to 2.30.11 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: deps(updatecli): Bump updatecli version to v0.93.0 (#3964) Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * github-action: Add AsciiDoc freeze warning (#3959) * fix * github-action: Add AsciiDoc freeze warning * github-action: Add AsciiDoc freeze warning * Update .github/workflows/release-step-3.yml * build: bump version.byte-buddy from 1.15.11 to 1.17.0 (#3967) * build: bump version.byte-buddy from 1.15.11 to 1.17.0 Bumps `version.byte-buddy` from 1.15.11 to 1.17.0. Updates `net.bytebuddy:byte-buddy` from 1.15.11 to 1.17.0 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.15.11...byte-buddy-1.17.0) Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.17.0 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.9.16...byte-buddy-1.17.0) Updates `net.bytebuddy:byte-buddy-dep` from 1.15.11 to 1.17.0 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](raphw/byte-buddy@byte-buddy-1.15.11...byte-buddy-1.17.0) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: net.bytebuddy:byte-buddy-dep dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * restore old version * update shade + force asm version * add new dependency to agent packages --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]> * fix minor build warnings (#3968) * remove duplicated dependency * remove duplicated jar plugin * build: bump io.micrometer:micrometer-core from 1.14.2 to 1.14.3 (#3971) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.2 to 1.14.3. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.14.2...v1.14.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump com.networknt:json-schema-validator from 1.5.3 to 1.5.5 (#3970) Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.5.3 to 1.5.5. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](networknt/json-schema-validator@1.5.3...1.5.5) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: deps(updatecli): Bump updatecli version to v0.93.1 (#3969) Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * upgrade java8 log4j to latest release (#3972) * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to d74b1fd (#3973) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * build: bump io.micrometer:micrometer-core from 1.14.3 to 1.14.4 (#3976) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.3 to 1.14.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.14.3...v1.14.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build: bump io.opentelemetry.semconv:opentelemetry-semconv from 1.29.0-alpha to 1.30.0-rc.1 (#3966) * build: bump io.opentelemetry.semconv:opentelemetry-semconv Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.29.0-alpha to 1.30.0-rc.1. - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases) - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits/v1.30.0-rc.1) --- updated-dependencies: - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * remove usage of now stale semconv attributes * remove semconv dependency * code cleanup * remove leftovers references --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <[email protected]> * chore: deps(updatecli): Bump updatecli version to v0.94.1 (#3978) Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> * chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 0801a43 (#3979) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> * pre release: elastic-apm-agent v1.52.2 (#3983) Co-authored-by: obltmachine <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: obltmachine <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Jonas Kunz <[email protected]> Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Co-authored-by: Luca Belluccini <[email protected]> Co-authored-by: jackshirazi <[email protected]> Co-authored-by: SylvainJuge <[email protected]> Co-authored-by: César <[email protected]> Co-authored-by: Renette Ros <[email protected]> Co-authored-by: Jan Calanog <[email protected]>
elastic · Feb 27, 2025 · a7b1758 · a7b1758
1 parent e5770b4
commit a7b1758
Show file tree

Hide file tree

Showing 288 changed files with 999 additions and 462 deletions.
diff --git a/.github/workflows/comment-on-asciidoc-changes.yml b/.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
diff --git a/.github/workflows/labeler.yml b/.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 }}

diff --git a/.github/workflows/main.yml b/.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

diff --git a/.github/workflows/microbenchmark.yml b/.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:

diff --git a/.github/workflows/release-step-3.yml b/.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"

diff --git a/.github/workflows/snapshot.yml b/.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"
 

diff --git a/.github/workflows/updatecli.yml b/.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 }}
 

diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+updatecli v0.94.1
diff --git a/CHANGELOG.asciidoc b/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
 

diff --git a/Dockerfile.wolfi b/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

diff --git a/apm-agent-api/pom.xml b/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>

diff --git a/apm-agent-attach-cli/pom.xml b/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>
 

diff --git a/apm-agent-attach/pom.xml b/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>

diff --git a/apm-agent-benchmarks/pom.xml b/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>

diff --git a/apm-agent-bootstrap/pom.xml b/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>

diff --git a/apm-agent-builds/apm-agent-java8/pom.xml b/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>

diff --git a/apm-agent-builds/apm-agent/pom.xml b/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>

diff --git a/apm-agent-builds/pom.xml b/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>

diff --git a/apm-agent-cached-lookup-key/pom.xml b/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>
 

diff --git a/apm-agent-common/pom.xml b/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>
 

diff --git a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/JvmRuntimeInfo.java b/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);

diff --git a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java b/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(

diff --git a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/ResourceExtractionUtil.java b/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)) {

diff --git a/apm-agent-core/pom.xml b/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>

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/IndyBootstrap.java b/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 {

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfigurationImpl.java b/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);