From 938c4a1c20036ed4828f26af6a5853f6e7353d51 Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 16 Jul 2024 21:57:25 +0000 Subject: [PATCH 1/2] Update version to 2.7.0-SNAPSHOT --- CHANGELOG.md | 2 ++ examples/distro/build.gradle | 6 +++--- examples/extension/build.gradle | 8 ++++---- version.gradle.kts | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcc54c8d2eed..a1bfaaf7290e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## Version 2.6.0 (2024-07-16) + The Spring Boot Starter (`opentelemetry-spring-boot-starter`) is now stable. ### Migration notes diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index f56d46007dbf..007d5a6a1f03 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.7.0-alpha-SNAPSHOT" } } @@ -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.7.0-SNAPSHOT", + opentelemetryJavaagentAlpha: "2.7.0-alpha-SNAPSHOT", autoservice : "1.1.1", junit : "5.10.3" diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 6af5177849be..21836bb25b34 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.7.0-alpha-SNAPSHOT" + id "io.opentelemetry.instrumentation.muzzle-check" version "2.7.0-alpha-SNAPSHOT" } 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.7.0-SNAPSHOT", + opentelemetryJavaagentAlpha: "2.7.0-alpha-SNAPSHOT", junit : "5.10.3" ] diff --git a/version.gradle.kts b/version.gradle.kts index 697e4d8fd978..50f3cd2a28d4 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.7.0-SNAPSHOT" +val alphaVersion = "2.7.0-alpha-SNAPSHOT" allprojects { if (findProperty("otel.stable") != "true") { From 8a6a5978a980fedc183cf7a42ee9a4eeecf4bd40 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 16 Jul 2024 16:15:42 -0700 Subject: [PATCH 2/2] update api diff --- .../opentelemetry-instrumentation-annotations.txt | 2 +- .../current_vs_latest/opentelemetry-instrumentation-api.txt | 2 +- .../opentelemetry-spring-boot-autoconfigure.txt | 2 +- .../current_vs_latest/opentelemetry-spring-boot-starter.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt index a326f57f6bd0..30fcdad18fc6 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.7.0-SNAPSHOT.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..bd8a83882071 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.7.0-SNAPSHOT.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..6571939e3aff 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.7.0-SNAPSHOT.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..fbd4427818ca 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.7.0-SNAPSHOT.jar against No changes. \ No newline at end of file