diff --git a/CHANGELOG.md b/CHANGELOG.md index dcc54c8d2eed..7d010b23f931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## Version 2.6.0 (2024-07-16) The Spring Boot Starter (`opentelemetry-spring-boot-starter`) is now stable. diff --git a/README.md b/README.md index de340608d79a..425400860d42 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ If you are looking for documentation on using those. ## Getting Started Download -the [latest version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar). +the [latest version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.6.0/opentelemetry-javaagent.jar). This package includes the instrumentation agent as well as instrumentations for all supported libraries and all available data exporters. diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt index a326f57f6bd0..c1a2bd1fa614 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-instrumentation-annotations-2.6.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.5.0.jar +Comparing source compatibility of opentelemetry-instrumentation-annotations-2.6.0.jar against opentelemetry-instrumentation-annotations-2.5.0.jar No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt index a9e34766a6b6..0e6864e41611 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-instrumentation-api-2.6.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.5.0.jar +Comparing source compatibility of opentelemetry-instrumentation-api-2.6.0.jar against opentelemetry-instrumentation-api-2.5.0.jar No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt index bcf2e362e34e..59364a158b26 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt @@ -1,4 +1,4 @@ -Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.6.0-SNAPSHOT.jar against +Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.6.0.jar against +++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable) +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. +++ NEW SUPERCLASS: java.lang.Object diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt index 587bf3b27164..0c8b94082edf 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-spring-boot-starter-2.6.0-SNAPSHOT.jar against +Comparing source compatibility of opentelemetry-spring-boot-starter-2.6.0.jar against No changes. \ No newline at end of file diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index f56d46007dbf..b6e34a44f4d9 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -14,7 +14,7 @@ buildscript { dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" classpath "com.github.johnrengelman:shadow:8.1.1" - classpath "io.opentelemetry.instrumentation:gradle-plugins:2.6.0-alpha-SNAPSHOT" + classpath "io.opentelemetry.instrumentation:gradle-plugins:2.6.0-alpha" } } @@ -30,8 +30,8 @@ subprojects { opentelemetrySdk : "1.40.0", // these lines are managed by .github/scripts/update-version.sh - opentelemetryJavaagent : "2.6.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "2.6.0-alpha-SNAPSHOT", + opentelemetryJavaagent : "2.6.0", + opentelemetryJavaagentAlpha: "2.6.0-alpha", autoservice : "1.1.1", junit : "5.10.3" diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 6af5177849be..8ef5028115ac 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -13,8 +13,8 @@ plugins { id "com.github.johnrengelman.shadow" version "8.1.1" id "com.diffplug.spotless" version "6.25.0" - id "io.opentelemetry.instrumentation.muzzle-generation" version "2.6.0-alpha-SNAPSHOT" - id "io.opentelemetry.instrumentation.muzzle-check" version "2.6.0-alpha-SNAPSHOT" + id "io.opentelemetry.instrumentation.muzzle-generation" version "2.6.0-alpha" + id "io.opentelemetry.instrumentation.muzzle-check" version "2.6.0-alpha" } group 'io.opentelemetry.example' @@ -26,8 +26,8 @@ ext { opentelemetrySdk : "1.40.0", // these lines are managed by .github/scripts/update-version.sh - opentelemetryJavaagent : "2.6.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "2.6.0-alpha-SNAPSHOT", + opentelemetryJavaagent : "2.6.0", + opentelemetryJavaagentAlpha: "2.6.0-alpha", junit : "5.10.3" ] diff --git a/version.gradle.kts b/version.gradle.kts index 697e4d8fd978..e3ac7453c096 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -1,5 +1,5 @@ -val stableVersion = "2.6.0-SNAPSHOT" -val alphaVersion = "2.6.0-alpha-SNAPSHOT" +val stableVersion = "2.6.0" +val alphaVersion = "2.6.0-alpha" allprojects { if (findProperty("otel.stable") != "true") {