From 430aea93250abdc507a0b1c1f8927b05198580d3 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 28 Aug 2024 09:37:31 +0300 Subject: [PATCH] Prepare release 1.32.4 (#2021) --- CHANGELOG.md | 8 ++++ README.md | 10 ++-- dependencyManagement/build.gradle.kts | 6 +-- deployments/cloudfoundry/buildpack/README.md | 2 +- .../META-INF/LICENSE.txt | 0 .../META-INF/NOTICE.txt | 0 licenses/licenses.md | 46 +++++++++---------- version.gradle.kts | 2 +- 8 files changed, 41 insertions(+), 33 deletions(-) rename licenses/{commons-lang3-3.15.0.jar => commons-lang3-3.16.0.jar}/META-INF/LICENSE.txt (100%) rename licenses/{commons-lang3-3.15.0.jar => commons-lang3-3.16.0.jar}/META-INF/NOTICE.txt (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80aa9ca5b..1c3a38e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased +## v1.32.4 - 2024-08-28 + +### General + +- OpenTelemetry Java SDK has been updated to version 1.41.0. +- OpenTelemetry Instrumentation for Java has been updated to version 1.33.6. +- Micrometer dependency has been updated to version 1.13.3. + ## v1.32.3 - 2024-08-01 ### General diff --git a/README.md b/README.md index 898d7ab00..cd7a67922 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@

Stable - - OpenTelemetry Instrumentation for Java Version + + OpenTelemetry Instrumentation for Java Version Splunk GDI specification @@ -104,11 +104,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java, you have to use a compatible API version. -The Splunk Distribution of OpenTelemetry Java version 1.32.3 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.32.4 is compatible with: -* OpenTelemetry API version 1.40.0 -* OpenTelemetry Instrumentation for Java version 1.33.5 +* OpenTelemetry API version 1.41.0 +* OpenTelemetry Instrumentation for Java version 1.33.6 * Micrometer version 1.12.2 ## Snapshot builds diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 089a9bd46..25b081697 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,9 +2,9 @@ plugins { `java-platform` } -val otelVersion = "1.40.0" +val otelVersion = "1.41.0" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") -val otelInstrumentationVersion = "1.33.5" +val otelInstrumentationVersion = "1.33.6" val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") val otelContribAlphaVersion = "1.34.0-alpha" @@ -43,7 +43,7 @@ dependencies { api("com.google.auto.service:auto-service:1.1.1") api("org.assertj:assertj-core:3.26.3") api("org.awaitility:awaitility:4.2.2") - api("com.signalfx.public:signalfx-metrics:1.0.44") + api("com.signalfx.public:signalfx-metrics:1.0.45") api("commons-codec:commons-codec:1.17.1") api("com.github.docker-java:docker-java-core:$dockerJavaVersion") diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index f63af6449..5e794caf6 100644 --- a/deployments/cloudfoundry/buildpack/README.md +++ b/deployments/cloudfoundry/buildpack/README.md @@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file: ```sh -$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.32.3 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.32.4 ``` By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used. diff --git a/licenses/commons-lang3-3.15.0.jar/META-INF/LICENSE.txt b/licenses/commons-lang3-3.16.0.jar/META-INF/LICENSE.txt similarity index 100% rename from licenses/commons-lang3-3.15.0.jar/META-INF/LICENSE.txt rename to licenses/commons-lang3-3.16.0.jar/META-INF/LICENSE.txt diff --git a/licenses/commons-lang3-3.15.0.jar/META-INF/NOTICE.txt b/licenses/commons-lang3-3.16.0.jar/META-INF/NOTICE.txt similarity index 100% rename from licenses/commons-lang3-3.15.0.jar/META-INF/NOTICE.txt rename to licenses/commons-lang3-3.16.0.jar/META-INF/NOTICE.txt diff --git a/licenses/licenses.md b/licenses/licenses.md index 2d9f7ca5e..c1f8d05ee 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2024-08-15 19:21:19 EEST_ +_2024-08-27 11:04:18 EEST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.17.2` @@ -18,23 +18,23 @@ _2024-08-15 19:21:19 EEST_ > - **Embedded license files**: [jackson-jr-objects-2.17.2.jar/META-INF/LICENSE](jackson-jr-objects-2.17.2.jar/META-INF/LICENSE) - [jackson-jr-objects-2.17.2.jar/META-INF/NOTICE](jackson-jr-objects-2.17.2.jar/META-INF/NOTICE) -**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.44` +**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.45` > - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.44` +**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.45` > - **POM Project URL**: [https://www.splunk.com](https://www.splunk.com) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.44` +**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.45` > - **POM Project URL**: [http://www.splunk.com](http://www.splunk.com) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.44` +**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.45` > - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.44` +**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.45` > - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -82,55 +82,55 @@ _2024-08-15 19:21:19 EEST_ > - **Embedded license files**: [micrometer-registry-signalfx-1.13.3.jar/META-INF/LICENSE](micrometer-registry-signalfx-1.13.3.jar/META-INF/LICENSE) - [micrometer-registry-signalfx-1.13.3.jar/META-INF/NOTICE](micrometer-registry-signalfx-1.13.3.jar/META-INF/NOTICE) -**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.40.0` +**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.40.0-alpha` +**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.41.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.40.0` +**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.40.0` +**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.40.0` +**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.40.0` +**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.40.0` +**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.40.0` +**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.40.0` +**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.40.0` +**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.40.0` +**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.40.0` +**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.40.0` +**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -142,7 +142,7 @@ _2024-08-15 19:21:19 EEST_ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**31** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.33.5-alpha` +**31** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.33.6-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -150,12 +150,12 @@ _2024-08-15 19:21:19 EEST_ > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**33** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.15.0` +**33** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.16.0` > - **Project URL**: [https://commons.apache.org/proper/commons-lang/](https://commons.apache.org/proper/commons-lang/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [commons-lang3-3.15.0.jar/META-INF/LICENSE.txt](commons-lang3-3.15.0.jar/META-INF/LICENSE.txt) - - [commons-lang3-3.15.0.jar/META-INF/NOTICE.txt](commons-lang3-3.15.0.jar/META-INF/NOTICE.txt) +> - **Embedded license files**: [commons-lang3-3.16.0.jar/META-INF/LICENSE.txt](commons-lang3-3.16.0.jar/META-INF/LICENSE.txt) + - [commons-lang3-3.16.0.jar/META-INF/NOTICE.txt](commons-lang3-3.16.0.jar/META-INF/NOTICE.txt) **34** **Group:** `org.apache.httpcomponents` **Name:** `httpclient` **Version:** `4.5.14` > - **POM Project URL**: [http://hc.apache.org/httpcomponents-client-ga](http://hc.apache.org/httpcomponents-client-ga) diff --git a/version.gradle.kts b/version.gradle.kts index 340753897..fc8cfff26 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -1,5 +1,5 @@ // do NOT update that variable manually - it is managed by the pre/post release scripts -val distroVersion = "1.32.3" +val distroVersion = "1.32.4" allprojects { version = distroVersion