From 2179741fc720ea08efd6002756fbf19ae38ea3b4 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 20 Sep 2024 08:51:52 +0300 Subject: [PATCH 1/2] Prepare release 1.32.5 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- dependencyManagement/build.gradle.kts | 2 +- deployments/cloudfoundry/buildpack/README.md | 2 +- licenses/licenses.md | 4 ++-- version.gradle.kts | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c3a38e2f..c1b0261bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased +## v1.32.5 - 2024-09-20 + +### General + +- Micrometer dependency has been updated to version 1.13.4. +- Protobuf dependency has been updated to version 3.25.5. + ## v1.32.4 - 2024-08-28 ### General diff --git a/README.md b/README.md index cd7a67922..381470277 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ 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.4 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.32.5 is compatible with: * OpenTelemetry API version 1.41.0 diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 771a473ab..76b5be02f 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -13,7 +13,7 @@ val dockerJavaVersion = "3.4.0" val micrometerOldVersion = "1.3.20" val micrometerVersion = "1.13.4" val mockitoVersion = "5.13.0" -val protobufVersion = "3.25.4" +val protobufVersion = "3.25.5" val slf4jVersion = "2.0.16" // instrumentation version is used to compute Implementation-Version manifest attribute diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index 5e794caf6..19284e177 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.4 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.32.5 ``` By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used. diff --git a/licenses/licenses.md b/licenses/licenses.md index ea2dbdc71..9b4cb23a5 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2024-09-09 14:50:05 PDT_ +_2024-09-20 08:48:37 EEST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.17.2` @@ -256,7 +256,7 @@ _2024-09-09 14:50:05 PDT_ ## The 3-Clause BSD License -**50** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.25.4` +**50** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.25.5` > - **Manifest Project URL**: [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) diff --git a/version.gradle.kts b/version.gradle.kts index fc8cfff26..f8b20290c 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.4" +val distroVersion = "1.32.5" allprojects { version = distroVersion From d8aa51bf18e47731dddfe778fcb848252f9cdbd5 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 20 Sep 2024 15:33:43 +0300 Subject: [PATCH 2/2] update signalfx-metrics version --- dependencyManagement/build.gradle.kts | 2 +- .../META-INF/LICENSE.txt | 0 .../META-INF/NOTICE.txt | 0 licenses/licenses.md | 18 +++++++++--------- 4 files changed, 10 insertions(+), 10 deletions(-) rename licenses/{commons-lang3-3.16.0.jar => commons-lang3-3.17.0.jar}/META-INF/LICENSE.txt (100%) rename licenses/{commons-lang3-3.16.0.jar => commons-lang3-3.17.0.jar}/META-INF/NOTICE.txt (100%) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 76b5be02f..35acf15d0 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -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.45") + api("com.signalfx.public:signalfx-metrics:1.0.46") api("commons-codec:commons-codec:1.17.1") api("com.github.docker-java:docker-java-core:$dockerJavaVersion") diff --git a/licenses/commons-lang3-3.16.0.jar/META-INF/LICENSE.txt b/licenses/commons-lang3-3.17.0.jar/META-INF/LICENSE.txt similarity index 100% rename from licenses/commons-lang3-3.16.0.jar/META-INF/LICENSE.txt rename to licenses/commons-lang3-3.17.0.jar/META-INF/LICENSE.txt diff --git a/licenses/commons-lang3-3.16.0.jar/META-INF/NOTICE.txt b/licenses/commons-lang3-3.17.0.jar/META-INF/NOTICE.txt similarity index 100% rename from licenses/commons-lang3-3.16.0.jar/META-INF/NOTICE.txt rename to licenses/commons-lang3-3.17.0.jar/META-INF/NOTICE.txt diff --git a/licenses/licenses.md b/licenses/licenses.md index 9b4cb23a5..eeb51f838 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2024-09-20 08:48:37 EEST_ +_2024-09-20 15:32:31 EEST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.17.2` @@ -18,23 +18,23 @@ _2024-09-20 08:48:37 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.45` +**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.46` > - **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.45` +**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.46` > - **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.45` +**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.46` > - **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.45` +**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.46` > - **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.45` +**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.46` > - **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) @@ -150,12 +150,12 @@ _2024-09-20 08:48:37 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.16.0` +**33** **Group:** `org.apache.commons` **Name:** `commons-lang3` **Version:** `3.17.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.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) +> - **Embedded license files**: [commons-lang3-3.17.0.jar/META-INF/LICENSE.txt](commons-lang3-3.17.0.jar/META-INF/LICENSE.txt) + - [commons-lang3-3.17.0.jar/META-INF/NOTICE.txt](commons-lang3-3.17.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)