diff --git a/api/envoy/config/trace/v3/http_tracer.proto b/api/envoy/config/trace/v3/http_tracer.proto index 33adea18a4d6..faf4449c0c03 100644 --- a/api/envoy/config/trace/v3/http_tracer.proto +++ b/api/envoy/config/trace/v3/http_tracer.proto @@ -58,7 +58,7 @@ message Tracing { // See the trace drivers for examples: // // - :ref:`LightstepConfig ` - // - :ref:`ZipkinConfig ` + // - :ref:`ZipkinConfig ` // - :ref:`DynamicOtConfig ` // - :ref:`DatadogConfig ` // - :ref:`OpenCensusConfig ` diff --git a/api/envoy/config/trace/v3/opencensus.proto b/api/envoy/config/trace/v3/opencensus.proto index 39313139177f..a4a8750983fc 100644 --- a/api/envoy/config/trace/v3/opencensus.proto +++ b/api/envoy/config/trace/v3/opencensus.proto @@ -72,11 +72,14 @@ message OpenCensusConfig { core.v3.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; + // also be set. This is deprecated, prefer to use Envoy's :ref:`native Zipkin + // tracer `. + bool zipkin_exporter_enabled = 5 [deprecated = 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]; // Enables the OpenCensus Agent exporter if set to true. The ocagent_address or // ocagent_grpc_service must also be set. diff --git a/api/envoy/config/trace/v4alpha/http_tracer.proto b/api/envoy/config/trace/v4alpha/http_tracer.proto index ea918ec2bff5..1c0f67f20a10 100644 --- a/api/envoy/config/trace/v4alpha/http_tracer.proto +++ b/api/envoy/config/trace/v4alpha/http_tracer.proto @@ -58,7 +58,7 @@ message Tracing { // See the trace drivers for examples: // // - :ref:`LightstepConfig ` - // - :ref:`ZipkinConfig ` + // - :ref:`ZipkinConfig ` // - :ref:`DynamicOtConfig ` // - :ref:`DatadogConfig ` // - :ref:`OpenCensusConfig ` diff --git a/api/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto b/api/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto index f64507b13827..af17fe8ca27d 100644 --- a/api/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto +++ b/api/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto @@ -41,7 +41,9 @@ message OpenCensusConfig { B3 = 4; } - reserved 7; + reserved 7, 5, 6; + + reserved "zipkin_exporter_enabled", "zipkin_url"; // Configures tracing, e.g. the sampler, max number of annotations, etc. .opencensus.proto.trace.v1.TraceConfig trace_config = 1; @@ -68,13 +70,6 @@ message OpenCensusConfig { // is not provided, the default production Stackdriver address will be used. config.core.v4alpha.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; diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index cf656be3370f..f701c115d11b 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -113,3 +113,4 @@ Deprecated * logging: the `--log-format-prefix-with-location` option is removed. * ratelimit: the :ref:`dynamic metadata ` action is deprecated in favor of the more generic :ref:`metadata ` action. * stats: the `--use-fake-symbol-table` option is removed. +* tracing: OpenCensus :ref:`Zipkin configuration ` is now deprecated, the preferred Zipkin export is via Envoy's :ref:`native Zipkin tracer `. diff --git a/generated_api_shadow/envoy/config/trace/v3/http_tracer.proto b/generated_api_shadow/envoy/config/trace/v3/http_tracer.proto index 23d0efc47a38..369e6032edc6 100644 --- a/generated_api_shadow/envoy/config/trace/v3/http_tracer.proto +++ b/generated_api_shadow/envoy/config/trace/v3/http_tracer.proto @@ -54,7 +54,7 @@ message Tracing { // See the trace drivers for examples: // // - :ref:`LightstepConfig ` - // - :ref:`ZipkinConfig ` + // - :ref:`ZipkinConfig ` // - :ref:`DynamicOtConfig ` // - :ref:`DatadogConfig ` // - :ref:`OpenCensusConfig ` diff --git a/generated_api_shadow/envoy/config/trace/v3/opencensus.proto b/generated_api_shadow/envoy/config/trace/v3/opencensus.proto index 39313139177f..a4a8750983fc 100644 --- a/generated_api_shadow/envoy/config/trace/v3/opencensus.proto +++ b/generated_api_shadow/envoy/config/trace/v3/opencensus.proto @@ -72,11 +72,14 @@ message OpenCensusConfig { core.v3.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; + // also be set. This is deprecated, prefer to use Envoy's :ref:`native Zipkin + // tracer `. + bool zipkin_exporter_enabled = 5 [deprecated = 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]; // Enables the OpenCensus Agent exporter if set to true. The ocagent_address or // ocagent_grpc_service must also be set. diff --git a/generated_api_shadow/envoy/config/trace/v4alpha/http_tracer.proto b/generated_api_shadow/envoy/config/trace/v4alpha/http_tracer.proto index ea918ec2bff5..1c0f67f20a10 100644 --- a/generated_api_shadow/envoy/config/trace/v4alpha/http_tracer.proto +++ b/generated_api_shadow/envoy/config/trace/v4alpha/http_tracer.proto @@ -58,7 +58,7 @@ message Tracing { // See the trace drivers for examples: // // - :ref:`LightstepConfig ` - // - :ref:`ZipkinConfig ` + // - :ref:`ZipkinConfig ` // - :ref:`DynamicOtConfig ` // - :ref:`DatadogConfig ` // - :ref:`OpenCensusConfig ` diff --git a/generated_api_shadow/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto b/generated_api_shadow/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto index f64507b13827..2df94179c67e 100644 --- a/generated_api_shadow/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto +++ b/generated_api_shadow/envoy/extensions/tracers/opencensus/v4alpha/opencensus.proto @@ -69,11 +69,14 @@ message OpenCensusConfig { config.core.v4alpha.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; + // also be set. This is deprecated, prefer to use Envoy's :ref:`native Zipkin + // tracer `. + bool hidden_envoy_deprecated_zipkin_exporter_enabled = 5 [deprecated = 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 hidden_envoy_deprecated_zipkin_url = 6 [deprecated = true]; // Enables the OpenCensus Agent exporter if set to true. The ocagent_address or // ocagent_grpc_service must also be set.