diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9ede1e6..f59d50e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,17 @@ jobs: else 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 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 ' | \ + sed -e "s/.* -> //" | sed -e "s/ .*//" | \ + sort | head -1) echo "VERSION=$version" >> $GITHUB_ENV echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 6d32acda..f3ba3cab 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/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1ef17f6..8b14e892 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,6 @@ [versions] -opentelemetry = "1.43.0" -opentelemetry-alpha = "1.43.0-alpha" -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" @@ -16,7 +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" @@ -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/activity/build.gradle.kts b/instrumentation/activity/build.gradle.kts index f191abc9..c92ee2ca 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 e14774d1..be9edc57 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 6eef21d4..e845a681 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 42768298..c03511de 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 45b98b70..1752678f 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 5a18dbd7..447ae2e0 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 5635231c..e0caa2c3 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 96eaaf9d..f5bd09c7 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/startup/build.gradle.kts b/instrumentation/startup/build.gradle.kts index fe5e828b..fd802a2f 100644 --- a/instrumentation/startup/build.gradle.kts +++ b/instrumentation/startup/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/volley/library/build.gradle.kts b/instrumentation/volley/library/build.gradle.kts index 6f7eaab1..60139c05 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 04573480..370fe044 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)