Skip to content

Commit e7c3803

Browse files
authoredJun 26, 2024··
xds: Remove unused opencensus-proto dependency
opencensus-proto is old generated code, which is not compatible with protobuf-java 4.27.2 and may not be fixed since the project is dead. Since it is unused, I think this doesn't cause any trouble for downstream users trying to use protobuf-java 4.x. Related to #11015.
1 parent 5770114 commit e7c3803

File tree

5 files changed

+1
-139
lines changed

5 files changed

+1
-139
lines changed
 

‎gradle/libs.versions.toml

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
7575
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
7676
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
7777
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
78-
opencensus-proto = "io.opencensus:opencensus-proto:0.2.0"
7978
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.39.0"
8079
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.39.0-alpha"
8180
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha"

‎xds/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ configurations {
4343
dependencies {
4444
thirdpartyCompileOnly libraries.javax.annotation
4545
thirdpartyImplementation project(':grpc-protobuf'),
46-
project(':grpc-stub'),
47-
libraries.opencensus.proto
46+
project(':grpc-stub')
4847
compileOnly sourceSets.thirdparty.output
4948
implementation project(':grpc-stub'),
5049
project(':grpc-core'),

‎xds/third_party/envoy/import.sh

-2
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ envoy/config/trace/v3/datadog.proto
6767
envoy/config/trace/v3/dynamic_ot.proto
6868
envoy/config/trace/v3/http_tracer.proto
6969
envoy/config/trace/v3/lightstep.proto
70-
envoy/config/trace/v3/opencensus.proto
7170
envoy/config/trace/v3/opentelemetry.proto
7271
envoy/config/trace/v3/service.proto
73-
envoy/config/trace/v3/trace.proto
7472
envoy/config/trace/v3/zipkin.proto
7573
envoy/data/accesslog/v3/accesslog.proto
7674
envoy/extensions/clusters/aggregate/v3/cluster.proto

‎xds/third_party/envoy/src/main/proto/envoy/config/trace/v3/opencensus.proto

-117
This file was deleted.

‎xds/third_party/envoy/src/main/proto/envoy/config/trace/v3/trace.proto

-17
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.