Reset major branch #3739

JonasKunz · 2024-07-29T10:08:14Z

What does this PR do?

Adds a merge commit onto the the 1.x branch. The merge commit was created on 63603d5 using merge -s ours to reset the state of the 1.x branch to that commit on main.

If we now merge this PR using "merge" instead of "squash & merge", the previously problematic commits will become part of the history of the 1.x branch and therefore shouldn't appear anymore in future update PRs.

elastic#3554)

…tic#3498)

…#3547) * Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3 Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.1.0 to 1.3.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.1.0...1.3.3) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix compilation * Fix schema version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.12.2 to 1.12.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.12.2...v1.12.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump version.log4j from 2.12.4 to 2.23.1 Bumps `version.log4j` from 2.12.4 to 2.23.1. Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.23.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.23.1 --- 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] <support@github.com> * restore previous log4j version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

--------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

…re (elastic#3522) * Remove logging API. * Clean up core dependencies from POMs that do not need it. * Add API for handling lambda instrumentation and apply to the AWS plugin. * Move metrics API to tracer. * Factor out JSON DSL for metrics. * Fix import issue. * Fix imports. * Fix imports. * fix formatting --------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

--------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

* feat: new release process with PRs Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * chore: redirect to stderr for both message Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * chore: apply suggest Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * ci(chore): use env var instead of prefix v Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * ci: use maven wrapper instead of direct maven Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * feat: validate snapshot for snapshot workflow Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> * docs: add new release process Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co> --------- Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

…astic#3574) Bumps `version.aws.sdk` from 2.25.0 to 2.25.21. Updates `software.amazon.awssdk:s3` from 2.25.0 to 2.25.21 Updates `software.amazon.awssdk:sqs` from 2.25.0 to 2.25.21 Updates `software.amazon.awssdk:dynamodb` from 2.25.0 to 2.25.21 --- 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](awaitility/awaitility@awaitility-4.2.0...awaitility-4.2.1) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…lastic#3568) * use a dummy user for testing * exclusion list option for calling getUserName * changelog and test break fixed

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

elastic#3577) Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

… 3.2.4 (elastic#3572) * 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.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.16...v3.2.4) --- 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] <support@github.com> * Update pom.xml * Update pom.xml * Update pom.xml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>

Bumps `version.mockito` from 5.1.1 to 5.11.0. Updates `org.mockito:mockito-core` from 5.1.1 to 5.11.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.1.1...v5.11.0) Updates `org.mockito:mockito-subclass` from 5.1.1 to 5.11.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.1.1...v5.11.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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps `version.aws.sdk` from 2.25.64 to 2.26.12. Updates `software.amazon.awssdk:s3` from 2.25.64 to 2.26.12 Updates `software.amazon.awssdk:sqs` from 2.25.64 to 2.26.12 Updates `software.amazon.awssdk:dynamodb` from 2.25.64 to 2.26.12 --- 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build: bump redis.clients:jedis from 1.4.0 to 5.1.3 Bumps [redis.clients:jedis](https://github.com/redis/jedis) from 1.4.0 to 5.1.3. - [Release notes](https://github.com/redis/jedis/releases) - [Commits](redis/jedis@jedis-1.4.0...v5.1.3) --- updated-dependencies: - dependency-name: redis.clients:jedis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update pom.xml * Update pom.xml * Update pom.xml * Update pom.xml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>

Bumps `version.aws.sdk` from 1.12.740 to 1.12.755. Updates `com.amazonaws:aws-java-sdk-s3` from 1.12.740 to 1.12.755 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.740...1.12.755) Updates `com.amazonaws:aws-java-sdk-dynamodb` from 1.12.740 to 1.12.755 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.740...1.12.755) Updates `com.amazonaws:aws-java-sdk-sqs` from 1.12.740 to 1.12.755 - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.740...1.12.755) --- 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.25.3...assertj-build-3.26.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add elastic-otel-java to weekly benchmarks * Apply suggestions from code review Co-authored-by: jackshirazi <jacks@fasterj.com> * Fix wrong agent name * Shorten name to not mess up results table * Even shorter name --------- Co-authored-by: jackshirazi <jacks@fasterj.com>

* Add benchmarks for individual distro features on snapshot * Fix argument generation

* runtime attach: prevent NPE with null value

…lastic#3710) Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.4.3 to 1.5.0. - [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.4.3...1.5.0) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Clarify we collect the exceptions passed to a `logger.error`, not the message of the `logger.error`.

…up (elastic#3717) 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.2 to 1.3.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@bdd5137...5e9cb68) --- 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.26.0...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* z/OS avoids using NOFOLLOW_LINKS * add changelg entry for zos-no-follow-links

* build: bump version.byte-buddy from 1.14.17 to 1.14.18 Bumps `version.byte-buddy` from 1.14.17 to 1.14.18. Updates `net.bytebuddy:byte-buddy` from 1.14.17 to 1.14.18 - [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.17...byte-buddy-1.14.18) Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.14.18 - [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.18) Updates `net.bytebuddy:byte-buddy-dep` from 1.14.17 to 1.14.18 - [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.17...byte-buddy-1.14.18) --- 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] <support@github.com> * old version stays --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jackshirazi <jack.shirazi@elastic.co>

Co-authored-by: jackshirazi <jacks@fasterj.com>

* properly handle missing metrics with non-wildcards * update changelog --------- Co-authored-by: jackshirazi <jack.shirazi@elastic.co>

…tic#3729) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.13.1 to 1.13.2. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.13.1...v1.13.2) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…7.16 to 3.3.2 (elastic#3727) * 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.3.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.7.16...v3.3.2) --- 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] <support@github.com> * Update pom.xml * Update pom.xml * Update pom.xml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jackshirazi <jack.shirazi@elastic.co>

Co-authored-by: obltmachine <obltmachine@users.noreply.github.com>

…astic#3735)

cla-checker-service · 2024-07-29T10:08:22Z

❌ Author of the following commits did not sign a Contributor Agreement:
, , , , , 3c4a753, 3b22aad, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,

Please, read and sign the above mentioned agreement if you want to contribute to this project

apmmachine and others added 30 commits March 6, 2024 16:49

[maven-release-plugin] prepare for next development iteration

e61a8fc

Update cloudfoundry for 1.48.1 release

c7f7f2c

ci: use .java-version and prepare to use VM with installed tools in BK (

72a74e5

elastic#3554)

ci(bk): use specialised VMs (elastic#3555)

6d111e8

Added a note on centralized agent config support for AWS Lambda (elas…

9a97f78

…tic#3498)

Fix inheritance for API annotations (elastic#3551)

6d4b20e

powershell no-logo (elastic#3556)

c5ed2e1

security: add permissions block to workflows (elastic#3531)

f45c746

Add API for instrumenting FAAS and adjust the AWS plugin (elastic#3516)

464b9c1

--------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

differentiate Lambda url from api gateway (elastic#3417)

3c4a753

--------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

added support to Elastic Load Balancer triggers (elastic#3411)

3b22aad

--------- Co-authored-by: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>

Add exclusion list option for calling DatabaseMetaData.getUserName (e…

2e1bce7

…lastic#3568) * use a dummy user for testing * exclusion list option for calling getUserName * changelog and test break fixed

pre release: elastic-apm-agent v1.49.0 (elastic#3576)

a3709b7

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

ci(fix): use input value instead of env value for post release trigger (

3059907

elastic#3577) Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

ci(fix): correct buildkite pipeline trigger (elastic#3578)

1a17acb

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

post release: elastic-apm-agent v1.49.0 (elastic#3579)

42f0095

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

ci(fix): correct release order (elastic#3581)

1cdc171

Signed-off-by: Adrien Mannocci <adrien.mannocci@elastic.co>

buildkite: fallback if home is not available (elastic#3591)

750ba4b

Prevent cycles in inferred spans (elastic#3588)

d63b1cc

[ci] add list of published artifacts (elastic#3595)

c987020

github-actions: enable provenance for the jar files (elastic#3594)

9b0c70a

dependabot bot and others added 23 commits July 3, 2024 09:54

updatecli: use shared policy (elastic#3707)

1849960

Run opentelemetry benchmarks for individual features (elastic#3708)

ffdd4c9

* Add benchmarks for individual distro features on snapshot * Fix argument generation

runtime attach: prevent NPE with null value (elastic#3712)

485eb00

* runtime attach: prevent NPE with null value

updatecli: bump policies too (elastic#3714)

7b6ba98

[DOCS] Clarify error capturing (elastic#3716)

d2dace0

Clarify we collect the exceptions passed to a `logger.error`, not the message of the `logger.error`.

deps(updatecli): bump all policies (elastic#3715)

7bae628

z/OS avoids using NOFOLLOW_LINKS (elastic#3722)

0a94d47

* z/OS avoids using NOFOLLOW_LINKS * add changelg entry for zos-no-follow-links

Capture request body for Apache HttpClient 4.x (elastic#3692)

cf3d0fc

Co-authored-by: jackshirazi <jacks@fasterj.com>

jmx-metrics-fix (elastic#3713)

6dde355

* properly handle missing metrics with non-wildcards * update changelog --------- Co-authored-by: jackshirazi <jack.shirazi@elastic.co>

pre release: elastic-apm-agent v1.51.0 (elastic#3731)

0c05c60

Co-authored-by: obltmachine <obltmachine@users.noreply.github.com>

Use 1.5.5 lambda layer for tests because 1.5.6 seems to be broken (el…

63603d5

…astic#3735)

Merge remote-tracking branch 'elastic/1.x' into reset_major_branch

c181f3a

github-actions bot added the agent-java label Jul 29, 2024

jackshirazi approved these changes Jul 29, 2024

View reviewed changes

JonasKunz merged commit 370f5f0 into elastic:1.x Jul 29, 2024
14 of 15 checks passed

JonasKunz deleted the reset_major_branch branch July 29, 2024 10:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reset major branch #3739

Reset major branch #3739

JonasKunz commented Jul 29, 2024

cla-checker-service bot commented Jul 29, 2024

Reset major branch #3739

Reset major branch #3739

Conversation

JonasKunz commented Jul 29, 2024

What does this PR do?

cla-checker-service bot commented Jul 29, 2024