From 61918a04c3fda6aa51f9e70a12c593f80fb63e85 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 27 Aug 2021 14:35:43 +0200 Subject: [PATCH] Prepare 1.3.1 patch release (#427) --- CHANGELOG.md | 6 ++++++ README.md | 8 ++++---- .../src/main/kotlin/splunk.java-conventions.gradle.kts | 4 ++-- .../com/splunk/opentelemetry/SplunkConfiguration.java | 2 ++ deployments/cloudfoundry/buildpack/README.md | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00b9dd492..fd258eaf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2. ## Unreleased +## v1.3.1 - 2021-08-27 + +- OpenTelemetry Instrumentation for Java has been updated to version 1.5.2. This fixes + the [memory leak](https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/3962) bug that + manifested on 1.5.0 and 1.5.1 when OpenTelemetry metrics exporter wasn't used. + ## v1.3.0 - 2021-08-23 ### General diff --git a/README.md b/README.md index 8ab899cc4..080f7229b 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 @@ -159,11 +159,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.3.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.3.1 is compatible with: * OpenTelemetry API version 1.5.0 -* OpenTelemetry Instrumentation for Java version 1.5.0 +* OpenTelemetry Instrumentation for Java version 1.5.2 * Micrometer version 1.7.3 ## 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 fbf2ecc0d..0734d7187 100644 --- a/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts @@ -15,8 +15,8 @@ repositories { val otelVersion = "1.5.0" val otelAlphaVersion = "1.5.0-alpha" -val otelInstrumentationVersion = "1.5.0" -val otelInstrumentationAlphaVersion = "1.5.0-alpha" +val otelInstrumentationVersion = "1.5.2" +val otelInstrumentationAlphaVersion = "1.5.2-alpha" val micrometerVersion = "1.7.3"; // dependencyManagement can't into classifiers, we have to pass version the old way for deps with qualifiers diff --git a/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java b/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java index b0126b31c..388a2032f 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java +++ b/custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java @@ -34,6 +34,8 @@ public Map getProperties() { config.put("otel.metrics.exporter", "none"); // disable otel runtime-metrics instrumentation; we use micrometer metrics instead config.put("otel.instrumentation.runtime-metrics.enabled", "false"); + // just in case disable oshi metrics too + config.put("otel.instrumentation.oshi.enabled", "false"); // http://localhost:9080/v1/trace is the default endpoint for SmartAgent // http://localhost:14268/api/traces is the default endpoint for otel-collector diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index 7fc9c6a04..1e91993e3 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.3.0 +$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.3.1 ``` By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.