From cd49c83bad99d19385c96947e23a24ed14415dc6 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 18 Sep 2024 12:58:36 +0300 Subject: [PATCH] Prepare release 2.8.0 (#2042) * Prepare release 2.8.0 * update contrib version * update release date --- CHANGELOG.md | 5 +++++ README.md | 15 +++++---------- dependencyManagement/build.gradle.kts | 4 ++-- deployments/cloudfoundry/buildpack/README.md | 2 +- licenses/licenses.md | 8 ++++---- .../opentelemetry/tools/MetadataGenerator.java | 14 ++++++++++++++ version.gradle.kts | 2 +- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b48910ed..d1f4a3e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased +## v2.8.0 - 2024-09-18 + +- OpenTelemetry Java SDK has been updated to version 1.42.1. +- OpenTelemetry Instrumentation for Java has been updated to version 2.8.0. + ## v2.7.0 - 2024-08-22 - OpenTelemetry Java SDK has been updated to version 1.41.0. diff --git a/README.md b/README.md index b3059af02..a17b63827 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.7.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.7.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.7.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 2.8.0 is compatible with: -* OpenTelemetry API version 1.41.0 -* OpenTelemetry Instrumentation for Java version 2.7.0 +* OpenTelemetry API version 1.42.1 +* OpenTelemetry Instrumentation for Java version 2.8.0 ## Snapshot builds diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 3e3bf4e4b..ef4bfa04d 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -4,9 +4,9 @@ plugins { val otelVersion = "1.42.1" val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") -val otelInstrumentationVersion = "2.8.0-SNAPSHOT" +val otelInstrumentationVersion = "2.8.0" val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1") -val otelContribAlphaVersion = "1.38.0-alpha" +val otelContribAlphaVersion = "1.39.0-alpha" val autoValueVersion = "1.11.0" val dockerJavaVersion = "3.4.0" diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index fd6dbcee8..db0675da2 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.7.0 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.8.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 e285cbb65..99cb2c184 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2024-09-12 18:34:06 EEST_ +_2024-09-18 12:43:15 EEST_ ## Apache License, Version 2.0 **1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0` @@ -69,15 +69,15 @@ _2024-09-12 18:34:06 EEST_ > - **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.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.38.0-alpha` +**17** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.39.0-alpha` > - **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.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.38.0-alpha` +**18** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.39.0-alpha` > - **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) -**19** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.8.0-alpha-SNAPSHOT` +**19** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.8.0-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 a06817d44..497e1b0d0 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 @@ -1961,6 +1961,18 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int SettingType.BOOLEAN, SettingCategory.INSTRUMENTATION)); + // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/powerjob-4.0/README.md + /* + | `otel.instrumentation.powerjob.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. | + */ + settings.add( + setting( + "otel.instrumentation.powerjob.experimental-span-attributes", + "Enable the capture of experimental span attributes.", + "false", + SettingType.BOOLEAN, + SettingCategory.INSTRUMENTATION)); + // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/pulsar/pulsar-2.8/README.md /* | `otel.instrumentation.pulsar.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. | @@ -3381,6 +3393,8 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int .component("Play WS", "1.0 and higher") .httpClientMetrics() .build()); + instrumentations.add( + instrumentation("powerjob").component("PowerJob", "4.0 and higher").build()); instrumentations.add( instrumentation("quarkus-resteasy-reactive") .component("Quarkus Resteasy Reactive", "2.16.7 and higher") diff --git a/version.gradle.kts b/version.gradle.kts index a503dcad5..3e9ca8d4c 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.8.0-SNAPSHOT" +val distroVersion = "2.8.0" allprojects { version = distroVersion