Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release 1.32.5 #2053

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Prepare release 1.32.5 #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2179741
Prepare release 1.32.5
laurit Sep 20, 2024
d8aa51b
update signalfx-metrics version
laurit Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
you have to use a compatible API version.

<!-- IMPORTANT: do not change comments or break those lines below -->
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.32.4<!--SPLUNK_VERSION--> is compatible
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.32.5<!--SPLUNK_VERSION--> is compatible
with:

* OpenTelemetry API version <!--OTEL_VERSION-->1.41.0<!--OTEL_VERSION-->
Expand Down
4 changes: 2 additions & 2 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion deployments/cloudfoundry/buildpack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 ...ons-lang3-3.16.0.jar/META-INF/LICENSE.txt → ...ons-lang3-3.17.0.jar/META-INF/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...mons-lang3-3.16.0.jar/META-INF/NOTICE.txt → ...mons-lang3-3.17.0.jar/META-INF/NOTICE.txt
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions licenses/licenses.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# splunk-otel-javaagent
## Dependency License Report
_2024-09-09 14:50:05 PDT_
_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`
Expand All @@ -18,23 +18,23 @@ _2024-09-09 14:50:05 PDT_
> - **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)

Expand Down Expand Up @@ -150,12 +150,12 @@ _2024-09-09 14:50:05 PDT_
> - **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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion version.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down