revert zipkin support (#9)

snapp-incubator · Dec 10, 2024 · 587e322 · 587e322
1 parent 6b8d181
commit 587e322
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 281 deletions.
diff --git 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.
@@ -252,14 +252,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.
@@ -808,7 +800,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.
@@ -838,12 +830,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
@@ -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
diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go
@@ -831,7 +831,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
@@ -392,16 +392,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,
@@ -412,7 +402,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
@@ -1146,7 +1146,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
@@ -1210,12 +1210,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
@@ -5047,7 +5041,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
@@ -5112,12 +5106,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
@@ -1366,7 +1366,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
@@ -1430,12 +1430,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
@@ -5267,7 +5261,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
@@ -5332,12 +5326,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
@@ -1157,7 +1157,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
@@ -1221,12 +1221,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
@@ -5058,7 +5052,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
@@ -5123,12 +5117,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
@@ -1182,7 +1182,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
@@ -1246,12 +1246,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
@@ -5083,7 +5077,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
@@ -5148,12 +5142,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
@@ -1366,7 +1366,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
@@ -1430,12 +1430,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
@@ -5267,7 +5261,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
@@ -5332,12 +5326,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
@@ -14,16 +14,13 @@
 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"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	"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,42 +40,23 @@ 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{
 					GrpcService: GrpcService(dag.ExtensionClusterName(tracing.ExtensionService), tracing.SNI, tracing.Timeout),
 					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 {