From 1f76cf178c503b0b34fe4549a3639807a0065425 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 19 Feb 2025 13:37:15 +0200 Subject: [PATCH] Prepare release 2.13.0 (#2191) --- CHANGELOG.md | 7 +++++++ README.md | 15 +++++---------- dependencyManagement/build.gradle.kts | 2 +- deployments/cloudfoundry/buildpack/README.md | 2 +- licenses/licenses.md | 4 ++-- .../opentelemetry/tools/MetadataGenerator.java | 5 +++++ version.gradle.kts | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e311b7a7..33015e2c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased +## v2.13.0 - 2025-02-19 + +### General + +- OpenTelemetry Java SDK has been updated to version 1.47.0. +- OpenTelemetry Instrumentation for Java has been updated to version 2.13.1. + ## v2.12.0 - 2025-01-22 ### General diff --git a/README.md b/README.md index dbaf184c3..fd000ab9c 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ Existing customers should consider migrating to version 2.5.0 or higher. To lear

Stable - - OpenTelemetry Instrumentation for Java Version + + OpenTelemetry Instrumentation for Java Version Splunk GDI specification @@ -86,11 +86,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 ([v2.12.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.12.0/README.md). - ---- - ## Requirements @@ -122,11 +117,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 2.12.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 2.13.0 is compatible with: -* OpenTelemetry API version 1.46.0 -* OpenTelemetry Instrumentation for Java version 2.12.0 +* OpenTelemetry API version 1.47.0 +* OpenTelemetry Instrumentation for Java version 2.13.1 ## Snapshot builds diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 49dc4848a..d0a134d34 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -4,7 +4,7 @@ plugins { val otelVersion = "1.47.0" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") -val otelInstrumentationVersion = "2.13.0-SNAPSHOT" +val otelInstrumentationVersion = "2.13.1" val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") val otelContribAlphaVersion = "1.43.0-alpha" diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index 04cf0ac65..02b59da83 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 2.12.0 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.13.0 ``` 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 a75c60a6f..a87ea32c7 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2025-02-13 13:43:41 EET_ +_2025-02-19 09:12:57 EET_ ## Apache License, Version 2.0 **1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0` @@ -73,7 +73,7 @@ _2025-02-13 13:43:41 EET_ > - **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) -**18** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.13.0-alpha-SNAPSHOT` +**18** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.13.1-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) diff --git a/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java b/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java index 209ddf3a5..eaee28150 100644 --- a/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java +++ b/metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java @@ -3250,6 +3250,11 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int .component("Java HTTP Client", null) .httpClientMetrics() .build()); + instrumentations.add( + instrumentation("java-http-server") + .component("Java HTTP Server", null) + .httpServerMetrics() + .build()); instrumentations.add( instrumentation("java-util-logging").component("java.util.logging", null).build()); instrumentations.add( diff --git a/version.gradle.kts b/version.gradle.kts index 9643b8cc8..ac5e2ac8e 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 = "2.13.0-SNAPSHOT" +val distroVersion = "2.13.0" allprojects { version = distroVersion