From 1a7e9ba5fd5a824dadf87ace2ef2ca325f2ba6ee Mon Sep 17 00:00:00 2001 From: Ahmad Karimi Date: Thu, 20 Jun 2024 13:58:34 +0330 Subject: [PATCH] revert zipkin support --- apis/projectcontour/v1alpha1/contourconfig.go | 18 +---- .../v1alpha1/contourconfig_helpers.go | 8 -- .../v1alpha1/zz_generated.deepcopy.go | 5 -- cmd/contour/serve.go | 1 - cmd/contour/servecontext.go | 11 --- examples/contour/01-crds.yaml | 16 +--- examples/render/contour-deployment.yaml | 16 +--- .../render/contour-gateway-provisioner.yaml | 16 +--- examples/render/contour-gateway.yaml | 16 +--- examples/render/contour.yaml | 16 +--- internal/envoy/v3/tracing.go | 29 +------ internal/envoy/v3/tracing_test.go | 80 +------------------ internal/xdscache/v3/listener.go | 3 - pkg/config/parameters.go | 26 +----- .../docs/main/config/api-reference.html | 45 +---------- 15 files changed, 25 insertions(+), 281 deletions(-) diff --git a/apis/projectcontour/v1alpha1/contourconfig.go b/apis/projectcontour/v1alpha1/contourconfig.go index 6d2d1c9734d..308ea6cd607 100644 --- a/apis/projectcontour/v1alpha1/contourconfig.go +++ b/apis/projectcontour/v1alpha1/contourconfig.go @@ -82,7 +82,7 @@ type ContourConfigurationSpec struct { // +optional Metrics *MetricsConfig `json:"metrics,omitempty"` - // Tracing defines properties for exporting trace data to the tracing system. + // Tracing defines properties for exporting trace data to the OpenTelemetry. Tracing *TracingConfig `json:"tracing,omitempty"` // FeatureFlags defines toggle to enable new contour features. @@ -245,14 +245,6 @@ const ( HTTPVersion2 HTTPVersionType = "HTTP/2" ) -// TracingSystem is the tracing system used in Envoy -type TracingSystem string - -const ( - TracingSystemOpenTelemetry TracingSystem = "opentelemetry" - TracingSystemZipkin TracingSystem = "zipkin" -) - // EnvoyConfig defines how Envoy is to be Configured from Contour. type EnvoyConfig struct { // Listener hold various configurable Envoy listener values. @@ -801,7 +793,7 @@ type RateLimitServiceConfig struct { DefaultGlobalRateLimitPolicy *contour_v1.GlobalRateLimitPolicy `json:"defaultGlobalRateLimitPolicy,omitempty"` } -// TracingConfig defines properties for exporting trace data to the tracing system. +// TracingConfig defines properties for exporting trace data to OpenTelemetry. type TracingConfig struct { // IncludePodDetail defines a flag. // If it is true, contour will add the pod name and namespace to the span of the trace. @@ -831,12 +823,6 @@ type TracingConfig struct { // ExtensionService identifies the extension service defining the otel-collector. ExtensionService *NamespacedName `json:"extensionService"` - - // System specifies the tracing system used in Evnoy. - // Supported systems are "opentelemetry" and "zipkin". - // Defaults to "opentelemetry". - // +optional - System *TracingSystem `json:"system"` } // CustomTag defines custom tags with unique tag name diff --git a/apis/projectcontour/v1alpha1/contourconfig_helpers.go b/apis/projectcontour/v1alpha1/contourconfig_helpers.go index 83d260a30ee..e0726dfc387 100644 --- a/apis/projectcontour/v1alpha1/contourconfig_helpers.go +++ b/apis/projectcontour/v1alpha1/contourconfig_helpers.go @@ -98,14 +98,6 @@ func (t *TracingConfig) Validate() error { customTagNames = append(customTagNames, customTag.TagName) } - if t.System != nil { - switch *t.System { - case TracingSystemOpenTelemetry, TracingSystemZipkin: - default: - return fmt.Errorf("invalid tracing system %q", *t.System) - } - } - return nil } diff --git a/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go b/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go index 6872977b922..73540e8a94b 100644 --- a/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go +++ b/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go @@ -1325,11 +1325,6 @@ func (in *TracingConfig) DeepCopyInto(out *TracingConfig) { *out = new(NamespacedName) **out = **in } - if in.System != nil { - in, out := &in.System, &out.System - *out = new(TracingSystem) - **out = **in - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TracingConfig. diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go index c89a1e87a45..603c5b3d27f 100644 --- a/cmd/contour/serve.go +++ b/cmd/contour/serve.go @@ -830,7 +830,6 @@ func (s *Server) setupTracingService(tracingConfig *contour_v1alpha1.TracingConf OverallSampling: overallSampling, MaxPathTagLength: ptr.Deref(tracingConfig.MaxPathTagLength, 256), CustomTags: customTags, - System: ptr.Deref(tracingConfig.System, contour_v1alpha1.TracingSystemOpenTelemetry), }, nil } diff --git a/cmd/contour/servecontext.go b/cmd/contour/servecontext.go index a12dae324d7..7ef8111980a 100644 --- a/cmd/contour/servecontext.go +++ b/cmd/contour/servecontext.go @@ -390,16 +390,6 @@ func (ctx *serveContext) convertToContourConfigurationSpec() contour_v1alpha1.Co }) } - var tracingSystem *contour_v1alpha1.TracingSystem - if ctx.Config.Tracing.System != nil { - switch *ctx.Config.Tracing.System { - case config.TracingSystemOpenTelemetry: - tracingSystem = ptr.To(contour_v1alpha1.TracingSystemOpenTelemetry) - case config.TracingSystemZipkin: - tracingSystem = ptr.To(contour_v1alpha1.TracingSystemZipkin) - } - } - tracingConfig = &contour_v1alpha1.TracingConfig{ IncludePodDetail: ctx.Config.Tracing.IncludePodDetail, ServiceName: ctx.Config.Tracing.ServiceName, @@ -410,7 +400,6 @@ func (ctx *serveContext) convertToContourConfigurationSpec() contour_v1alpha1.Co Name: namespacedName.Name, Namespace: namespacedName.Namespace, }, - System: tracingSystem, } } diff --git a/examples/contour/01-crds.yaml b/examples/contour/01-crds.yaml index b9facce6caa..0b8d1bd81a8 100644 --- a/examples/contour/01-crds.yaml +++ b/examples/contour/01-crds.yaml @@ -1131,7 +1131,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data to - the tracing system. + the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with unique @@ -1195,12 +1195,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object @@ -4949,7 +4943,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data - to the tracing system. + to the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with @@ -5014,12 +5008,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml index 8f8ac4420db..9347f8a2892 100644 --- a/examples/render/contour-deployment.yaml +++ b/examples/render/contour-deployment.yaml @@ -1351,7 +1351,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data to - the tracing system. + the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with unique @@ -1415,12 +1415,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object @@ -5169,7 +5163,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data - to the tracing system. + to the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with @@ -5234,12 +5228,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object diff --git a/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner.yaml index 3bd6136bb3c..350ba6d33f3 100644 --- a/examples/render/contour-gateway-provisioner.yaml +++ b/examples/render/contour-gateway-provisioner.yaml @@ -1142,7 +1142,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data to - the tracing system. + the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with unique @@ -1206,12 +1206,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object @@ -4960,7 +4954,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data - to the tracing system. + to the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with @@ -5025,12 +5019,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object diff --git a/examples/render/contour-gateway.yaml b/examples/render/contour-gateway.yaml index 64a248464bd..ca2cecdacf2 100644 --- a/examples/render/contour-gateway.yaml +++ b/examples/render/contour-gateway.yaml @@ -1167,7 +1167,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data to - the tracing system. + the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with unique @@ -1231,12 +1231,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object @@ -4985,7 +4979,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data - to the tracing system. + to the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with @@ -5050,12 +5044,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml index 33bad7adfa9..20232909afd 100644 --- a/examples/render/contour.yaml +++ b/examples/render/contour.yaml @@ -1351,7 +1351,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data to - the tracing system. + the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with unique @@ -1415,12 +1415,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object @@ -5169,7 +5163,7 @@ spec: type: object tracing: description: Tracing defines properties for exporting trace data - to the tracing system. + to the OpenTelemetry. properties: customTags: description: CustomTags defines a list of custom tags with @@ -5234,12 +5228,6 @@ spec: ServiceName defines the name for the service. contour's default is contour. type: string - system: - description: |- - System specifies the tracing system used in Evnoy. - Supported systems are "opentelemetry" and "zipkin". - Defaults to "opentelemetry". - type: string required: - extensionService type: object diff --git a/internal/envoy/v3/tracing.go b/internal/envoy/v3/tracing.go index e9a1e8b2317..05bbc615eec 100644 --- a/internal/envoy/v3/tracing.go +++ b/internal/envoy/v3/tracing.go @@ -14,8 +14,6 @@ package v3 import ( - "strings" - envoy_config_trace_v3 "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3" envoy_filter_network_http_connection_manager_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" envoy_trace_v3 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3" @@ -23,7 +21,6 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" "k8s.io/apimachinery/pkg/types" - contour_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1" "github.com/projectcontour/contour/internal/dag" "github.com/projectcontour/contour/internal/protobuf" "github.com/projectcontour/contour/internal/timeout" @@ -43,18 +40,14 @@ func TracingConfig(tracing *EnvoyTracingConfig) *envoy_filter_network_http_conne } } - connManagerTracing := &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ + return &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ OverallSampling: &envoy_type_v3.Percent{ Value: tracing.OverallSampling, }, MaxPathTagLength: wrapperspb.UInt32(tracing.MaxPathTagLength), CustomTags: customTags, SpawnUpstreamSpan: wrapperspb.Bool(true), - } - - switch tracing.System { - case contour_v1alpha1.TracingSystemOpenTelemetry: - connManagerTracing.Provider = &envoy_config_trace_v3.Tracing_Http{ + Provider: &envoy_config_trace_v3.Tracing_Http{ Name: "envoy.tracers.opentelemetry", ConfigType: &envoy_config_trace_v3.Tracing_Http_TypedConfig{ TypedConfig: protobuf.MustMarshalAny(&envoy_config_trace_v3.OpenTelemetryConfig{ @@ -62,23 +55,8 @@ func TracingConfig(tracing *EnvoyTracingConfig) *envoy_filter_network_http_conne ServiceName: tracing.ServiceName, }), }, - } - case contour_v1alpha1.TracingSystemZipkin: - connManagerTracing.Provider = &envoy_config_trace_v3.Tracing_Http{ - Name: "envoy.tracers.zipkin", - ConfigType: &envoy_config_trace_v3.Tracing_Http_TypedConfig{ - TypedConfig: protobuf.MustMarshalAny(&envoy_config_trace_v3.ZipkinConfig{ - CollectorCluster: dag.ExtensionClusterName(tracing.ExtensionService), - CollectorHostname: strings.ReplaceAll(dag.ExtensionClusterName(tracing.ExtensionService), "/", "."), - CollectorEndpoint: "/api/v2/spans", - SharedSpanContext: wrapperspb.Bool(false), - CollectorEndpointVersion: envoy_config_trace_v3.ZipkinConfig_HTTP_JSON, - }), - }, - } + }, } - - return connManagerTracing } func customTag(tag *CustomTag) *envoy_trace_v3.CustomTag { @@ -126,7 +104,6 @@ type EnvoyTracingConfig struct { OverallSampling float64 MaxPathTagLength uint32 CustomTags []*CustomTag - System contour_v1alpha1.TracingSystem } type CustomTag struct { diff --git a/internal/envoy/v3/tracing_test.go b/internal/envoy/v3/tracing_test.go index 298e49c9ebd..e02ed7d114f 100644 --- a/internal/envoy/v3/tracing_test.go +++ b/internal/envoy/v3/tracing_test.go @@ -26,7 +26,6 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" - contour_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1" "github.com/projectcontour/contour/internal/k8s" "github.com/projectcontour/contour/internal/protobuf" "github.com/projectcontour/contour/internal/timeout" @@ -41,7 +40,7 @@ func TestTracingConfig(t *testing.T) { tracing: nil, want: nil, }, - "opentelemtry normal config": { + "normal config": { tracing: &EnvoyTracingConfig{ ExtensionService: k8s.NamespacedNameFrom("projectcontour/otel-collector"), ServiceName: "contour", @@ -63,7 +62,6 @@ func TestTracingConfig(t *testing.T) { RequestHeaderName: ":path", }, }, - System: contour_v1alpha1.TracingSystemOpenTelemetry, }, want: &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ OverallSampling: &envoy_type_v3.Percent{ @@ -116,7 +114,7 @@ func TestTracingConfig(t *testing.T) { SpawnUpstreamSpan: wrapperspb.Bool(true), }, }, - "opentelemtry no custom tag": { + "no custom tag": { tracing: &EnvoyTracingConfig{ ExtensionService: k8s.NamespacedNameFrom("projectcontour/otel-collector"), ServiceName: "contour", @@ -125,7 +123,6 @@ func TestTracingConfig(t *testing.T) { OverallSampling: 100, MaxPathTagLength: 256, CustomTags: nil, - System: contour_v1alpha1.TracingSystemOpenTelemetry, }, want: &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ OverallSampling: &envoy_type_v3.Percent{ @@ -153,7 +150,7 @@ func TestTracingConfig(t *testing.T) { SpawnUpstreamSpan: wrapperspb.Bool(true), }, }, - "opentelemtry no SNI set": { + "no SNI set": { tracing: &EnvoyTracingConfig{ ExtensionService: k8s.NamespacedNameFrom("projectcontour/otel-collector"), ServiceName: "contour", @@ -162,7 +159,6 @@ func TestTracingConfig(t *testing.T) { OverallSampling: 100, MaxPathTagLength: 256, CustomTags: nil, - System: contour_v1alpha1.TracingSystemOpenTelemetry, }, want: &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ OverallSampling: &envoy_type_v3.Percent{ @@ -190,76 +186,6 @@ func TestTracingConfig(t *testing.T) { SpawnUpstreamSpan: wrapperspb.Bool(true), }, }, - "zipkin normal config": { - tracing: &EnvoyTracingConfig{ - ExtensionService: k8s.NamespacedNameFrom("projectcontour/otel-collector"), - ServiceName: "contour", - SNI: "some-server.com", - Timeout: timeout.DurationSetting(5 * time.Second), - OverallSampling: 100, - MaxPathTagLength: 256, - CustomTags: []*CustomTag{ - { - TagName: "literal", - Literal: "this is literal", - }, - { - TagName: "podName", - EnvironmentName: "HOSTNAME", - }, - { - TagName: "requestHeaderName", - RequestHeaderName: ":path", - }, - }, - System: contour_v1alpha1.TracingSystemZipkin, - }, - want: &envoy_filter_network_http_connection_manager_v3.HttpConnectionManager_Tracing{ - OverallSampling: &envoy_type_v3.Percent{ - Value: 100.0, - }, - MaxPathTagLength: wrapperspb.UInt32(256), - CustomTags: []*envoy_trace_v3.CustomTag{ - { - Tag: "literal", - Type: &envoy_trace_v3.CustomTag_Literal_{ - Literal: &envoy_trace_v3.CustomTag_Literal{ - Value: "this is literal", - }, - }, - }, - { - Tag: "podName", - Type: &envoy_trace_v3.CustomTag_Environment_{ - Environment: &envoy_trace_v3.CustomTag_Environment{ - Name: "HOSTNAME", - }, - }, - }, - { - Tag: "requestHeaderName", - Type: &envoy_trace_v3.CustomTag_RequestHeader{ - RequestHeader: &envoy_trace_v3.CustomTag_Header{ - Name: ":path", - }, - }, - }, - }, - Provider: &envoy_config_trace_v3.Tracing_Http{ - Name: "envoy.tracers.zipkin", - ConfigType: &envoy_config_trace_v3.Tracing_Http_TypedConfig{ - TypedConfig: protobuf.MustMarshalAny(&envoy_config_trace_v3.ZipkinConfig{ - CollectorCluster: "extension/projectcontour/otel-collector", - CollectorHostname: "extension.projectcontour.otel-collector", - CollectorEndpoint: "/api/v2/spans", - SharedSpanContext: wrapperspb.Bool(false), - CollectorEndpointVersion: envoy_config_trace_v3.ZipkinConfig_HTTP_JSON, - }), - }, - }, - SpawnUpstreamSpan: wrapperspb.Bool(true), - }, - }, } for name, tc := range tests { t.Run(name, func(t *testing.T) { diff --git a/internal/xdscache/v3/listener.go b/internal/xdscache/v3/listener.go index 7788d033041..ad3ddcbe289 100644 --- a/internal/xdscache/v3/listener.go +++ b/internal/xdscache/v3/listener.go @@ -169,8 +169,6 @@ type TracingConfig struct { MaxPathTagLength uint32 CustomTags []*CustomTag - - System contour_v1alpha1.TracingSystem } type CustomTag struct { @@ -659,7 +657,6 @@ func envoyTracingConfig(config *TracingConfig) *envoy_v3.EnvoyTracingConfig { OverallSampling: config.OverallSampling, MaxPathTagLength: config.MaxPathTagLength, CustomTags: envoyTracingConfigCustomTag(config.CustomTags), - System: config.System, } } diff --git a/pkg/config/parameters.go b/pkg/config/parameters.go index d7b26e9f08b..a3831d376c8 100644 --- a/pkg/config/parameters.go +++ b/pkg/config/parameters.go @@ -155,24 +155,10 @@ func (h HTTPVersionType) Validate() error { } const ( - HTTPVersion1 HTTPVersionType = "http/1.1" - HTTPVersion2 HTTPVersionType = "http/2" - TracingSystemOpenTelemetry TracingSystem = "opentelemetry" - TracingSystemZipkin TracingSystem = "zipkin" + HTTPVersion1 HTTPVersionType = "http/1.1" + HTTPVersion2 HTTPVersionType = "http/2" ) -// TracingSystem is the tracing system used in Envoy -type TracingSystem string - -func (h TracingSystem) Validate() error { - switch h { - case TracingSystemOpenTelemetry, TracingSystemZipkin: - return nil - default: - return fmt.Errorf("invalid tracing system %q", h) - } -} - // NamespacedName defines the namespace/name of the Kubernetes resource referred from the configuration file. // Used for Contour configuration YAML file parsing, otherwise we could use K8s types.NamespacedName. type NamespacedName struct { @@ -717,7 +703,7 @@ type Parameters struct { // MetricsParameters holds configurable parameters for Contour and Envoy metrics. Metrics MetricsParameters `yaml:"metrics,omitempty"` - // Tracing holds the relevant configuration for exporting trace data to the tracing system. + // Tracing holds the relevant configuration for exporting trace data to OpenTelemetry. Tracing *Tracing `yaml:"tracing,omitempty"` // FeatureFlags defines toggle to enable new contour features. @@ -728,7 +714,7 @@ type Parameters struct { FeatureFlags []string `yaml:"featureFlags,omitempty"` } -// Tracing defines properties for exporting trace data to the tracing system. +// Tracing defines properties for exporting trace data to OpenTelemetry. type Tracing struct { // IncludePodDetail defines a flag. // If it is true, contour will add the pod name and namespace to the span of the trace. @@ -755,10 +741,6 @@ type Tracing struct { // ExtensionService identifies the extension service defining the otel-collector, // formatted as /. ExtensionService string `yaml:"extensionService"` - - // System Specifies the tracing system to use. Supported systems are - // "zipkin" and "opentelemetry". - System *TracingSystem `yaml:"system"` } // CustomTag defines custom tags with unique tag name diff --git a/site/content/docs/main/config/api-reference.html b/site/content/docs/main/config/api-reference.html index d517ba8f4fe..cac1c0079ec 100644 --- a/site/content/docs/main/config/api-reference.html +++ b/site/content/docs/main/config/api-reference.html @@ -5423,7 +5423,7 @@

ContourConfiguration -

Tracing defines properties for exporting trace data to the tracing system.

+

Tracing defines properties for exporting trace data to the OpenTelemetry.

@@ -6216,7 +6216,7 @@

ContourConfiguratio -

Tracing defines properties for exporting trace data to the tracing system.

+

Tracing defines properties for exporting trace data to the OpenTelemetry.

@@ -9152,7 +9152,7 @@

TracingConfig ContourConfigurationSpec)

-

TracingConfig defines properties for exporting trace data to the tracing system.

+

TracingConfig defines properties for exporting trace data to OpenTelemetry.

@@ -9249,47 +9249,8 @@

TracingConfig

ExtensionService identifies the extension service defining the otel-collector.

-

- - -
-system -
- - -TracingSystem - - -		 -(Optional) -

System specifies the tracing system used in Evnoy. -Supported systems are “opentelemetry” and “zipkin”. -Defaults to “opentelemetry”.

-
-

TracingSystem -(string alias)

-

-(Appears on: -TracingConfig) -

-

-

TracingSystem is the tracing system used in Envoy

-

- - - - - - - - - - - - -
ValueDescription

"opentelemetry"

"zipkin"

WorkloadType (string alias)