v1.4.0 pre-release changes (#453)

Author: Mateusz Rzeszutek

CHANGELOG.md

@@ -8,6 +8,13 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v1.4.0 - 2021-09-20
+
+### General
+
+- OpenTelemetry Java SDK and OpenTelemetry Instrumentation for Java dependencies have been updated to version 1.6.0.
+- Micrometer dependency was updated to version 1.7.4.
+
 ## v1.3.1 - 2021-08-27
 
 - OpenTelemetry Instrumentation for Java has been updated to version 1.5.2. This fixes

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.2">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.5.2-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.6.0">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.6.0-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">
@@ -78,11 +78,6 @@ see [Migrate from the SignalFx Java Agent](https://docs.splunk.com/Observability
 
 <!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
 <!--DEV_DOCS_WARNING-->
-<!--DEV_DOCS_WARNING_START-->
-The documentation below refers to the in development version of this package. Docs for the latest version ([v1.3.1](https://github.com/signalfx/splunk-otel-java/releases/tag/v1.3.1)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.3.1/README.md).
-
----
-<!--DEV_DOCS_WARNING_END-->
 
 ## Requirements
 
@@ -163,12 +158,12 @@ 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.1<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.4.0<!--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.2<!--OTEL_INSTRUMENTATION_VERSION-->
-* Micrometer version 1.7.3
+* OpenTelemetry API version <!--OTEL_VERSION-->1.6.0<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.6.0<!--OTEL_INSTRUMENTATION_VERSION-->
+* Micrometer version 1.7.4
 
 ## Snapshot builds
 

buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts

@@ -15,9 +15,9 @@ repositories {
 
 val otelVersion = "1.6.0"
 val otelAlphaVersion = "1.6.0-alpha"
-val otelInstrumentationVersion = "1.6.0-SNAPSHOT"
-val otelInstrumentationAlphaVersion = "1.6.0-alpha-SNAPSHOT"
-val micrometerVersion = "1.7.3";
+val otelInstrumentationVersion = "1.6.0"
+val otelInstrumentationAlphaVersion = "1.6.0-alpha"
+val micrometerVersion = "1.7.4"
 
 // dependencyManagement can't into classifiers, we have to pass version the old way for deps with qualifiers
 extra["otelInstrumentationVersion"] = otelInstrumentationVersion

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.1
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.4.0
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.