Prepare for the 1.16.0 release (#918)

CHANGELOG.md

@@ -8,6 +8,18 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v1.16.0 - 2022-09-15
+
+### General
+
+- OpenTelemetry Java SDK and OpenTelemetry Instrumentation for Java dependencies have been updated to version 1.18.0.
+- Micrometer dependency has been updated to version 1.9.4.
+
+### Enhancements
+- Implemented automatic service name detection for servlet applications. The agent will now look for
+  the value of the top-level `display-name` tag in the `web.xml` file and use it as
+  the `service.name` resource attribute, in case the user hasn't provided it.
+
 ## v1.15.0 - 2022-08-22
 
 ### General

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.17.0">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.17.0-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.18.0">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.18.0-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.3.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.3.0-blueviolet?style=for-the-badge">
@@ -157,11 +157,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.15.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.16.0<!--SPLUNK_VERSION--> is compatible
 with:
 
-* OpenTelemetry API version <!--OTEL_VERSION-->1.17.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.17.0<!--OTEL_INSTRUMENTATION_VERSION-->
+* OpenTelemetry API version <!--OTEL_VERSION-->1.18.0<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.18.0<!--OTEL_INSTRUMENTATION_VERSION-->
 * Micrometer version 1.9.4
 
 ## Snapshot builds

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

@@ -16,8 +16,8 @@ repositories {
 val otelVersion = "1.18.0"
 val otelAlphaVersion = "1.18.0-alpha"
 val otelContribAlphaVersion = "1.17.0-alpha"
-val otelInstrumentationVersion = "1.18.0-SNAPSHOT"
-val otelInstrumentationAlphaVersion = "1.18.0-alpha-SNAPSHOT"
+val otelInstrumentationVersion = "1.18.0"
+val otelInstrumentationAlphaVersion = "1.18.0-alpha"
 val micrometerVersion = "1.9.4"
 
 // instrumentation version is used to compute Implementation-Version manifest attribute
@@ -29,13 +29,13 @@ extensions.configure<DependencyManagementExtension>("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.21")
+    dependency("com.signalfx.public:signalfx-java:1.0.23")
 
     dependencySet("com.github.docker-java:3.2.11") {
       entry("docker-java-core")
       entry("docker-java-transport-httpclient5")
     }
-    dependencySet("org.mockito:4.6.1") {
+    dependencySet("org.mockito:4.7.0") {
       entry("mockito-core")
       entry("mockito-junit-jupiter")
     }
@@ -50,11 +50,8 @@ extensions.configure<DependencyManagementExtension>("dependencyManagement") {
 
     // otel-java-instrumentation
     dependency("io.opentelemetry.javaagent:opentelemetry-javaagent:$otelInstrumentationVersion")
-    dependencySet("io.opentelemetry.instrumentation:$otelInstrumentationAlphaVersion") {
-      entry("opentelemetry-instrumentation-api")
-      entry("opentelemetry-instrumentation-api-semconv")
-    }
-    dependency("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:$otelInstrumentationAlphaVersion")
+    dependency("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:$otelInstrumentationVersion")
+    dependency("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:$otelInstrumentationAlphaVersion")
     dependencySet("io.opentelemetry.javaagent:$otelInstrumentationAlphaVersion") {
       entry("opentelemetry-agent-for-testing")
       entry("opentelemetry-javaagent-bootstrap")
@@ -77,17 +74,18 @@ extensions.configure<DependencyManagementExtension>("dependencyManagement") {
       entry("opentelemetry-samplers")
     }
 
-    dependency("io.opentelemetry.proto:opentelemetry-proto:0.18.0-alpha")
+    dependency("io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha")
   }
 
   imports {
-    mavenBom("com.google.protobuf:protobuf-bom:3.21.2")
+    mavenBom("com.fasterxml.jackson:jackson-bom:2.13.4")
+    mavenBom("com.google.protobuf:protobuf-bom:3.21.5")
     mavenBom("com.squareup.okhttp3:okhttp-bom:4.10.0")
-    mavenBom("io.grpc:grpc-bom:1.47.0")
+    mavenBom("io.grpc:grpc-bom:1.49.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.8.2")
+    mavenBom("org.junit:junit-bom:5.9.0")
     mavenBom("org.testcontainers:testcontainers-bom:1.17.3")
   }
 }

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

scripts/pre-release-changes.sh

@@ -3,6 +3,9 @@
 set -e
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+source "${SCRIPT_DIR}/common.sh"
+
 ROOT_DIR="${SCRIPT_DIR}/../"
 cd ${ROOT_DIR}
 
@@ -28,8 +31,8 @@ splunk_old_version=$1
 splunk_new_version=$2
 shift 2
 
-validate_version "$splunk_current_version"
-validate_version "$splunk_next_version"
+validate_version "$splunk_old_version"
+validate_version "$splunk_new_version"
 
 bump_otel_instrumentation_version=0
 otel_instrumentation_old_version=''

smoke-tests/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
 
   testImplementation(project(":profiler"))
   testImplementation("org.testcontainers:testcontainers")
-  testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.4")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind")
   testImplementation("com.google.protobuf:protobuf-java-util")
   testImplementation("com.squareup.okhttp3:okhttp")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto")