Skip to content

Cherry pick from #1429 post-release #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Cherry pick from #1429 post-release #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d372d94
remove unused sdk incubator
breedx-splk Nov 25, 2025
ba4e801
remove unused api incubator
breedx-splk Nov 25, 2025
dcd5b44
restore api platform dependency on alpha bom, which is required for p…
breedx-splk Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions agent-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ plugins {
id("otel.publish-conventions")
}

description = "OpenTelemetry android agent api"

android {
namespace = "io.opentelemetry.android.agent.api"

Expand Down
2 changes: 2 additions & 0 deletions android-agent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ android {

dependencies {
api(project(":agent-api"))
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":core"))
implementation(project(":common"))
implementation(project(":session"))
Expand Down
1 change: 1 addition & 0 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.instrumentation.api)
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":common"))
Expand All @@ -69,13 +71,11 @@ dependencies {
implementation(libs.androidx.core)

implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.api.incubator)
implementation(libs.opentelemetry.exporter.logging)
implementation(libs.opentelemetry.instrumentation.api)
implementation(libs.opentelemetry.semconv.incubating)
implementation(libs.opentelemetry.diskBuffering)
implementation(libs.opentelemetry.processors)
testImplementation(libs.opentelemetry.api.incubator)
testImplementation(libs.androidx.test.core)
testImplementation(libs.awaitility)
testImplementation(libs.robolectric)
Expand Down
1 change: 1 addition & 0 deletions instrumentation/activity/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:common-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/android-log/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":agent-api"))

implementation(libs.opentelemetry.instrumentation.apiSemconv)
implementation(libs.opentelemetry.api.incubator)
}
2 changes: 1 addition & 1 deletion instrumentation/anr/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":instrumentation:common-api"))
Expand All @@ -27,5 +28,4 @@ dependencies {
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.instrumentation.api)
implementation(libs.opentelemetry.semconv.incubating)
implementation(libs.opentelemetry.sdk.extension.incubator)
}
1 change: 1 addition & 0 deletions instrumentation/common-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":common"))
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
Expand Down
3 changes: 2 additions & 1 deletion instrumentation/compose/click/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))

compileOnly(libs.compose)
implementation(libs.opentelemetry.api.incubator)
implementation(libs.opentelemetry.instrumentation.apiSemconv)
implementation(libs.opentelemetry.semconv.incubating)

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/crash/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":common"))
implementation(project(":services"))
Expand All @@ -23,7 +24,6 @@ dependencies {
implementation(libs.androidx.core)
implementation(libs.opentelemetry.semconv.incubating)
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.sdk.extension.incubator)
implementation(libs.opentelemetry.instrumentation.api)
testImplementation(libs.awaitility)
testImplementation(libs.robolectric)
Expand Down
1 change: 1 addition & 0 deletions instrumentation/fragment/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:common-api"))
implementation(project(":instrumentation:android-instrumentation"))
Expand Down
1 change: 1 addition & 0 deletions instrumentation/httpurlconnection/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":agent-api"))
api(libs.opentelemetry.context)
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":common"))
implementation(project(":agent-api"))
implementation(libs.androidx.core)
implementation(libs.opentelemetry.semconv.incubating)
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.sdk.extension.incubator)
implementation(libs.opentelemetry.instrumentation.api)
testImplementation(project(":test-common"))
testImplementation(project(":session"))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/okhttp3-websocket/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
compileOnly(libs.okhttp)
api(libs.opentelemetry.instrumentation.okhttp)
implementation(libs.opentelemetry.instrumentation.apiSemconv)
implementation(libs.opentelemetry.api.incubator)
}
2 changes: 1 addition & 1 deletion instrumentation/sessions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))
implementation(libs.opentelemetry.api.incubator)
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.semconv.incubating)
implementation(project(":core"))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/slowrendering/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":instrumentation:android-instrumentation"))
implementation(project(":services"))
implementation(project(":session"))
Expand All @@ -27,6 +28,5 @@ dependencies {
implementation(libs.opentelemetry.semconv)
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.instrumentation.api)
implementation(libs.opentelemetry.sdk.extension.incubator)
testImplementation(libs.robolectric)
}
4 changes: 2 additions & 2 deletions instrumentation/startup/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing

implementation(project(":agent-api"))
implementation(project(":core"))
implementation(project(":instrumentation:android-instrumentation"))
Expand All @@ -23,8 +25,6 @@ dependencies {
implementation(libs.androidx.core)
implementation(libs.opentelemetry.semconv)
implementation(libs.opentelemetry.sdk)
implementation(libs.opentelemetry.api.incubator)
implementation(libs.opentelemetry.sdk.extension.incubator)
implementation(libs.opentelemetry.instrumentation.api)
testImplementation(project(":test-common"))
}
2 changes: 1 addition & 1 deletion instrumentation/view-click/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":services"))
implementation(project(":agent-api"))
implementation(project(":instrumentation:android-instrumentation"))

implementation(libs.opentelemetry.instrumentation.apiSemconv)
implementation(libs.opentelemetry.semconv.incubating)
implementation(libs.opentelemetry.api.incubator)

testImplementation(project(":test-common"))
testImplementation(project(":session"))
Expand Down
1 change: 1 addition & 0 deletions session/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ android {
}

dependencies {
api(platform(libs.opentelemetry.platform.alpha)) // Required for sonatype publishing
implementation(project(":agent-api"))
implementation(libs.opentelemetry.sdk)
}