From 6f2ec14beb03ed7d684642df483dd1741338e536 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 22 Oct 2024 14:37:11 -0700 Subject: [PATCH 1/3] leverage boms for transient core deps --- .github/workflows/release.yml | 6 +++++- gradle/libs.versions.toml | 11 +++++------ instrumentation/startup/build.gradle.kts | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9ede1e67..6800257b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,11 @@ jobs: prior_version="$major.$minor.$((patch - 1))" fi inst_version=$(grep ^opentelemetry-alpha gradle/libs.versions.toml | sed -E "s/^.*\"(.*)\"/\1/") - sdk_version=$(cat gradle/libs.versions.toml | grep "^opentelemetry =" | sed -E "s/^.*\"(.*)\"/\1/") + # otel-java core libs are transient deps thru instrumentation boms + sdk_version=$(./gradlew --console=plain android-agent:dependencies | \ + grep 'io.opentelemetry:opentelemetry-api ' | \ + sed -e "s/.* -> //" | sed -e "s/ .*//" | \ + sort | head -1) echo "VERSION=$version" >> $GITHUB_ENV echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1ef17f65..ed1439004 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,4 @@ [versions] -opentelemetry = "1.43.0" -opentelemetry-alpha = "1.43.0-alpha" opentelemetry-instrumentation = "2.9.0" opentelemetry-instrumentation-alpha = "2.9.0-alpha" opentelemetry-semconv = "1.25.0-alpha" @@ -17,6 +15,7 @@ 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" } 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" @@ -30,18 +29,18 @@ opentelemetry-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semco opentelemetry-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "opentelemetry-semconv" } opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api" } opentelemetry-api-incubator = { module = "io.opentelemetry:opentelemetry-api-incubator" } -opentelemetry-sdk-extension-incubator = { module = "io.opentelemetry:opentelemetry-sdk-extension-incubator", version.ref = "opentelemetry-alpha" } +opentelemetry-sdk-extension-incubator = { module = "io.opentelemetry:opentelemetry-sdk-extension-incubator" } opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk" } -opentelemetry-context = { module = "io.opentelemetry:opentelemetry-context", version.ref = "opentelemetry" } +opentelemetry-context = { module = "io.opentelemetry:opentelemetry-context" } opentelemetry-exporter-logging = { module = "io.opentelemetry:opentelemetry-exporter-logging" } opentelemetry-diskBuffering = { module = "io.opentelemetry.contrib:opentelemetry-disk-buffering", version.ref = "opentelemetry-contrib" } -opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "opentelemetry" } +opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp" } volley = "com.android.volley:volley:1.2.1" auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" } auto-service-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } #Test tools -opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" } +opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing" } androidx-test-core = "androidx.test:core:1.6.1" androidx-test-rules = "androidx.test:rules:1.6.1" androidx-test-runner = "androidx.test:runner:1.6.2" diff --git a/instrumentation/startup/build.gradle.kts b/instrumentation/startup/build.gradle.kts index fe5e828b8..0e820536a 100644 --- a/instrumentation/startup/build.gradle.kts +++ b/instrumentation/startup/build.gradle.kts @@ -15,6 +15,7 @@ android { dependencies { api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core")) implementation(libs.androidx.core) From 265208b61dae4483c0d0449efec5ae6bdbca5626 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 24 Oct 2024 14:38:41 -0700 Subject: [PATCH 2/3] use alpha to version main instrumentation version --- .github/workflows/release.yml | 7 ++++++- gradle/libs.versions.toml | 4 ++-- instrumentation/startup/build.gradle.kts | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6800257b2..f59d50e82 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 ed1439004..8b14e8924 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 0e820536a..fd802a2f7 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")) From ea14ae2d5ff48ed5510d1a5ca1a1d98c7a7da13f Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Thu, 24 Oct 2024 16:13:02 -0700 Subject: [PATCH 3/3] fix platform dep usage --- core/build.gradle.kts | 2 +- instrumentation/activity/build.gradle.kts | 2 +- instrumentation/anr/build.gradle.kts | 2 +- instrumentation/common-api/build.gradle.kts | 2 +- instrumentation/crash/build.gradle.kts | 2 +- instrumentation/fragment/build.gradle.kts | 2 +- instrumentation/httpurlconnection/library/build.gradle.kts | 2 +- instrumentation/network/build.gradle.kts | 2 +- instrumentation/slowrendering/build.gradle.kts | 2 +- instrumentation/volley/library/build.gradle.kts | 2 +- test-common/build.gradle.kts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 6d32acda9..f3ba3cab5 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -66,7 +66,7 @@ dependencies { implementation(libs.androidx.navigation.fragment) implementation(libs.androidx.lifecycle.process) - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) implementation(libs.opentelemetry.sdk) implementation(libs.opentelemetry.api.incubator) diff --git a/instrumentation/activity/build.gradle.kts b/instrumentation/activity/build.gradle.kts index f191abc9d..c92ee2ca0 100644 --- a/instrumentation/activity/build.gradle.kts +++ b/instrumentation/activity/build.gradle.kts @@ -14,7 +14,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":instrumentation:common-api")) api(project(":core")) diff --git a/instrumentation/anr/build.gradle.kts b/instrumentation/anr/build.gradle.kts index e14774d1d..be9edc570 100644 --- a/instrumentation/anr/build.gradle.kts +++ b/instrumentation/anr/build.gradle.kts @@ -18,7 +18,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core")) implementation(libs.androidx.core) diff --git a/instrumentation/common-api/build.gradle.kts b/instrumentation/common-api/build.gradle.kts index 6eef21d41..e845a681c 100644 --- a/instrumentation/common-api/build.gradle.kts +++ b/instrumentation/common-api/build.gradle.kts @@ -15,7 +15,7 @@ android { dependencies { api(project(":core")) - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) implementation(libs.androidx.navigation.fragment) implementation(libs.opentelemetry.sdk) diff --git a/instrumentation/crash/build.gradle.kts b/instrumentation/crash/build.gradle.kts index 427682984..c03511dea 100644 --- a/instrumentation/crash/build.gradle.kts +++ b/instrumentation/crash/build.gradle.kts @@ -14,7 +14,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core")) implementation(libs.androidx.core) diff --git a/instrumentation/fragment/build.gradle.kts b/instrumentation/fragment/build.gradle.kts index 45b98b701..1752678fa 100644 --- a/instrumentation/fragment/build.gradle.kts +++ b/instrumentation/fragment/build.gradle.kts @@ -14,7 +14,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":instrumentation:common-api")) api(project(":core")) diff --git a/instrumentation/httpurlconnection/library/build.gradle.kts b/instrumentation/httpurlconnection/library/build.gradle.kts index 5a18dbd73..447ae2e07 100644 --- a/instrumentation/httpurlconnection/library/build.gradle.kts +++ b/instrumentation/httpurlconnection/library/build.gradle.kts @@ -10,7 +10,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(libs.opentelemetry.context) api(project(":core")) diff --git a/instrumentation/network/build.gradle.kts b/instrumentation/network/build.gradle.kts index 5635231cd..e0caa2c3b 100644 --- a/instrumentation/network/build.gradle.kts +++ b/instrumentation/network/build.gradle.kts @@ -19,7 +19,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core")) api(project(":instrumentation:common-api")) diff --git a/instrumentation/slowrendering/build.gradle.kts b/instrumentation/slowrendering/build.gradle.kts index 96eaaf9de..f5bd09c79 100644 --- a/instrumentation/slowrendering/build.gradle.kts +++ b/instrumentation/slowrendering/build.gradle.kts @@ -14,7 +14,7 @@ android { } dependencies { - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) api(project(":core")) api(project(":instrumentation:common-api")) diff --git a/instrumentation/volley/library/build.gradle.kts b/instrumentation/volley/library/build.gradle.kts index 6f7eaab15..60139c055 100644 --- a/instrumentation/volley/library/build.gradle.kts +++ b/instrumentation/volley/library/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { implementation(libs.opentelemetry.semconv.incubating) compileOnly(libs.volley) - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.api) testImplementation(libs.volley) diff --git a/test-common/build.gradle.kts b/test-common/build.gradle.kts index 04573480e..370fe0447 100644 --- a/test-common/build.gradle.kts +++ b/test-common/build.gradle.kts @@ -10,7 +10,7 @@ android { dependencies { api(project(":core")) - api(platform(libs.opentelemetry.platform)) + api(platform(libs.opentelemetry.platform.alpha)) api(libs.opentelemetry.sdk) api(libs.opentelemetry.api) api(libs.opentelemetry.sdk.testing)