diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc9fff641036f..e2330c570ea7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -160,6 +160,12 @@ netty-resolver = { group = "io.netty", name = "netty-resolver", version.ref = "n netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" } netty-transport-native-unix-common = { group = "io.netty", name = "netty-transport-native-unix-common", version.ref = "netty" } netty-pkitesting = { group = "io.netty", name = "netty-pkitesting", version.ref = "netty" } + +# OpenTelemetry libraries +opentelemetry-api = { group = "io.opentelemetry", name = "opentelemetry-api", version.ref = "opentelemetry" } +opentelemetry-common = { group = "io.opentelemetry", name = "opentelemetry-common", version.ref = "opentelemetry" } +opentelemetry-context = { group = "io.opentelemetry", name = "opentelemetry-context", version.ref = "opentelemetry" } + protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" } reactivestreams = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" } reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" } diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index aefc9ed2a7829..1552852532c3a 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -90,8 +90,9 @@ dependencies { implementation "org.checkerframework:checker-qual:3.52.1" - runtimeOnly "io.opentelemetry:opentelemetry-api:1.47.0" - runtimeOnly "io.opentelemetry:opentelemetry-context:1.47.0" + runtimeOnly libs.opentelemetry.api + runtimeOnly libs.opentelemetry.common + runtimeOnly libs.opentelemetry.context runtimeOnly "com.google.api.grpc:proto-google-cloud-storage-v2:2.60.0" runtimeOnly "io.grpc:grpc-api:1.71.0" @@ -137,6 +138,7 @@ tasks.named("dependencyLicenses").configure { mapping from: /google-auth-.*/, to: 'google-auth' mapping from: /google-http-.*/, to: 'google-http' mapping from: /opencensus.*/, to: 'opencensus' + mapping from: /opentelemetry-common.*/, to: 'opentelemetry-api' mapping from: /protobuf.*/, to: 'protobuf' mapping from: /proto-google.*/, to: 'proto-google' } diff --git a/plugins/repository-gcs/licenses/opentelemetry-api-1.47.0.jar.sha1 b/plugins/repository-gcs/licenses/opentelemetry-api-1.47.0.jar.sha1 deleted file mode 100644 index 1806d8e42714a..0000000000000 --- a/plugins/repository-gcs/licenses/opentelemetry-api-1.47.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9de168f2c648c33b86136f51a4584bde9a705ff1 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/opentelemetry-api-1.62.0.jar.sha1 b/plugins/repository-gcs/licenses/opentelemetry-api-1.62.0.jar.sha1 new file mode 100644 index 0000000000000..02ab255e34d5e --- /dev/null +++ b/plugins/repository-gcs/licenses/opentelemetry-api-1.62.0.jar.sha1 @@ -0,0 +1 @@ +c4ee83d77005567852a72e08b945ebb023be1daa \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/opentelemetry-common-1.62.0.jar.sha1 b/plugins/repository-gcs/licenses/opentelemetry-common-1.62.0.jar.sha1 new file mode 100644 index 0000000000000..db25f474db864 --- /dev/null +++ b/plugins/repository-gcs/licenses/opentelemetry-common-1.62.0.jar.sha1 @@ -0,0 +1 @@ +e6468bd64a94429b68761f7c13e143c3fdfaafc7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/opentelemetry-context-1.47.0.jar.sha1 b/plugins/repository-gcs/licenses/opentelemetry-context-1.47.0.jar.sha1 deleted file mode 100644 index af4d69f26d333..0000000000000 --- a/plugins/repository-gcs/licenses/opentelemetry-context-1.47.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -86e49fe98ce06c279f7b9f028af8658cb7bc972a \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/opentelemetry-context-1.62.0.jar.sha1 b/plugins/repository-gcs/licenses/opentelemetry-context-1.62.0.jar.sha1 new file mode 100644 index 0000000000000..4608aebd30520 --- /dev/null +++ b/plugins/repository-gcs/licenses/opentelemetry-context-1.62.0.jar.sha1 @@ -0,0 +1 @@ +365cee4d1f365e4d4a05654742b50aa436c2dd8e \ No newline at end of file