From 0937c5ff9f56552aceb9c2af60a6e0c887d39f55 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Tue, 26 May 2026 12:01:16 -0700 Subject: [PATCH] Improve Dependabot grouping for OpenTelemetry version variables - Introduce explicit alpha-version variables for OTel SDK and contrib versions instead of using `${...}-alpha` interpolation in dependency declarations - Update OTel BOM and contrib dependency entries to use the new explicit alpha vars - Expand Dependabot `opentelemetry` group patterns to include the new alpha vars and concrete contrib artifacts This makes OTel dependency versioning clearer for humans and easier for Dependabot to detect and group consistently. --- .github/dependabot.yml | 4 ++++ dependencyManagement/build.gradle.kts | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 313482a297..867b901887 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -46,15 +46,19 @@ updates: opentelemetry: patterns: - "otelSdkVersion" + - "otelSdkAlphaVersion" - "otelInstrumentationVersion" - "otelInstrumentationAlphaVersion" - "otelContribVersion" + - "otelContribAlphaVersion" - "io.opentelemetry:opentelemetry-bom" - "io.opentelemetry:opentelemetry-bom-alpha" - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha" - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator" - "io.opentelemetry.instrumentation:gradle-plugins" + - "io.opentelemetry.contrib:opentelemetry-jfr-connection" + - "io.opentelemetry.contrib:opentelemetry-runtime-attach-core" opentelemetry-semconv: patterns: diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 474b2bf992..36c26dd4ab 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -8,9 +8,11 @@ val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions val otelSdkVersion = "1.61.0" +val otelSdkAlphaVersion = "1.61.0-alpha" val otelInstrumentationAlphaVersion = "2.27.0-alpha" val otelInstrumentationVersion = "2.27.0" val otelContribVersion = "1.56.0" +val otelContribAlphaVersion = "1.56.0-alpha" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion @@ -18,7 +20,7 @@ rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaV val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.21.2", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", - "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkVersion}-alpha", + "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationAlphaVersion}", "com.azure:azure-sdk-bom:1.3.6", @@ -67,8 +69,8 @@ val DEPENDENCIES = listOf( "com.azure:azure-core-test:1.26.2", // this is not included in azure-sdk-bom "org.assertj:assertj-core:3.27.7", "org.awaitility:awaitility:4.3.0", - "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribVersion}-alpha", - "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribVersion}-alpha", + "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribAlphaVersion}", + "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribAlphaVersion}", "com.google.code.findbugs:jsr305:3.0.2", "com.github.spotbugs:spotbugs-annotations:4.9.8" )