Skip to content

Commit

Permalink
[release] release-step-4 1.52.0 (#3814)
Browse files Browse the repository at this point in the history
* post release: elastic-apm-agent v1.51.0 (#3732)

Co-authored-by: obltmachine <[email protected]>

* build: bump docker/login-action in the github-actions group (#3737)

Bumps the github-actions group with 1 update: [docker/login-action](https://github.com/docker/login-action).


Updates `docker/login-action` from 3.2.0 to 3.3.0
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@0d4c9c5...9780b0c)

---
updated-dependencies:
- dependency-name: docker/login-action
  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>

* build: bump version.testcontainers from 1.19.8 to 1.20.0 (#3741)

Bumps `version.testcontainers` from 1.19.8 to 1.20.0.

Updates `org.testcontainers:testcontainers-bom` from 1.19.8 to 1.20.0
- [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.19.8...1.20.0)

Updates `org.testcontainers:testcontainers` from 1.19.8 to 1.20.0
- [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.19.8...1.20.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.testcontainers:testcontainers
  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 automatic module name to apm-agent-attach (#3743)

* add automatic module name to apm-agent-attach

* added entry to CHANGELOG

* updatecli: rename update-compose.yaml to updatecli-compose.yaml (#3749)

* build: bump actions/attest-build-provenance from 1.3.3 to 1.4.0 in the github-actions group (#3750)

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.3.3 to 1.4.0
- [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md)
- [Commits](actions/attest-build-provenance@5e9cb68...210c191)

* build: bump version.aws.sdk in /apm-agent-plugins (#3748)

Bumps `version.aws.sdk` from 1.12.755 to 1.12.767.

Updates `com.amazonaws:aws-java-sdk-s3` from 1.12.755 to 1.12.767
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.755...1.12.767)

Updates `com.amazonaws:aws-java-sdk-dynamodb` from 1.12.755 to 1.12.767
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.755...1.12.767)

Updates `com.amazonaws:aws-java-sdk-sqs` from 1.12.755 to 1.12.767
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.755...1.12.767)

---
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.aws.sdk in /apm-agent-plugins (#3747)

Bumps `version.aws.sdk` from 2.26.12 to 2.26.27.

Updates `software.amazon.awssdk:s3` from 2.26.12 to 2.26.27

Updates `software.amazon.awssdk:sqs` from 2.26.12 to 2.26.27

Updates `software.amazon.awssdk:dynamodb` from 2.26.12 to 2.26.27

---
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.testcontainers from 1.20.0 to 1.20.1 (#3751)

Bumps `version.testcontainers` from 1.20.0 to 1.20.1.

Updates `org.testcontainers:testcontainers-bom` from 1.20.0 to 1.20.1
- [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.0...1.20.1)

Updates `org.testcontainers:testcontainers` from 1.20.0 to 1.20.1
- [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.0...1.20.1)

---
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>

* Fixed BodyCaptureImpl recycling (#3734)

* Perform charset-aware decoding of request bodies (#3726)

* Split out decoder pooling

* Implemented charset aware request body decoding

* Fix casting in fallback encoding

* Fix java 7 compilation

* chore: Configure Renovate (#3755)

* Add renovate.json

* Attempt to make testing/compile-only dependencies opt-in via dependency dashboard

* Update renovate.json

Co-authored-by: Victor Martinez <[email protected]>

* Update renovate.json

---------

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
Co-authored-by: Jonas Kunz <[email protected]>
Co-authored-by: Victor Martinez <[email protected]>

* chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to dcbcd19 (#3757)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>

* Exclude renovate from PR labeler (#3759)

* build: bump com.networknt:json-schema-validator from 1.5.0 to 1.5.1 (#3762)

Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.5.0 to 1.5.1.
- [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.0...1.5.1)

---
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>

* Capture request body for HttpUrlConnection (#3724)

* build: bump org.awaitility:awaitility from 4.2.1 to 4.2.2 (#3761)

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](awaitility/awaitility@awaitility-4.2.1...awaitility-4.2.2)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  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>

* Fix log4j2 correlation with shaded log4j (#3764)

* Fix CustomElementMatchers test on windows (#3765)

* chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to e11c691 (#3766)

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 (#3756)

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.0 to 1.4.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@210c191...310b0a4)

---
updated-dependencies:
- dependency-name: actions/attest-build-provenance
  dependency-type: direct:production
  update-type: version-update:semver-patch
  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 io.micrometer:micrometer-core from 1.13.2 to 1.13.3 (#3769)

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.13.2 to 1.13.3.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](micrometer-metrics/micrometer@v1.13.2...v1.13.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>

* Add support for apache http client v5 body capturing (#3767)

* chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to c16d3ad (#3771)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>

* build: bump redis.clients:jedis from 1.4.0 to 5.1.4 (#3770)

* build: bump redis.clients:jedis from 1.4.0 to 5.1.4

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 1.4.0 to 5.1.4.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](redis/jedis@jedis-1.4.0...v5.1.4)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* keep older versions

---------

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 version.byte-buddy from 1.14.18 to 1.14.19 (#3768)

* build: bump version.byte-buddy from 1.14.18 to 1.14.19

Bumps `version.byte-buddy` from 1.14.18 to 1.14.19.

Updates `net.bytebuddy:byte-buddy` from 1.14.18 to 1.14.19
- [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.14.18...byte-buddy-1.14.19)

Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.14.19
- [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.14.19)

Updates `net.bytebuddy:byte-buddy-dep` from 1.14.18 to 1.14.19
- [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.14.18...byte-buddy-1.14.19)

---
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 from main

* keep old version for test in app

* remove unrelated changes

---------

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]>

* Add body capturing for reactive spring webclient (#3754)

* build: bump redis.clients:jedis from 1.4.0 to 5.1.5 (#3774)

* build: bump redis.clients:jedis from 1.4.0 to 5.1.5

Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 1.4.0 to 5.1.5.
- [Release notes](https://github.com/redis/jedis/releases)
- [Commits](redis/jedis@jedis-1.4.0...v5.1.5)

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* keep older versions

---------

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 version.byte-buddy from 1.14.19 to 1.15.0 (#3775)

* build: bump version.byte-buddy from 1.14.19 to 1.15.0

Bumps `version.byte-buddy` from 1.14.19 to 1.15.0.

Updates `net.bytebuddy:byte-buddy` from 1.14.19 to 1.15.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.14.19...byte-buddy-1.15.0)

Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.15.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.15.0)

Updates `net.bytebuddy:byte-buddy-dep` from 1.14.19 to 1.15.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.14.19...byte-buddy-1.15.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]>

* keep old version

---------

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]>

* Make capture_http_client_request_body_size config option public (#3776)

* build: bump io.opentelemetry.semconv:opentelemetry-semconv (#3773)

Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.25.0-alpha to 1.27.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>

* build: bump actions/attest-build-provenance in the github-actions group (#3772)

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.1 to 1.4.2
- [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@310b0a4...6149ea5)

---
updated-dependencies:
- dependency-name: actions/attest-build-provenance
  dependency-type: direct:production
  update-type: version-update:semver-patch
  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 (#3778)

Bumps `version.aws.sdk` from 2.26.27 to 2.27.17.

Updates `software.amazon.awssdk:s3` from 2.26.27 to 2.27.17

Updates `software.amazon.awssdk:sqs` from 2.26.27 to 2.27.17

Updates `software.amazon.awssdk:dynamodb` from 2.26.27 to 2.27.17

---
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>

* build: bump version.aws.sdk in /apm-agent-plugins (#3779)

Bumps `version.aws.sdk` from 1.12.767 to 1.12.770.

Updates `com.amazonaws:aws-java-sdk-s3` from 1.12.767 to 1.12.770
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.767...1.12.770)

Updates `com.amazonaws:aws-java-sdk-dynamodb` from 1.12.767 to 1.12.770
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.767...1.12.770)

Updates `com.amazonaws:aws-java-sdk-sqs` from 1.12.767 to 1.12.770
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](aws/aws-sdk-java@1.12.767...1.12.770)

---
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>

* chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to 59b6a57 (#3777)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>

* enhance class name detection (#3746)

* enhance class name detection

* added fix and test for nested scala objects

* added changelog entry

* remove regex

* fix anonymous class names

- anonymous classes are now shown as "ParentClass$1" instead of "ParentClass"
- added more testcases

* fix unit tests

* build: bump version.mockito from 5.12.0 to 5.13.0 (#3781)

Bumps `version.mockito` from 5.12.0 to 5.13.0.

Updates `org.mockito:mockito-core` from 5.12.0 to 5.13.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.12.0...v5.13.0)

Updates `org.mockito:mockito-subclass` from 5.12.0 to 5.13.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.12.0...v5.13.0)

---
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>

* build: bump version.byte-buddy from 1.15.0 to 1.15.1 (#3782)

* build: bump version.byte-buddy from 1.15.0 to 1.15.1

Bumps `version.byte-buddy` from 1.15.0 to 1.15.1.

Updates `net.bytebuddy:byte-buddy` from 1.15.0 to 1.15.1
- [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.0...byte-buddy-1.15.1)

Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.15.1
- [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.1)

Updates `net.bytebuddy:byte-buddy-dep` from 1.15.0 to 1.15.1
- [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.0...byte-buddy-1.15.1)

---
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]>

* revert bad upgrade

---------

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 aad4cd4 (#3783)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>

* deps(updatecli): bump all policies (#3785)

* 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

* use the new way to sign commits

---------

Co-authored-by: obltmachine <[email protected]>
Co-authored-by: Victor Martinez <[email protected]>

* deps(updatecli): bump all policies (#3787)

* Fix test-reporter workflow (#3797)

* chore: deps(updatecli/policy): bump "ghcr.io/updatecli/policies/autod... (#3794)

... iscovery/updatecli" Updatecli version policy

Made with ❤️️ by updatecli

* github-action: use oblt-actions/maven/await-artifact (#3796)

* Bump upload- and download-artifact to v4 (#3798)

* Make health metrics GA (#3802)

* Make health metrics GA

* Make health metrics GA - changelog

* chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest docker digest to d4def25 (#3805)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>

* build: bump version.log4j from 2.12.4 to 2.24.0 (#3792)

* build: bump version.log4j from 2.12.4 to 2.24.0

Bumps `version.log4j` from 2.12.4 to 2.24.0.

Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.24.0

Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.24.0

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  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 the change

* Fix classpath for log4j2 tests

* Upgrade log4j2 tests to JUnit5, disable broken tests

* Fix error capturing test for 2.6

---------

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]>

* github-action: use ephemeral tokens with the required permissions (#3789)

* deps(updatecli): bump all policies (#3806)

* build: bump actions/attest-build-provenance from 1.4.2 to 1.4.3 in the github-actions group (#3786)

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.2 to 1.4.3
- [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@6149ea5...1c608d1)

---
updated-dependencies:
- dependency-name: actions/attest-build-provenance
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* pre release: elastic-apm-agent v1.52.0 (#3810)

Co-authored-by: obltmachine <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: obltmachine <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: wolframhaussig <[email protected]>
Co-authored-by: Jan Calanog <[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: Victor Martinez <[email protected]>
Co-authored-by: SylvainJuge <[email protected]>
Co-authored-by: jackshirazi <[email protected]>
Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
  • Loading branch information
11 people authored Sep 23, 2024
1 parent 0ab2a3a commit 95eb8cf
Show file tree
Hide file tree
Showing 297 changed files with 2,702 additions and 977 deletions.
3 changes: 1 addition & 2 deletions .ci/updatecli/values.d/apm-data-spec.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
apm_schema_specs_path: apm-agent-core/src/test/resources/apm-server-schema/current
signedcommit: true
apm_schema_specs_path: apm-agent-core/src/test/resources/apm-server-schema/current
3 changes: 1 addition & 2 deletions .ci/updatecli/values.d/apm-gherkin.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
apm_gherkin_specs_path: apm-agent-core/src/test/resources/specs
signedcommit: true
apm_gherkin_specs_path: apm-agent-core/src/test/resources/specs
3 changes: 1 addition & 2 deletions .ci/updatecli/values.d/apm-json-specs.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
apm_json_specs_path: apm-agent-core/src/test/resources/json-specs
signedcommit: true
apm_json_specs_path: apm-agent-core/src/test/resources/json-specs
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ scm:
repository: apm-agent-java
apm_repository: apm
branch: main
commitusingapi: true
# begin update-compose policy values
user: obltmachine
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion .ci/updatecli/values.d/update-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
spec:
files:
- "update-compose.yaml"
- "updatecli-compose.yaml"
4 changes: 2 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]'
if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
uses: actions/github-script@v7
with:
script: |
Expand All @@ -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]'
if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
uses: wow-actions/auto-comment@v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ jobs:
- uses: actions/checkout@v4

- name: Log in to the Elastic Container registry
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-step-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
run: tar xvf ${{ env.TARBALL_FILE }}

- name: generate build provenance
uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0 # v1.3.3
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
with:
subject-path: "${{ github.workspace }}/**/target/*.jar"

Expand All @@ -115,10 +115,10 @@ jobs:
needs:
- validate-tag
steps:
- uses: elastic/apm-pipeline-library/.github/actions/await-maven-artifact@current
- uses: elastic/oblt-actions/maven/await-artifact@v1
with:
groupid: 'co.elastic.apm'
artifactid: 'elastic-apm-agent'
group-id: 'co.elastic.apm'
artifact-id: 'elastic-apm-agent'
version: ${{ env.RELEASE_VERSION }}

build-and-push-docker-images:
Expand All @@ -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@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
run: tar xvf ${{ env.TARBALL_FILE }}

- name: generate build provenance
uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0 # v1.3.3
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
with:
subject-path: "${{ github.workspace }}/**/target/*.jar"

Expand All @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v4

- name: Log in to the Elastic Container registry
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stash/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
shell: bash

- name: Upload stash
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.name }}
path: ${{ runner.temp }}/${{ inputs.name }}.tar.zst
2 changes: 1 addition & 1 deletion .github/workflows/test-reporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
report:
runs-on: ubuntu-latest
steps:
- uses: elastic/apm-pipeline-library/.github/actions/test-report@current
- uses: elastic/oblt-actions/test-report@v1
with:
artifact: /test-results-(.*)/
name: 'Test Results $1'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unstash/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
using: "composite"
steps:
- name: Download stash
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.name }}
path: ${{ runner.temp }}
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/updatecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
- 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
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -27,13 +39,13 @@ jobs:
with:
command: --experimental compose diff
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}

- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental compose apply
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}

- if: failure()
uses: elastic/oblt-actions/slack/send@v1
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ 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
Expand All @@ -49,6 +62,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.wolfi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/wolfi/chainguard-base@sha256:9f940409f96296ef56140bcc4665c204dd499af4c32c96cc00e792558097c3f1
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:d4def25f2fd3b0ff9bc68091cd1d89524e41b7d3fc0d3b3a665720eb92145f3b
RUN mkdir /usr/agent
ARG JAR_FILE
ARG HANDLER_FILE
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-attach-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
9 changes: 8 additions & 1 deletion apm-agent-attach/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-attach</artifactId>
Expand Down Expand Up @@ -165,6 +165,13 @@
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>${project.groupId}.attach</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-builds</artifactId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-java8</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-builds</artifactId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-cached-lookup-key/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.51.0</version>
<version>1.52.0</version>
</parent>

<artifactId>apm-agent-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]", "experimental")
.tags("added[1.35.0]")
.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]", "experimental")
.tags("added[1.35.0]")
.dynamic(false)
.buildWithDefault(false);

Expand Down
Loading

0 comments on commit 95eb8cf

Please sign in to comment.