Skip to content

Commit

Permalink
post release v1.50.0: update major branch (#3650)
Browse files Browse the repository at this point in the history
* [maven-release-plugin] prepare for next development iteration

* Update cloudfoundry for 1.48.1 release

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

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

* Added a note on centralized agent config support for AWS Lambda (#3498)

* Bump com.networknt:json-schema-validator from 1.1.0 to 1.3.3 (#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] <[email protected]>

* Fix compilation

* Fix schema version

---------

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

* Fix inheritance for API annotations (#3551)

* powershell no-logo (#3556)

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

* Bump io.micrometer:micrometer-core from 1.12.2 to 1.12.4 (#3559)

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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump version.log4j from 2.12.4 to 2.23.1 (#3557)

* 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] <[email protected]>

* restore previous log4j 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]>

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



---------

Co-authored-by: Sylvain Juge <[email protected]>

* Introduce API for metrics collection that does not depend on agent-core (#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 <[email protected]>

* differentiate Lambda url from api gateway (#3417)


---------

Co-authored-by: Sylvain Juge <[email protected]>

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



---------

Co-authored-by: Sylvain Juge <[email protected]>

* feat: new release process with PRs (#3567)

* feat: new release process with PRs

Signed-off-by: Adrien Mannocci <[email protected]>

* chore: redirect to stderr for both message

Signed-off-by: Adrien Mannocci <[email protected]>

* chore: apply suggest

Signed-off-by: Adrien Mannocci <[email protected]>

* ci(chore): use env var instead of prefix v

Signed-off-by: Adrien Mannocci <[email protected]>

* ci: use maven wrapper instead of direct maven

Signed-off-by: Adrien Mannocci <[email protected]>

* feat: validate snapshot for snapshot workflow

Signed-off-by: Adrien Mannocci <[email protected]>

* docs: add new release process

Signed-off-by: Adrien Mannocci <[email protected]>

---------

Signed-off-by: Adrien Mannocci <[email protected]>

* Bump version.aws.sdk from 2.25.0 to 2.25.21 in /apm-agent-plugins (#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump org.awaitility:awaitility from 4.2.0 to 4.2.1 (#3573)

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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add exclusion list option for calling DatabaseMetaData.getUserName (#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 (#3576)

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

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

Signed-off-by: Adrien Mannocci <[email protected]>

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

Signed-off-by: Adrien Mannocci <[email protected]>

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

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

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

Signed-off-by: Adrien Mannocci <[email protected]>

* Bump org.springframework.boot:spring-boot-dependencies from 2.7.16 to 3.2.4 (#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] <[email protected]>

* Update pom.xml

* Update pom.xml

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

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

* Prevent cycles in inferred spans (#3588)

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

* Bump version.mockito from 5.1.1 to 5.11.0 (#3587)

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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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

* chore: APM agent json server schema a76e999543efb3ba803c9a57dd13a4f6b... (#3584)

... 3ffa7e1

Made with ❤️️ by updatecli

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

* [ci] fix GH release version tag (#3596)

* [ci] fix artifact list path (#3597)

* Upgrade JDK compatibility tests (#3599)

* Upgrade JDK compatibility tests

* Added JDK 23 ea

* Attempt to set net.bytebuddy.experimental for EA versions

* Remove java 23-ea tests

* Bump version.ecs.logging from 1.5.0 to 1.6.0 (#3585)

Bumps `version.ecs.logging` from 1.5.0 to 1.6.0.

Updates `co.elastic.logging:log4j2-ecs-layout` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/elastic/ecs-logging-java/releases)
- [Commits](elastic/ecs-logging-java@v1.5.0...v1.6.0)

Updates `co.elastic.logging:logback-ecs-encoder` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/elastic/ecs-logging-java/releases)
- [Commits](elastic/ecs-logging-java@v1.5.0...v1.6.0)

Updates `co.elastic.logging:log4j-ecs-layout` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/elastic/ecs-logging-java/releases)
- [Commits](elastic/ecs-logging-java@v1.5.0...v1.6.0)

Updates `co.elastic.logging:jul-ecs-formatter` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/elastic/ecs-logging-java/releases)
- [Commits](elastic/ecs-logging-java@v1.5.0...v1.6.0)

Updates `co.elastic.logging:jboss-logmanager-ecs-formatter` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/elastic/ecs-logging-java/releases)
- [Commits](elastic/ecs-logging-java@v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: co.elastic.logging:log4j2-ecs-layout
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: co.elastic.logging:logback-ecs-encoder
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: co.elastic.logging:log4j-ecs-layout
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: co.elastic.logging:jul-ecs-formatter
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: co.elastic.logging:jboss-logmanager-ecs-formatter
  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>

* Bump org.apache.logging.log4j:log4j-bom from 2.22.1 to 2.23.1 (#3565)

Bumps [org.apache.logging.log4j:log4j-bom](https://github.com/apache/logging-log4j2) from 2.22.1 to 2.23.1.
- [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.22.1...rel/2.23.1)

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-bom
  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>

* github-action: add attestations scope (#3601)

* Universal profiling integration: write shared memory (#3598)


---------

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

* ci(release): tag AWS with the ver prefix (#3606)

* release: use tag version for docker build/push (#3600)

* Bump version.byte-buddy from 1.14.12 to 1.14.14 (#3608)

* Bump version.byte-buddy from 1.14.12 to 1.14.14

Bumps `version.byte-buddy` from 1.14.12 to 1.14.14.

Updates `net.bytebuddy:byte-buddy` from 1.14.12 to 1.14.14
- [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.12...byte-buddy-1.14.14)

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

Updates `net.bytebuddy:byte-buddy-dep` from 1.14.12 to 1.14.14
- [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.12...byte-buddy-1.14.14)

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

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

* Universal Profiling integration: open socket for communication (#3602)

* Fix NPE in dropped spans stats (#3590)

* fix npe

* update changelog

* Universal profiling integration: Added serialization of stacktrace IDs as profiler_stack_trace_ids otel attributes (#3607)

* release: use explicit container arch (#3611)

* Bump version.aws.sdk from 2.25.21 to 2.25.43 in /apm-agent-plugins (#3614)

Bumps `version.aws.sdk` from 2.25.21 to 2.25.43.

Updates `software.amazon.awssdk:s3` from 2.25.21 to 2.25.43

Updates `software.amazon.awssdk:sqs` from 2.25.21 to 2.25.43

Updates `software.amazon.awssdk:dynamodb` from 2.25.21 to 2.25.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>

* Add thread dump debug option (#3589)

* add thread dump option

* Universal profiling integration: Add stacktrace-IDs to transactions (#3615)

* add c3p0 to DatabaseMetaDataExclusionList (#3619)

* ci(fix): Files or Directories Accessible to External Parties (#3624)

* Bump org.springframework.boot:spring-boot-dependencies from 2.7.16 to 3.2.5 (#3610)

* 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.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.7.16...v3.2.5)

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

* keep v2 dependency

* keep v2 dependency

* keep v2 dependency

---------

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

* Bump org.jctools:jctools-core from 4.0.1 to 4.0.3 (#3618)

* Bump org.jctools:jctools-core from 4.0.1 to 4.0.3

Bumps [org.jctools:jctools-core](https://github.com/JCTools/JCTools) from 4.0.1 to 4.0.3.
- [Release notes](https://github.com/JCTools/JCTools/releases)
- [Changelog](https://github.com/JCTools/JCTools/blob/master/RELEASE-NOTES.md)
- [Commits](JCTools/JCTools@v4.0.1...v4.0.3)

---
updated-dependencies:
- dependency-name: org.jctools:jctools-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* remove comment

---------

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

* Bump version.mockito from 5.11.0 to 5.12.0 (#3629)

Bumps `version.mockito` from 5.11.0 to 5.12.0.

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

Updates `org.mockito:mockito-subclass` from 5.11.0 to 5.12.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.11.0...v5.12.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>

* Bump com.networknt:json-schema-validator from 1.3.3 to 1.4.0 (#3628)

Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.3.3 to 1.4.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.3.3...1.4.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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* github-action: delete opentelemetry workflow (#3630)

* buildkite: avoid failing in tear-down failed (#3622)

* github-action: use actions/attest-build-provenance (#3631)

* Clarify rabbitmq naming mode support (#3633)

* ci: build and push Docker image based on Chainguard base image (#3623)

* bouncy castle upgrade (#3634)

* add symlink in dockerfile for /javaagent.jar for otel operator to find (#3635)

* add symlink in dockerfile for /javaagent.jar for otel operator to find

* and wolfi too

* buildkite: support version 21 for opentelemetry (#3621)

* Bump version.testcontainers from 1.19.1 to 1.19.8 (#3641)

Bumps `version.testcontainers` from 1.19.1 to 1.19.8.

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

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

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

* ci: add some job timeouts (#3638)

* Fix too small activation stack for low transaction_max_spans values (#3643)

* Exclude new Cisco AppD packages (#3632)

* Bump version.okhttp from 3.14.7 to 4.12.0 (#3640)

Bumps `version.okhttp` from 3.14.7 to 4.12.0.

Updates `com.squareup.okhttp3:okhttp` from 3.14.7 to 4.12.0
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-3.14.7...parent-4.12.0)

Updates `com.squareup.okhttp3:logging-interceptor` from 4.9.1 to 4.12.0
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.9.1...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.squareup.okhttp3:logging-interceptor
  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>

* Bump redis.clients:jedis from 1.4.0 to 5.1.2 (#3639)

* Bump redis.clients:jedis from 1.4.0 to 5.1.2

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

---
updated-dependencies:
- dependency-name: redis.clients:jedis
  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

* Update pom.xml

* Fix tests

* Fix invalid extracted method

---------

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

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

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.1.1 to 1.1.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@951c0c5...173725a)

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

* more stack frames for thread dump (#3644)

* pre release: elastic-apm-agent v1.50.0 (#3648)

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Adrien Mannocci <[email protected]>
Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Som <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonas Kunz <[email protected]>
Co-authored-by: SylvainJuge <[email protected]>
Co-authored-by: Jan Calanog <[email protected]>
Co-authored-by: Rafael Winterhalter <[email protected]>
Co-authored-by: Nugusbayev Kanagat <[email protected]>
Co-authored-by: Adrien Mannocci <[email protected]>
Co-authored-by: jackshirazi <[email protected]>
Co-authored-by: Thomas ANDRI Wijayanto <[email protected]>
  • Loading branch information
13 people authored May 28, 2024
1 parent fd29376 commit 32f2612
Show file tree
Hide file tree
Showing 256 changed files with 2,703 additions and 414 deletions.
10 changes: 7 additions & 3 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,15 @@ if [[ "$BUILDKITE_COMMAND" =~ .*"upload".* ]]; then
exit 0
fi

# Run always
source .buildkite/hooks/prepare-common.sh

if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-opentelemetry-benchmark" ]; then
source .buildkite/hooks/prepare-benchmark.sh
# NOTE: https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/11323 might
# support .java-version, if so then it might be worthy to read the file.
JAVA_VERSION=21
source .buildkite/hooks/prepare-common.sh
fi

if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-snapshot" ]; then
Expand All @@ -25,6 +32,3 @@ fi
if [ "$BUILDKITE_PIPELINE_SLUG" == "apm-agent-java-release" ]; then
source .buildkite/hooks/prepare-release.sh
fi

# Run always
source .buildkite/hooks/prepare-common.sh
14 changes: 12 additions & 2 deletions .buildkite/hooks/prepare-common.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
#!/usr/bin/env bash
set -euo pipefail
set -eo pipefail

# Configure the java version
JAVA_VERSION=$(cat .java-version | xargs | tr -dc '[:print:]')
if [ -z "$JAVA_VERSION" ] ; then
JAVA_VERSION=$(cat .java-version | xargs | tr -dc '[:print:]')
fi
set +u
# In case the HOME is not available in the context of the runner.
if [ -z "${HOME}" ] ; then
HOME="${BUILDKITE_BUILD_CHECKOUT_PATH}"
export HOME
fi
JAVA_HOME="${HOME}/.java/openjdk${JAVA_VERSION}"
set -u

export JAVA_HOME
PATH="${JAVA_HOME}/bin:${PATH}"
export PATH
Expand Down
4 changes: 4 additions & 0 deletions .buildkite/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ agents:
provider: "gcp"
image: "family/apm-agent-java-ubuntu-2204"

env:
TARBALL_FILE: ${TARBALL_FILE:-artifacts.tar}

steps:
- label: "Run the release"
key: "release"
commands: .ci/release.sh
artifact_paths:
- "release.txt"
- "**/target/*"
- "${TARBALL_FILE}"

notify:
- slack: "#apm-agent-java"
Expand Down
4 changes: 4 additions & 0 deletions .buildkite/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ agents:
provider: "gcp"
image: "family/apm-agent-java-ubuntu-2204"

env:
TARBALL_FILE: ${TARBALL_FILE:-artifacts.tar}

steps:
- label: "Run the snapshot"
key: "release"
commands: .ci/snapshot.sh
artifact_paths:
- "snapshot.txt"
- "**/target/*"
- "${TARBALL_FILE}"

notify:
- slack: "#apm-agent-java"
Expand Down
21 changes: 21 additions & 0 deletions .ci/published-artifacts-list.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash

targets="$(find . -type d -name 'target'|grep -v apm-agent-plugins|grep -v integration-tests|sort)"

for t in ${targets}; do
find "${t}" \
-name '*.jar' \
| grep -v '\-sources.jar' \
| grep -v '\-tests.jar' \
| grep -v '\-javadoc.jar' \
| grep -v 'original-' \
| grep -v 'classes/' \
| grep -v 'benchmarks' \
| grep -v 'apm-agent-bootstrap' \
| grep -v 'apm-agent-builds' \
| grep -v 'apm-agent-cached-lookup-key' \
| grep -v 'apm-agent-core' \
| grep -v 'apm-agent-common' \
| grep -v 'apm-agent-lambda-layer' \
| grep -v 'apm-agent-premain'
done
8 changes: 7 additions & 1 deletion .ci/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -eo pipefail
clean_up () {
ARG=$?
echo "--- Deleting tmp workspace"
rm -rf $TMP_WORKSPACE
rm -rf $TMP_WORKSPACE || true
exit $ARG
}
trap clean_up EXIT
Expand All @@ -32,3 +32,9 @@ fi

echo "--- Deploy the release :package: [./mvnw $GOAL)] $DRY_RUN_MSG"
./mvnw -V -s .ci/settings.xml -Pgpg clean $GOAL -DskipTests --batch-mode | tee release.txt

echo "--- Archive the target folder with jar files"
echo 'gather artifacts'
.ci/published-artifacts-list.sh | tee artifacts.list
echo 'create tarbal'
tar -cvf "${TARBALL_FILE:-artifacts.tar}" -T artifacts.list
8 changes: 7 additions & 1 deletion .ci/snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set -eo pipefail
clean_up () {
ARG=$?
echo "--- Deleting tmp workspace"
rm -rf $TMP_WORKSPACE
rm -rf $TMP_WORKSPACE || true
exit $ARG
}
trap clean_up EXIT
Expand All @@ -34,3 +34,9 @@ fi

echo "--- Deploy the snapshot :package: [./mvnw $GOAL)] $DRY_RUN_MSG"
./mvnw -V -s .ci/settings.xml -Pgpg clean $GOAL -DskipTests --batch-mode | tee snapshot.txt

echo "--- Archive the target folder with jar files"
echo 'gather artifacts'
.ci/published-artifacts-list.sh | tee artifacts.list
echo 'create tarbal'
tar -cvf "${TARBALL_FILE:-artifacts.tar}" -T artifacts.list
11 changes: 10 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
build:
name: Build
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/maven-goal
Expand Down Expand Up @@ -128,6 +129,7 @@ jobs:
name: License
runs-on: ubuntu-latest
needs: build
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/unstash
Expand All @@ -148,6 +150,7 @@ jobs:
# When undefined, we need to emulate the default value
if: inputs.test_ci == true || inputs.test_ci == null
runs-on: ubuntu-latest
timeout-minutes: 30
needs: build
steps:
- uses: actions/checkout@v4
Expand All @@ -169,6 +172,7 @@ jobs:
non-app-server-integration-tests:
name: Non-Application Server integration tests
timeout-minutes: 60
if: |
contains(github.event.pull_request.labels.*.name, 'ci:agent-integration')
|| github.event.pull_request.draft == false
Expand Down Expand Up @@ -207,6 +211,7 @@ jobs:
app-server-integration-tests:
name: Application Server integration tests
timeout-minutes: 60
if: |
contains(github.event.pull_request.labels.*.name, 'ci:agent-integration')
|| github.event.pull_request.draft == false
Expand Down Expand Up @@ -248,6 +253,7 @@ jobs:
name: Javadoc
runs-on: ubuntu-latest
needs: build
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/unstash
Expand All @@ -260,6 +266,7 @@ jobs:

unit-tests-windows:
name: Build & Test Windows
timeout-minutes: 60
# Inputs aren't defined on some events
# When undefined, we need to emulate the default value
if: |
Expand Down Expand Up @@ -287,6 +294,7 @@ jobs:
jdk-compatibility-tests:
name: JDK Compatibility Tests
timeout-minutes: 60
if: |
contains(github.event.pull_request.labels.*.name, 'ci:jdk-compatibility')
|| inputs.jdk_compatibility_ci == true
Expand All @@ -301,7 +309,7 @@ jobs:
distribution: 'temurin'
- version: 21
distribution: 'temurin'
- version: 22-ea
- version: 22
distribution: 'temurin'
steps:
- uses: actions/checkout@v4
Expand All @@ -324,6 +332,7 @@ jobs:
jboss:
name: JBoss integration tests
runs-on: ubuntu-latest
timeout-minutes: 30
needs: build
# If no PR event or if a PR event that's caused by a non-fork and non dependabot actor
if: github.event_name != 'pull_request' || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' )
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/opentelemetry.yml

This file was deleted.

83 changes: 52 additions & 31 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ jobs:
runs-on: ubuntu-latest
needs:
- validate-tag
permissions:
attestations: write
contents: write
id-token: write
env:
TARBALL_FILE: artifacts.tar
steps:
- id: buildkite
continue-on-error: true
Expand All @@ -86,8 +92,23 @@ jobs:
pipeline: apm-agent-java-release
waitFor: true
printBuildLogs: false
artifactName: releases
artifactPath: ${{ env.TARBALL_FILE }}
buildEnvVars: |
dry_run=${{ inputs.dry_run || 'false' }}
TARBALL_FILE=${{ env.TARBALL_FILE }}
- uses: actions/download-artifact@v3
with:
name: releases

- name: untar the buildkite tarball
run: tar xvf ${{ env.TARBALL_FILE }}

- name: generate build provenance
uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d # v1.1.2
with:
subject-path: "${{ github.workspace }}/**/target/*.jar"

await-maven-central-artifact:
name: "Wait for artifacts to be available on maven central"
Expand All @@ -101,37 +122,12 @@ jobs:
artifactid: 'elastic-apm-agent'
version: ${{ env.RELEASE_VERSION }}

update-major-branch:
name: "Update Major Branch"
runs-on: ubuntu-latest
needs:
- await-maven-central-artifact
permissions:
contents: write
steps:
- uses: elastic/apm-pipeline-library/.github/actions/github-token@current
with:
url: ${{ secrets.VAULT_ADDR }}
roleId: ${{ secrets.VAULT_ROLE_ID }}
secretId: ${{ secrets.VAULT_SECRET_ID }}
- uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
with:
username: ${{ env.GIT_USER }}
email: ${{ env.GIT_EMAIL }}
token: ${{ env.GITHUB_TOKEN }}
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
token: ${{ env.GITHUB_TOKEN }}
- name: Update major branch
if: ${{ ! inputs.dry_run }}
run: .ci/release/update-major-branch.sh ${{ env.RELEASE_VERSION }}

build-and-push-docker-images:
name: "Build and push docker images"
runs-on: ubuntu-latest
needs:
- await-maven-central-artifact
- create-github-release
env:
SONATYPE_FALLBACK: 1
steps:
Expand All @@ -148,11 +144,11 @@ jobs:
secretId: ${{ secrets.VAULT_SECRET_ID }}
- name: "Build docker image"
shell: bash
run: ./scripts/docker-release/build_docker.sh
run: ./scripts/docker-release/build_docker.sh "${{ env.RELEASE_VERSION }}"
- name: "Push docker image"
if: ${{ ! inputs.dry_run }}
shell: bash
run: ./scripts/docker-release/push_docker.sh
run: ./scripts/docker-release/push_docker.sh "${{ env.RELEASE_VERSION }}"

publish-aws-lambda:
name: "Publish AWS Lambda"
Expand Down Expand Up @@ -186,7 +182,7 @@ jobs:
if: ${{ ! inputs.dry_run }}
run: |
# Convert v1.2.3 to ver-1-2-3
VERSION=${RELEASE_VERSION/v/ver-}
VERSION=${RELEASE_VERSION_TAG/v/ver-}
VERSION=${VERSION//./-}
ELASTIC_LAYER_NAME="elastic-apm-java-${VERSION}" .ci/publish-aws.sh
Expand Down Expand Up @@ -217,10 +213,35 @@ jobs:
phase: 'post'
secrets: inherit

update-major-branch:
name: "Update Major Branch"
runs-on: ubuntu-latest
needs:
- post-release
permissions:
contents: write
steps:
- uses: elastic/apm-pipeline-library/.github/actions/github-token@current
with:
url: ${{ secrets.VAULT_ADDR }}
roleId: ${{ secrets.VAULT_ROLE_ID }}
secretId: ${{ secrets.VAULT_SECRET_ID }}
- uses: elastic/apm-pipeline-library/.github/actions/setup-git@current
with:
username: ${{ env.GIT_USER }}
email: ${{ env.GIT_EMAIL }}
token: ${{ env.GITHUB_TOKEN }}
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
token: ${{ env.GITHUB_TOKEN }}
- name: Update major branch
if: ${{ ! inputs.dry_run }}
run: .ci/release/update-major-branch.sh ${{ env.RELEASE_VERSION }}

create-github-release:
name: "Create GitHub Release"
needs:
- post-release
- publish-aws-lambda
- update-major-branch
runs-on: ubuntu-latest
Expand All @@ -247,7 +268,7 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
run: |
gh release create ${{ env.RELEASE_VERSION }} \
gh release create ${{ env.RELEASE_VERSION_TAG }} \
--title="Release ${{ env.RELEASE_VERSION }}" \
--notes="[Release Notes for ${{ env.RELEASE_VERSION }}](https://www.elastic.co/guide/en/apm/agent/java/current/release-notes-${{ steps.get_dotx_branch.outputs.dotx_branch }}.html#release-notes-${{ env.RELEASE_VERSION }})
${{ needs.publish-aws-lambda.outputs.arn_content }}"
Expand Down
Loading

0 comments on commit 32f2612

Please sign in to comment.