diff --git a/CHANGELOG.md b/CHANGELOG.md index cf93593f1..1351dff10 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 9d0273131..553af9b6e 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 @@ -157,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.15.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.16.0 is compatible with: -* OpenTelemetry API version 1.17.0 -* OpenTelemetry Instrumentation for Java version 1.17.0 +* OpenTelemetry API version 1.18.0 +* OpenTelemetry Instrumentation for Java version 1.18.0 * Micrometer version 1.9.4 ## 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 b64ef80c2..dbb602111 100644 --- a/buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts +++ b/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("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("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("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") } } diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index 530ba96cb..835623572 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.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. diff --git a/scripts/pre-release-changes.sh b/scripts/pre-release-changes.sh index f024e1698..ec2d1f494 100755 --- a/scripts/pre-release-changes.sh +++ b/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='' diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index 20d0e18a3..524120b6a 100644 --- a/smoke-tests/build.gradle.kts +++ b/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")