api: embed tracing provider config into `http_connection_manager` (#10324)

Signed-off-by: Yaroslav Skopets <y.skopets@gmail.com>

Mirrored from https://github.com/envoyproxy/envoy @ a22b9371dffe7097675d2531bda38b84f1b6ba45
master-ci-test
data-plane-api(CircleCI) 5 years ago
parent 62dff62935
commit 11a576ae74
  1. 1
      envoy/config/filter/network/http_connection_manager/v2/BUILD
  2. 9
      envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
  3. 1
      envoy/extensions/filters/network/http_connection_manager/v3/BUILD
  4. 9
      envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto

@ -10,6 +10,7 @@ api_proto_package(
"//envoy/api/v2:pkg", "//envoy/api/v2:pkg",
"//envoy/api/v2/core:pkg", "//envoy/api/v2/core:pkg",
"//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/filter/accesslog/v2:pkg",
"//envoy/config/trace/v2:pkg",
"//envoy/type:pkg", "//envoy/type:pkg",
"//envoy/type/tracing/v2:pkg", "//envoy/type/tracing/v2:pkg",
"@com_github_cncf_udpa//udpa/annotations:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg",

@ -7,6 +7,7 @@ import "envoy/api/v2/core/protocol.proto";
import "envoy/api/v2/route.proto"; import "envoy/api/v2/route.proto";
import "envoy/api/v2/scoped_route.proto"; import "envoy/api/v2/scoped_route.proto";
import "envoy/config/filter/accesslog/v2/accesslog.proto"; import "envoy/config/filter/accesslog/v2/accesslog.proto";
import "envoy/config/trace/v2/trace.proto";
import "envoy/type/percent.proto"; import "envoy/type/percent.proto";
import "envoy/type/tracing/v2/custom_tag.proto"; import "envoy/type/tracing/v2/custom_tag.proto";
@ -89,7 +90,7 @@ message HttpConnectionManager {
ALWAYS_FORWARD_ONLY = 4; ALWAYS_FORWARD_ONLY = 4;
} }
// [#next-free-field: 9] // [#next-free-field: 10]
message Tracing { message Tracing {
enum OperationName { enum OperationName {
// The HTTP listener is used for ingress/incoming requests. // The HTTP listener is used for ingress/incoming requests.
@ -156,6 +157,12 @@ message HttpConnectionManager {
// A list of custom tags with unique tag name to create tags for the active span. // A list of custom tags with unique tag name to create tags for the active span.
repeated type.tracing.v2.CustomTag custom_tags = 8; repeated type.tracing.v2.CustomTag custom_tags = 8;
// Configuration for an external tracing provider.
// If not specified, Envoy will fall back to using tracing provider configuration
// from the bootstrap config.
// [#not-implemented-hide:]
trace.v2.Tracing.Http provider = 9;
} }
message InternalAddressConfig { message InternalAddressConfig {

@ -11,6 +11,7 @@ api_proto_package(
"//envoy/config/core/v3:pkg", "//envoy/config/core/v3:pkg",
"//envoy/config/filter/network/http_connection_manager/v2:pkg", "//envoy/config/filter/network/http_connection_manager/v2:pkg",
"//envoy/config/route/v3:pkg", "//envoy/config/route/v3:pkg",
"//envoy/config/trace/v3:pkg",
"//envoy/type/tracing/v3:pkg", "//envoy/type/tracing/v3:pkg",
"//envoy/type/v3:pkg", "//envoy/type/v3:pkg",
"@com_github_cncf_udpa//udpa/annotations:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg",

@ -7,6 +7,7 @@ import "envoy/config/core/v3/config_source.proto";
import "envoy/config/core/v3/protocol.proto"; import "envoy/config/core/v3/protocol.proto";
import "envoy/config/route/v3/route.proto"; import "envoy/config/route/v3/route.proto";
import "envoy/config/route/v3/scoped_route.proto"; import "envoy/config/route/v3/scoped_route.proto";
import "envoy/config/trace/v3/trace.proto";
import "envoy/type/tracing/v3/custom_tag.proto"; import "envoy/type/tracing/v3/custom_tag.proto";
import "envoy/type/v3/percent.proto"; import "envoy/type/v3/percent.proto";
@ -91,7 +92,7 @@ message HttpConnectionManager {
ALWAYS_FORWARD_ONLY = 4; ALWAYS_FORWARD_ONLY = 4;
} }
// [#next-free-field: 9] // [#next-free-field: 10]
message Tracing { message Tracing {
option (udpa.annotations.versioning).previous_message_type = option (udpa.annotations.versioning).previous_message_type =
"envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing"; "envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing";
@ -144,6 +145,12 @@ message HttpConnectionManager {
// A list of custom tags with unique tag name to create tags for the active span. // A list of custom tags with unique tag name to create tags for the active span.
repeated type.tracing.v3.CustomTag custom_tags = 8; repeated type.tracing.v3.CustomTag custom_tags = 8;
// Configuration for an external tracing provider.
// If not specified, Envoy will fall back to using tracing provider configuration
// from the bootstrap config.
// [#not-implemented-hide:]
config.trace.v3.Tracing.Http provider = 9;
} }
message InternalAddressConfig { message InternalAddressConfig {

Loading…
Cancel
Save