to remove deprecated proto dependency, needed to add jaeger-proto dep…

…endency (hyperledger#3485) Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
lacchain · Nov 3, 2023 · 34f38bd · 34f38bd
1 parent b7910ab
commit 34f38bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle
@@ -55,14 +55,15 @@ dependencies {
  testImplementation 'io.grpc:grpc-stub'
  testImplementation 'io.netty:netty-all'
  testImplementation 'io.opentelemetry:opentelemetry-api'
- testImplementation 'io.opentelemetry:opentelemetry-proto'
  testImplementation 'io.opentelemetry:opentelemetry-sdk'
  testImplementation 'io.opentelemetry:opentelemetry-sdk-trace'
  testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+ testImplementation 'io.opentelemetry.proto:opentelemetry-proto'
  testImplementation 'io.opentracing.contrib:opentracing-okhttp3'
  testImplementation 'io.opentracing:opentracing-api'
  testImplementation 'io.opentracing:opentracing-util'
  testImplementation 'io.jaegertracing:jaeger-client'
+ testImplementation 'io.jaegertracing:jaeger-proto'
  testImplementation 'io.vertx:vertx-core'
  testImplementation 'junit:junit'
  testImplementation 'org.apache.commons:commons-compress'

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -55,13 +55,14 @@ dependencyManagement {
 
  dependency 'info.picocli:picocli:4.6.2'
 
- dependencySet(group: 'io.grpc', version: '1.43.1') {
+ dependencySet(group: 'io.grpc', version: '1.44.1') {
  entry'grpc-core'
  entry'grpc-netty'
  entry'grpc-stub'
  }
 
  dependency 'io.jaegertracing:jaeger-client:1.6.0'
+ dependency 'io.jaegertracing:jaeger-proto:0.7.0'
 
  dependency 'io.kubernetes:client-java:14.0.0'
 
@@ -73,10 +74,10 @@ dependencyManagement {
  dependency 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.6.0-alpha'
  dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.6.0'
  dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.6.0'
- dependency 'io.opentelemetry:opentelemetry-proto:1.5.0-alpha'
  dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.6.0'
  dependency 'io.opentelemetry:opentelemetry-sdk:1.6.0'
  dependency 'io.opentelemetry:opentelemetry-semconv:1.6.0-alpha'
+ dependency 'io.opentelemetry.proto:opentelemetry-proto:0.13.0-alpha'
 
  dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0'
  dependency 'io.opentracing:opentracing-api:0.33.0'

diff --git a/metrics/core/build.gradle b/metrics/core/build.gradle
@@ -41,6 +41,7 @@ dependencies {
  implementation 'com.google.guava:guava'
  implementation 'io.grpc:grpc-netty'
  implementation 'io.grpc:grpc-core'
+ implementation 'io.jaegertracing:jaeger-proto'
  implementation 'io.netty:netty-tcnative-boringssl-static'
  implementation 'io.netty:netty-transport-native-epoll'
  implementation 'io.netty:netty-all'
@@ -50,7 +51,7 @@ dependencies {
  implementation 'io.opentelemetry:opentelemetry-sdk-trace'
  implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
  implementation 'io.opentelemetry:opentelemetry-exporter-otlp-metrics'
- implementation 'io.opentelemetry:opentelemetry-proto'
+ implementation 'io.opentelemetry.proto:opentelemetry-proto'
 
  implementation 'io.prometheus:simpleclient'
  implementation 'io.prometheus:simpleclient_common'