Prepare 1.3.1 patch release (#427)

signalfx · Aug 27, 2021 · 61918a0 · 61918a0
1 parent 7e3a6c3
commit 61918a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -12,8 +12,8 @@
 
 <p align="center">
   <img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
-  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.5.0">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.5.0-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.5.2">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.5.2-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.0.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.0.0-blueviolet?style=for-the-badge">
@@ -159,11 +159,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
 you have to use a compatible API version.
 
 <!-- IMPORTANT: do not change comments or break those lines below -->
-The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.3.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.3.1<!--SPLUNK_VERSION--> is compatible
 with:
 
 * OpenTelemetry API version <!--OTEL_VERSION-->1.5.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.5.0<!--OTEL_INSTRUMENTATION_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.5.2<!--OTEL_INSTRUMENTATION_VERSION-->
 * 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
@@ -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
@@ -34,6 +34,8 @@ public Map<String, String> 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
@@ -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.