From 5ecbc055f9d0d3535ebfdbe6ffe89e22eb80f396 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 16 Dec 2022 11:59:14 +0100 Subject: [PATCH] Prepare for 1.19 (#1036) --- CHANGELOG.md | 7 ++++++- README.md | 19 +++++++----------- .../kotlin/splunk.java-conventions.gradle.kts | 20 +++++++++---------- deployments/cloudfoundry/buildpack/README.md | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66d556df3..c95d6a5b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,13 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased -- Micrometer dependency has been updated to version 1.10.2. (#1018) +## v1.19.0 - 2022-12-16 + +### General +- OpenTelemetry Java SDK and OpenTelemetry Instrumentation for Java dependencies have been updated to version 1.21.0. (#1029) +- Micrometer dependency has been updated to version 1.10.2. (#1018) +- Comply with [GDI spec version 1.4.0](https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0) ## v1.18.0 - 2022-11-23 diff --git a/README.md b/README.md index c86249063..cc5a9f4b7 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,11 @@

Stable - - OpenTelemetry Instrumentation for Java Version + + OpenTelemetry Instrumentation for Java Version - - Splunk GDI specification + + Splunk GDI specification GitHub release (latest SemVer) @@ -75,11 +75,6 @@ see [Migrate from the SignalFx Java Agent](https://docs.splunk.com/Observability - -The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v1.18.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.18.0/README.md). - ---- - ## Requirements @@ -162,11 +157,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.18.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.19.0 is compatible with: -* OpenTelemetry API version 1.18.0 -* OpenTelemetry Instrumentation for Java version 1.18.0 +* OpenTelemetry API version 1.21.0 +* OpenTelemetry Instrumentation for Java version 1.21.0 * Micrometer version 1.10.2 ## 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 36d2738b2..c98d8ca6b 100644 --- a/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts @@ -15,7 +15,7 @@ repositories { val otelVersion = "1.21.0" val otelAlphaVersion = "1.21.0-alpha" -val otelContribAlphaVersion = "1.20.1-alpha" +val otelContribAlphaVersion = "1.21.0-alpha" val otelInstrumentationVersion = "1.21.0" val otelInstrumentationAlphaVersion = "1.21.0-alpha" val micrometerVersion = "1.10.2" @@ -29,21 +29,21 @@ extensions.configure("dependencyManagement") { dependency("org.assertj:assertj-core:3.23.1") dependency("org.awaitility:awaitility:4.2.0") dependency("io.jaegertracing:jaeger-client:1.8.1") - dependency("com.signalfx.public:signalfx-java:1.0.26") + dependency("com.signalfx.public:signalfx-java:1.0.27") dependencySet("com.github.docker-java:3.2.11") { entry("docker-java-core") entry("docker-java-transport-httpclient5") } - dependencySet("org.mockito:4.7.0") { + dependencySet("org.mockito:4.9.0") { entry("mockito-core") entry("mockito-junit-jupiter") } - dependencySet("org.slf4j:1.7.36") { + dependencySet("org.slf4j:2.0.6") { entry("slf4j-api") entry("slf4j-simple") } - dependencySet("com.google.auto.value:1.9") { + dependencySet("com.google.auto.value:1.10.1") { entry("auto-value") entry("auto-value-annotations") } @@ -83,14 +83,14 @@ extensions.configure("dependencyManagement") { imports { mavenBom("com.fasterxml.jackson:jackson-bom:2.14.1") - mavenBom("com.google.protobuf:protobuf-bom:3.21.9") + mavenBom("com.google.protobuf:protobuf-bom:3.21.12") mavenBom("com.squareup.okhttp3:okhttp-bom:4.10.0") - mavenBom("io.grpc:grpc-bom:1.49.0") + mavenBom("io.grpc:grpc-bom:1.51.0") mavenBom("io.micrometer:micrometer-bom:$micrometerVersion") mavenBom("io.opentelemetry:opentelemetry-bom-alpha:$otelAlphaVersion") mavenBom("io.opentelemetry:opentelemetry-bom:$otelVersion") - mavenBom("org.junit:junit-bom:5.9.0") - mavenBom("org.testcontainers:testcontainers-bom:1.17.3") + mavenBom("org.junit:junit-bom:5.9.1") + mavenBom("org.testcontainers:testcontainers-bom:1.17.6") } } @@ -102,7 +102,7 @@ dependencies { add("testImplementation", "org.junit.jupiter:junit-jupiter-api") add("testImplementation", "org.junit.jupiter:junit-jupiter-params") add("testRuntimeOnly", "org.junit.jupiter:junit-jupiter-engine") - add("testRuntimeOnly", "org.slf4j:slf4j-api:2.0.3") + add("testRuntimeOnly", "org.slf4j:slf4j-api:2.0.6") } tasks.withType().configureEach { diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index b946bc669..145af095e 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.18.0 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.19.0 ``` By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.