mirror of https://github.com/grpc/grpc-java.git
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.
This commit is contained in:
parent
5770114d08
commit
e7c3803b5a
|
|
@ -75,7 +75,6 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
|
||||||
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
|
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
|
||||||
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
|
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
|
||||||
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
|
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
|
||||||
opencensus-proto = "io.opencensus:opencensus-proto:0.2.0"
|
|
||||||
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.39.0"
|
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.39.0"
|
||||||
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.39.0-alpha"
|
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.39.0-alpha"
|
||||||
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha"
|
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha"
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,7 @@ configurations {
|
||||||
dependencies {
|
dependencies {
|
||||||
thirdpartyCompileOnly libraries.javax.annotation
|
thirdpartyCompileOnly libraries.javax.annotation
|
||||||
thirdpartyImplementation project(':grpc-protobuf'),
|
thirdpartyImplementation project(':grpc-protobuf'),
|
||||||
project(':grpc-stub'),
|
project(':grpc-stub')
|
||||||
libraries.opencensus.proto
|
|
||||||
compileOnly sourceSets.thirdparty.output
|
compileOnly sourceSets.thirdparty.output
|
||||||
implementation project(':grpc-stub'),
|
implementation project(':grpc-stub'),
|
||||||
project(':grpc-core'),
|
project(':grpc-core'),
|
||||||
|
|
|
||||||
|
|
@ -67,10 +67,8 @@ envoy/config/trace/v3/datadog.proto
|
||||||
envoy/config/trace/v3/dynamic_ot.proto
|
envoy/config/trace/v3/dynamic_ot.proto
|
||||||
envoy/config/trace/v3/http_tracer.proto
|
envoy/config/trace/v3/http_tracer.proto
|
||||||
envoy/config/trace/v3/lightstep.proto
|
envoy/config/trace/v3/lightstep.proto
|
||||||
envoy/config/trace/v3/opencensus.proto
|
|
||||||
envoy/config/trace/v3/opentelemetry.proto
|
envoy/config/trace/v3/opentelemetry.proto
|
||||||
envoy/config/trace/v3/service.proto
|
envoy/config/trace/v3/service.proto
|
||||||
envoy/config/trace/v3/trace.proto
|
|
||||||
envoy/config/trace/v3/zipkin.proto
|
envoy/config/trace/v3/zipkin.proto
|
||||||
envoy/data/accesslog/v3/accesslog.proto
|
envoy/data/accesslog/v3/accesslog.proto
|
||||||
envoy/extensions/clusters/aggregate/v3/cluster.proto
|
envoy/extensions/clusters/aggregate/v3/cluster.proto
|
||||||
|
|
|
||||||
|
|
@ -1,117 +0,0 @@
|
||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
package envoy.config.trace.v3;
|
|
||||||
|
|
||||||
import "envoy/config/core/v3/grpc_service.proto";
|
|
||||||
|
|
||||||
import "opencensus/proto/trace/v1/trace_config.proto";
|
|
||||||
|
|
||||||
import "envoy/annotations/deprecation.proto";
|
|
||||||
import "udpa/annotations/migrate.proto";
|
|
||||||
import "udpa/annotations/status.proto";
|
|
||||||
import "udpa/annotations/versioning.proto";
|
|
||||||
|
|
||||||
option java_package = "io.envoyproxy.envoy.config.trace.v3";
|
|
||||||
option java_outer_classname = "OpencensusProto";
|
|
||||||
option java_multiple_files = true;
|
|
||||||
option go_package = "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3;tracev3";
|
|
||||||
option (udpa.annotations.file_migrate).move_to_package =
|
|
||||||
"envoy.extensions.tracers.opencensus.v4alpha";
|
|
||||||
option (udpa.annotations.file_status).package_version_status = ACTIVE;
|
|
||||||
|
|
||||||
// [#protodoc-title: OpenCensus tracer]
|
|
||||||
|
|
||||||
// Configuration for the OpenCensus tracer.
|
|
||||||
// [#next-free-field: 15]
|
|
||||||
// [#extension: envoy.tracers.opencensus]
|
|
||||||
message OpenCensusConfig {
|
|
||||||
option (udpa.annotations.versioning).previous_message_type =
|
|
||||||
"envoy.config.trace.v2.OpenCensusConfig";
|
|
||||||
|
|
||||||
enum TraceContext {
|
|
||||||
// No-op default, no trace context is utilized.
|
|
||||||
NONE = 0;
|
|
||||||
|
|
||||||
// W3C Trace-Context format "traceparent:" header.
|
|
||||||
TRACE_CONTEXT = 1;
|
|
||||||
|
|
||||||
// Binary "grpc-trace-bin:" header.
|
|
||||||
GRPC_TRACE_BIN = 2;
|
|
||||||
|
|
||||||
// "X-Cloud-Trace-Context:" header.
|
|
||||||
CLOUD_TRACE_CONTEXT = 3;
|
|
||||||
|
|
||||||
// X-B3-* headers.
|
|
||||||
B3 = 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
reserved 7;
|
|
||||||
|
|
||||||
// Configures tracing, e.g. the sampler, max number of annotations, etc.
|
|
||||||
opencensus.proto.trace.v1.TraceConfig trace_config = 1
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// Enables the stdout exporter if set to true. This is intended for debugging
|
|
||||||
// purposes.
|
|
||||||
bool stdout_exporter_enabled = 2
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// Enables the Stackdriver exporter if set to true. The project_id must also
|
|
||||||
// be set.
|
|
||||||
bool stackdriver_exporter_enabled = 3
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// The Cloud project_id to use for Stackdriver tracing.
|
|
||||||
string stackdriver_project_id = 4
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// (optional) By default, the Stackdriver exporter will connect to production
|
|
||||||
// Stackdriver. If stackdriver_address is non-empty, it will instead connect
|
|
||||||
// to this address, which is in the gRPC format:
|
|
||||||
// https://github.com/grpc/grpc/blob/master/doc/naming.md
|
|
||||||
string stackdriver_address = 10
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// (optional) The gRPC server that hosts Stackdriver tracing service. Only
|
|
||||||
// Google gRPC is supported. If :ref:`target_uri <envoy_v3_api_field_config.core.v3.GrpcService.GoogleGrpc.target_uri>`
|
|
||||||
// is not provided, the default production Stackdriver address will be used.
|
|
||||||
core.v3.GrpcService stackdriver_grpc_service = 13
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// Enables the Zipkin exporter if set to true. The url and service name must
|
|
||||||
// also be set. This is deprecated, prefer to use Envoy's :ref:`native Zipkin
|
|
||||||
// tracer <envoy_v3_api_msg_config.trace.v3.ZipkinConfig>`.
|
|
||||||
bool zipkin_exporter_enabled = 5
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans". This is
|
|
||||||
// deprecated, prefer to use Envoy's :ref:`native Zipkin tracer
|
|
||||||
// <envoy_v3_api_msg_config.trace.v3.ZipkinConfig>`.
|
|
||||||
string zipkin_url = 6
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// Enables the OpenCensus Agent exporter if set to true. The ocagent_address or
|
|
||||||
// ocagent_grpc_service must also be set.
|
|
||||||
bool ocagent_exporter_enabled = 11
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// The address of the OpenCensus Agent, if its exporter is enabled, in gRPC
|
|
||||||
// format: https://github.com/grpc/grpc/blob/master/doc/naming.md
|
|
||||||
// [#comment:TODO: deprecate this field]
|
|
||||||
string ocagent_address = 12
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// (optional) The gRPC server hosted by the OpenCensus Agent. Only Google gRPC is supported.
|
|
||||||
// This is only used if the ocagent_address is left empty.
|
|
||||||
core.v3.GrpcService ocagent_grpc_service = 14
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// List of incoming trace context headers we will accept. First one found
|
|
||||||
// wins.
|
|
||||||
repeated TraceContext incoming_trace_context = 8
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
|
|
||||||
// List of outgoing trace context headers we will produce.
|
|
||||||
repeated TraceContext outgoing_trace_context = 9
|
|
||||||
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
package envoy.config.trace.v3;
|
|
||||||
|
|
||||||
import public "envoy/config/trace/v3/datadog.proto";
|
|
||||||
import public "envoy/config/trace/v3/dynamic_ot.proto";
|
|
||||||
import public "envoy/config/trace/v3/http_tracer.proto";
|
|
||||||
import public "envoy/config/trace/v3/lightstep.proto";
|
|
||||||
import public "envoy/config/trace/v3/opencensus.proto";
|
|
||||||
import public "envoy/config/trace/v3/opentelemetry.proto";
|
|
||||||
import public "envoy/config/trace/v3/service.proto";
|
|
||||||
import public "envoy/config/trace/v3/zipkin.proto";
|
|
||||||
|
|
||||||
option java_package = "io.envoyproxy.envoy.config.trace.v3";
|
|
||||||
option java_outer_classname = "TraceProto";
|
|
||||||
option java_multiple_files = true;
|
|
||||||
option go_package = "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3;tracev3";
|
|
||||||
Loading…
Reference in New Issue