diff --git a/BUILD b/BUILD index 459e54f3..5cd61f65 100644 --- a/BUILD +++ b/BUILD @@ -373,7 +373,6 @@ proto_library( "//envoy/service/secret/v3:pkg", "//envoy/service/status/v3:pkg", "//envoy/service/tap/v3:pkg", - "//envoy/service/trace/v3:pkg", "//envoy/type/http/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/metadata/v3:pkg", diff --git a/bazel/external_proto_deps.bzl b/bazel/external_proto_deps.bzl index 1c56faba..5f08d68e 100644 --- a/bazel/external_proto_deps.bzl +++ b/bazel/external_proto_deps.bzl @@ -12,8 +12,6 @@ EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP = { "google/api/expr/v1alpha1/checked.proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto", "google/api/expr/v1alpha1/syntax.proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto", "io/prometheus/client/metrics.proto": "@prometheus_metrics_model//:client_model", - "opencensus/proto/trace/v1/trace.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", - "opencensus/proto/trace/v1/trace_config.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", "opentelemetry/proto/common/v1/common.proto": "@opentelemetry_proto//:common", } @@ -30,8 +28,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = { # go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go", "@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_go_proto", "@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_go_proto", "@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_go_proto", @@ -42,8 +38,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = { EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = { "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_cc", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_cc", "@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_cc_proto", "@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_cc_proto", "@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_cc_proto", diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 6ca1e5d1..ebf04fd2 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -36,9 +36,6 @@ def api_dependencies(): name = "prometheus_metrics_model", build_file_content = PROMETHEUSMETRICS_BUILD_CONTENT, ) - external_http_archive( - name = "opencensus_proto", - ) external_http_archive( name = "rules_proto", ) @@ -85,26 +82,6 @@ go_proto_library( ) """ -OPENCENSUSTRACE_BUILD_CONTENT = """ -load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") -load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") - -api_cc_py_proto_library( - name = "trace_model", - srcs = [ - "trace.proto", - ], - visibility = ["//visibility:public"], -) - -go_proto_library( - name = "trace_model_go_proto", - importpath = "trace_model", - proto = ":trace_model", - visibility = ["//visibility:public"], -) -""" - ZIPKINAPI_BUILD_CONTENT = """ load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 31be9cd7..c6c3b66f 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -88,19 +88,6 @@ REPOSITORY_LOCATIONS_SPEC = dict( license = "Apache-2.0", license_url = "https://github.com/googleapis/googleapis/blob/{version}/LICENSE", ), - opencensus_proto = dict( - project_name = "OpenCensus Proto", - project_desc = "Language Independent Interface Types For OpenCensus", - project_url = "https://github.com/census-instrumentation/opencensus-proto", - version = "0.4.1", - sha256 = "e3d89f7f9ed84c9b6eee818c2e9306950519402bf803698b15c310b77ca2f0f3", - release_date = "2022-09-23", - strip_prefix = "opencensus-proto-{version}/src", - urls = ["https://github.com/census-instrumentation/opencensus-proto/archive/v{version}.tar.gz"], - use_category = ["api"], - license = "Apache-2.0", - license_url = "https://github.com/census-instrumentation/opencensus-proto/blob/v{version}/LICENSE", - ), prometheus_metrics_model = dict( project_name = "Prometheus client model", project_desc = "Data model artifacts for Prometheus", diff --git a/buf.lock b/buf.lock index a3414522..8ea9072d 100644 --- a/buf.lock +++ b/buf.lock @@ -17,10 +17,6 @@ deps: owner: googleapis repository: googleapis commit: 62f35d8aed1149c291d606d958a7ce32 - - remote: buf.build - owner: opencensus - repository: opencensus - commit: bc2645b085534e4f8ebae3ef20088165 - remote: buf.build owner: opentelemetry repository: opentelemetry diff --git a/buf.yaml b/buf.yaml index 24533582..00530a38 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,7 +1,6 @@ version: v1 deps: - buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32 -- buf.build/opencensus/opencensus - buf.build/prometheus/client-model - buf.build/opentelemetry/opentelemetry - buf.build/gogo/protobuf diff --git a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index 82de0bc7..33a33166 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto @@ -163,14 +163,6 @@ message HttpConnectionManager { // Configuration for an external tracing provider. // If not specified, no tracing will be performed. - // - // .. attention:: - // Please be aware that *envoy.tracers.opencensus* provider can only be configured once - // in Envoy lifetime. - // Any attempts to reconfigure it or to use different configurations for different HCM filters - // will be rejected. - // Such a constraint is inherent to OpenCensus itself. It cannot be overcome without changes - // on OpenCensus side. trace.v2.Tracing.Http provider = 9; } diff --git a/envoy/config/trace/v2/BUILD b/envoy/config/trace/v2/BUILD index a207a53c..d9a6fd81 100644 --- a/envoy/config/trace/v2/BUILD +++ b/envoy/config/trace/v2/BUILD @@ -9,6 +9,5 @@ api_proto_package( "//envoy/annotations:pkg", "//envoy/api/v2/core:pkg", "@com_github_cncf_xds//udpa/annotations:pkg", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) diff --git a/envoy/config/trace/v2/http_tracer.proto b/envoy/config/trace/v2/http_tracer.proto index 778b9e71..23fec5ae 100644 --- a/envoy/config/trace/v2/http_tracer.proto +++ b/envoy/config/trace/v2/http_tracer.proto @@ -41,7 +41,6 @@ message Tracing { // - *envoy.tracers.zipkin* // - *envoy.tracers.dynamic_ot* // - *envoy.tracers.datadog* - // - *envoy.tracers.opencensus* // - *envoy.tracers.xray* string name = 1 [(validate.rules).string = {min_bytes: 1}]; @@ -52,7 +51,6 @@ message Tracing { // - :ref:`ZipkinConfig ` // - :ref:`DynamicOtConfig ` // - :ref:`DatadogConfig ` - // - :ref:`OpenCensusConfig ` // - :ref:`AWS X-Ray ` oneof config_type { google.protobuf.Struct config = 2 [deprecated = true]; diff --git a/envoy/config/trace/v2/opencensus.proto b/envoy/config/trace/v2/opencensus.proto deleted file mode 100644 index 595f4fe2..00000000 --- a/envoy/config/trace/v2/opencensus.proto +++ /dev/null @@ -1,93 +0,0 @@ -syntax = "proto3"; - -package envoy.config.trace.v2; - -import "envoy/api/v2/core/grpc_service.proto"; - -import "opencensus/proto/trace/v1/trace_config.proto"; - -import "udpa/annotations/status.proto"; - -option java_package = "io.envoyproxy.envoy.config.trace.v2"; -option java_outer_classname = "OpencensusProto"; -option java_multiple_files = true; -option go_package = "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2;tracev2"; -option (udpa.annotations.file_status).package_version_status = FROZEN; - -// [#protodoc-title: OpenCensus tracer] - -// Configuration for the OpenCensus tracer. -// [#next-free-field: 15] -// [#extension: envoy.tracers.opencensus] -message 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; - - // Enables the stdout exporter if set to true. This is intended for debugging - // purposes. - bool stdout_exporter_enabled = 2; - - // Enables the Stackdriver exporter if set to true. The project_id must also - // be set. - bool stackdriver_exporter_enabled = 3; - - // The Cloud project_id to use for Stackdriver tracing. - string stackdriver_project_id = 4; - - // (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; - - // (optional) The gRPC server that hosts Stackdriver tracing service. Only - // Google gRPC is supported. If :ref:`target_uri ` - // is not provided, the default production Stackdriver address will be used. - api.v2.core.GrpcService stackdriver_grpc_service = 13; - - // Enables the Zipkin exporter if set to true. The url and service name must - // also be set. - bool zipkin_exporter_enabled = 5; - - // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans" - string zipkin_url = 6; - - // 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; - - // 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; - - // (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. - api.v2.core.GrpcService ocagent_grpc_service = 14; - - // List of incoming trace context headers we will accept. First one found - // wins. - repeated TraceContext incoming_trace_context = 8; - - // List of outgoing trace context headers we will produce. - repeated TraceContext outgoing_trace_context = 9; -} diff --git a/envoy/config/trace/v2/trace.proto b/envoy/config/trace/v2/trace.proto index 02d6fa28..479da8b5 100644 --- a/envoy/config/trace/v2/trace.proto +++ b/envoy/config/trace/v2/trace.proto @@ -6,7 +6,6 @@ import public "envoy/config/trace/v2/datadog.proto"; import public "envoy/config/trace/v2/dynamic_ot.proto"; import public "envoy/config/trace/v2/http_tracer.proto"; import public "envoy/config/trace/v2/lightstep.proto"; -import public "envoy/config/trace/v2/opencensus.proto"; import public "envoy/config/trace/v2/service.proto"; import public "envoy/config/trace/v2/zipkin.proto"; diff --git a/envoy/config/trace/v3/BUILD b/envoy/config/trace/v3/BUILD index 4d265c47..e74acc66 100644 --- a/envoy/config/trace/v3/BUILD +++ b/envoy/config/trace/v3/BUILD @@ -9,6 +9,5 @@ api_proto_package( "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", "@com_github_cncf_xds//udpa/annotations:pkg", - "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], ) diff --git a/envoy/config/trace/v3/opencensus.proto b/envoy/config/trace/v3/opencensus.proto deleted file mode 100644 index a3399fa7..00000000 --- a/envoy/config/trace/v3/opencensus.proto +++ /dev/null @@ -1,156 +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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // The Cloud project_id to use for Stackdriver tracing. - string stackdriver_project_id = 4 [ - deprecated = true, - (envoy.annotations.deprecated_at_minor_version) = "3.0", - (envoy.annotations.disallowed_by_default) = true - ]; - - // (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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // (optional) The gRPC server that hosts Stackdriver tracing service. Only - // Google gRPC is supported. If :ref:`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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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 `. - bool zipkin_exporter_enabled = 5 [ - deprecated = true, - (envoy.annotations.deprecated_at_minor_version) = "3.0", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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 - // `. - string zipkin_url = 6 [ - deprecated = true, - (envoy.annotations.deprecated_at_minor_version) = "3.0", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // (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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; - - // 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", - (envoy.annotations.disallowed_by_default) = true - ]; -} diff --git a/envoy/config/trace/v3/trace.proto b/envoy/config/trace/v3/trace.proto index 8ca43718..296c6bdf 100644 --- a/envoy/config/trace/v3/trace.proto +++ b/envoy/config/trace/v3/trace.proto @@ -6,7 +6,6 @@ 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"; diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto index 5fb9f24c..ce549d6a 100644 --- a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto +++ b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto @@ -185,14 +185,6 @@ message HttpConnectionManager { // Configuration for an external tracing provider. // If not specified, no tracing will be performed. - // - // .. attention:: - // Please be aware that ``envoy.tracers.opencensus`` provider can only be configured once - // in Envoy lifetime. - // Any attempts to reconfigure it or to use different configurations for different HCM filters - // will be rejected. - // Such a constraint is inherent to OpenCensus itself. It cannot be overcome without changes - // on OpenCensus side. config.trace.v3.Tracing.Http provider = 9; // Create separate tracing span for each upstream request if true. And if this flag is set to true, diff --git a/envoy/service/trace/v2/BUILD b/envoy/service/trace/v2/BUILD deleted file mode 100644 index f3ef22c3..00000000 --- a/envoy/service/trace/v2/BUILD +++ /dev/null @@ -1,14 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - has_services = True, - deps = [ - "//envoy/api/v2/core:pkg", - "@com_github_cncf_xds//udpa/annotations:pkg", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", - ], -) diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto deleted file mode 100644 index c4808f1e..00000000 --- a/envoy/service/trace/v2/trace_service.proto +++ /dev/null @@ -1,46 +0,0 @@ -syntax = "proto3"; - -package envoy.service.trace.v2; - -import "envoy/api/v2/core/base.proto"; - -import "opencensus/proto/trace/v1/trace.proto"; - -import "udpa/annotations/status.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.service.trace.v2"; -option java_outer_classname = "TraceServiceProto"; -option java_multiple_files = true; -option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/trace/v2;tracev2"; -option (udpa.annotations.file_status).package_version_status = FROZEN; - -// [#protodoc-title: Trace service] - -// Service for streaming traces to server that consumes the trace data. It -// uses OpenCensus data model as a standard to represent trace information. -service TraceService { - // Envoy will connect and send StreamTracesMessage messages forever. It does - // not expect any response to be sent as nothing would be done in the case - // of failure. - rpc StreamTraces(stream StreamTracesMessage) returns (StreamTracesResponse) { - } -} - -message StreamTracesResponse { -} - -message StreamTracesMessage { - message Identifier { - // The node sending the access log messages over the stream. - api.v2.core.Node node = 1 [(validate.rules).message = {required: true}]; - } - - // Identifier data effectively is a structured metadata. - // As a performance optimization this will only be sent in the first message - // on the stream. - Identifier identifier = 1; - - // A list of Span entries - repeated opencensus.proto.trace.v1.Span spans = 2; -} diff --git a/envoy/service/trace/v3/BUILD b/envoy/service/trace/v3/BUILD deleted file mode 100644 index 1e793010..00000000 --- a/envoy/service/trace/v3/BUILD +++ /dev/null @@ -1,14 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - has_services = True, - deps = [ - "//envoy/config/core/v3:pkg", - "@com_github_cncf_xds//udpa/annotations:pkg", - "@opencensus_proto//opencensus/proto/trace/v1:trace_proto", - ], -) diff --git a/envoy/service/trace/v3/trace_service.proto b/envoy/service/trace/v3/trace_service.proto deleted file mode 100644 index 320f20fd..00000000 --- a/envoy/service/trace/v3/trace_service.proto +++ /dev/null @@ -1,55 +0,0 @@ -syntax = "proto3"; - -package envoy.service.trace.v3; - -import "envoy/config/core/v3/base.proto"; - -import "opencensus/proto/trace/v1/trace.proto"; - -import "udpa/annotations/status.proto"; -import "udpa/annotations/versioning.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.service.trace.v3"; -option java_outer_classname = "TraceServiceProto"; -option java_multiple_files = true; -option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/trace/v3;tracev3"; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Trace service] - -// Service for streaming traces to server that consumes the trace data. It -// uses OpenCensus data model as a standard to represent trace information. -service TraceService { - // Envoy will connect and send StreamTracesMessage messages forever. It does - // not expect any response to be sent as nothing would be done in the case - // of failure. - rpc StreamTraces(stream StreamTracesMessage) returns (StreamTracesResponse) { - } -} - -message StreamTracesResponse { - option (udpa.annotations.versioning).previous_message_type = - "envoy.service.trace.v2.StreamTracesResponse"; -} - -message StreamTracesMessage { - option (udpa.annotations.versioning).previous_message_type = - "envoy.service.trace.v2.StreamTracesMessage"; - - message Identifier { - option (udpa.annotations.versioning).previous_message_type = - "envoy.service.trace.v2.StreamTracesMessage.Identifier"; - - // The node sending the access log messages over the stream. - config.core.v3.Node node = 1 [(validate.rules).message = {required: true}]; - } - - // Identifier data effectively is a structured metadata. - // As a performance optimization this will only be sent in the first message - // on the stream. - Identifier identifier = 1; - - // A list of Span entries - repeated opencensus.proto.trace.v1.Span spans = 2; -} diff --git a/versioning/BUILD b/versioning/BUILD index 59e46ce6..171bd9fb 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -311,7 +311,6 @@ proto_library( "//envoy/service/secret/v3:pkg", "//envoy/service/status/v3:pkg", "//envoy/service/tap/v3:pkg", - "//envoy/service/trace/v3:pkg", "//envoy/type/http/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/metadata/v3:pkg", @@ -426,7 +425,6 @@ proto_library( "//envoy/service/ratelimit/v2:pkg", "//envoy/service/status/v2:pkg", "//envoy/service/tap/v2alpha:pkg", - "//envoy/service/trace/v2:pkg", "//envoy/type:pkg", "//envoy/type/matcher:pkg", "//envoy/type/metadata/v2:pkg",