From 4c22b8bbd58ec3871d1c116a801a18a4295bbc7c Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:37:35 -0500 Subject: [PATCH] [release/v1.38.x] Fix incorrect SDK version included in release notes (#1428) Co-authored-by: Trask Stalnaker --- .github/workflows/release.yml | 5 ++++- dependencyManagement/build.gradle.kts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fd092048..bca59cfb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,10 +132,13 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + instrumentation_version=$(grep -Po "val otelInstrumentationVersion = \"\K[0-9]+.[0-9]+.[0-9]+" dependencyManagement/build.gradle.kts) + # conditional blocks not indented because of the heredoc if [[ $VERSION == *.0 ]]; then cat > /tmp/release-notes.txt << EOF - This release targets the OpenTelemetry SDK $VERSION. + This release targets the OpenTelemetry Java Instrumentation + [$instrumentation_version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v$instrumentation_version). EOF else diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 9e033f06a..d857c9c20 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,13 +7,15 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions +val otelInstrumentationVersion = "2.7.0-alpha" + val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.17.2", "com.google.guava:guava-bom:33.3.0-jre", "com.linecorp.armeria:armeria-bom:1.30.0", "org.junit:junit-bom:5.11.0", "io.grpc:grpc-bom:1.66.0", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.7.0-alpha", + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", "org.testcontainers:testcontainers-bom:1.20.1" )