diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aa174c55..86b806fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,17 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased -- tbd +## v1.29.0 - 2023-10-13 + +### General + +- OpenTelemetry Java SDK has been updated to version 1.31.0. +- OpenTelemetry Instrumentation for Java has been updated to version 1.31.0. +- Micrometer dependency has been updated to version 1.11.5. + +### 🛠️ Bug fixes + +- Silence profiler warnings on JDK 21 (#1470) ## v1.28.0 - 2023-09-15 diff --git a/README.md b/README.md index 998337f3f..9a666f8b4 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 @@ -73,11 +73,6 @@ see [Migrate from the SignalFx Java Agent](https://quickdraw.splunk.com/redirect - -The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v1.28.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.28.0/README.md). - ---- - ## Requirements @@ -109,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.28.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.29.0 is compatible with: -* OpenTelemetry API version 1.30.1 -* OpenTelemetry Instrumentation for Java version 1.30.0 +* OpenTelemetry API version 1.31.0 +* OpenTelemetry Instrumentation for Java version 1.31.0 * Micrometer version 1.11.0 ## Snapshot builds diff --git a/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts index b9cce0014..fc0237c4b 100644 --- a/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts @@ -5,6 +5,11 @@ plugins { repositories { mavenCentral() maven { + name = "sonatypeReleases" + url = uri("https://oss.sonatype.org/content/repositories/releases/") + } + maven { + name = "sonatypeSnapshots" url = uri("https://oss.sonatype.org/content/repositories/snapshots") } } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index edb23c7e5..4b5df35aa 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,9 +2,9 @@ plugins { `java-platform` } -val otelVersion = "1.30.1" +val otelVersion = "1.31.0" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") -val otelInstrumentationVersion = "1.30.0" +val otelInstrumentationVersion = "1.31.0" val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") val otelContribAlphaVersion = "1.30.0-alpha" @@ -43,7 +43,7 @@ dependencies { api("com.google.auto.service:auto-service:1.1.1") api("org.assertj:assertj-core:3.24.2") api("org.awaitility:awaitility:4.2.0") - api("com.signalfx.public:signalfx-metrics:1.0.35") + api("com.signalfx.public:signalfx-metrics:1.0.36") api("com.github.docker-java:docker-java-core:$dockerJavaVersion") api("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion") diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index cab4e96e5..ea5535879 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.28.0 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.29.0 ``` By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used. diff --git a/instrumentation/khttp-0.1/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpSingletons.java b/instrumentation/khttp-0.1/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpSingletons.java index a600a1d47..b7dfca662 100644 --- a/instrumentation/khttp-0.1/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpSingletons.java +++ b/instrumentation/khttp-0.1/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpSingletons.java @@ -49,7 +49,7 @@ public final class KHttpSingletons { .build()) .addAttributesExtractor( PeerServiceAttributesExtractor.create( - httpAttributesGetter, CommonConfig.get().getPeerServiceMapping())) + httpAttributesGetter, CommonConfig.get().getPeerServiceResolver())) .addOperationMetrics(HttpClientMetrics.get()) .buildClientInstrumenter(KHttpHttpHeaderSetter.INSTANCE); } diff --git a/licenses/licenses.md b/licenses/licenses.md index a3e9be206..5477d9608 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2023-10-10 18:56:45 EEST_ +_2023-10-13 10:15:49 CEST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.2` @@ -18,23 +18,23 @@ _2023-10-10 18:56:45 EEST_ > - **Embedded license files**: [jackson-jr-objects-2.15.2.jar/META-INF/LICENSE](jackson-jr-objects-2.15.2.jar/META-INF/LICENSE) - [jackson-jr-objects-2.15.2.jar/META-INF/NOTICE](jackson-jr-objects-2.15.2.jar/META-INF/NOTICE) -**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.35` +**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.36` > - **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.35` +**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.36` > - **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.35` +**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.36` > - **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.35` +**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.36` > - **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.35` +**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.36` > - **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,59 +82,59 @@ _2023-10-10 18:56:45 EEST_ > - **Embedded license files**: [micrometer-registry-signalfx-1.11.5.jar/META-INF/LICENSE](micrometer-registry-signalfx-1.11.5.jar/META-INF/LICENSE) - [micrometer-registry-signalfx-1.11.5.jar/META-INF/NOTICE](micrometer-registry-signalfx-1.11.5.jar/META-INF/NOTICE) -**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.30.1` +**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.31.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-events` **Version:** `1.30.1-alpha` +**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.31.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.30.1` +**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.31.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.30.1` +**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.31.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.30.1` +**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.31.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.30.1` +**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.31.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.30.1` +**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.31.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-extension-incubator` **Version:** `1.30.1-alpha` +**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.31.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) -**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.30.1` +**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.31.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-common` **Version:** `1.30.1` +**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.31.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-extension-autoconfigure-spi` **Version:** `1.30.1` +**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.31.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-logs` **Version:** `1.30.1` +**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.31.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-metrics` **Version:** `1.30.1` +**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.31.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) -**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.30.1` +**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.31.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) @@ -276,6 +276,6 @@ _2023-10-10 18:56:45 EEST_ ## Unknown -**54** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.30.0-alpha` +**54** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.31.0-alpha` diff --git a/version.gradle.kts b/version.gradle.kts index eb8f11d0e..103402208 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.29.0-SNAPSHOT" +val distroVersion = "1.29.0" allprojects { version = distroVersion