Skip to content

Commit

Permalink
leverage boms for transient core deps
Browse files Browse the repository at this point in the history
  • Loading branch information
breedx-splk committed Oct 22, 2024
1 parent 01a801d commit 6f2ec14
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions instrumentation/startup/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6f2ec14

Please sign in to comment.