diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6800257b..f59d50e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,12 @@ jobs: else prior_version="$major.$minor.$((patch - 1))" fi - inst_version=$(grep ^opentelemetry-alpha gradle/libs.versions.toml | sed -E "s/^.*\"(.*)\"/\1/") + # otel instrumentation version comes in through alpha bom +# inst_version=$(grep ^opentelemetry-alpha gradle/libs.versions.toml | sed -E "s/^.*\"(.*)\"/\1/") + inst_version=$(./gradlew --console=plain android-agent:dependencies | \ + grep 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom ' | \ + sed -e "s/.* -> //" | sed -e "s/ .*//" | \ + sort | head -1) # otel-java core libs are transient deps thru instrumentation boms sdk_version=$(./gradlew --console=plain android-agent:dependencies | \ grep 'io.opentelemetry:opentelemetry-api ' | \ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed143900..8b14e892 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -opentelemetry-instrumentation = "2.9.0" opentelemetry-instrumentation-alpha = "2.9.0-alpha" +#opentelemetry-instrumentation = "2.9.0" // alpha bom includes non-alpha bom opentelemetry-semconv = "1.25.0-alpha" opentelemetry-contrib = "1.40.0-alpha" mockito = "5.14.2" @@ -14,8 +14,8 @@ junitKtx = "1.2.1" autoService = "1.1.1" [libraries] -opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom", version.ref = "opentelemetry-instrumentation" } opentelemetry-platform-alpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-instrumentation-alpha" } +opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" } androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7" androidx-core = "androidx.core:core:1.13.1" androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.8.6" diff --git a/instrumentation/startup/build.gradle.kts b/instrumentation/startup/build.gradle.kts index 0e820536..fd802a2f 100644 --- a/instrumentation/startup/build.gradle.kts +++ b/instrumentation/startup/build.gradle.kts @@ -14,7 +14,6 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core"))