fix tracing-provider config

uswitch · Jan 31, 2024 · 5a75ea8 · 5a75ea8
1 parent 6d5c95c
commit 5a75ea8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -243,6 +243,7 @@ func main(*cobra.Command, []string) error {
 		envoy.WithSyncSecrets(c.SyncSecrets),
 		envoy.WithDefaultRetryOn(viper.GetString("retryOn")),
 		envoy.WithAccessLog(c.AccessLogger),
+		envoy.WithTracingProvider(viper.GetString("tracingProvider")),
 	)
 	snapshotter := envoy.NewSnapshotter(envoyCache, configurator, aggregator)
 

diff --git a/pkg/envoy/boilerplate.go b/pkg/envoy/boilerplate.go
@@ -216,7 +216,7 @@ func makeZipkinTracingProvider() *tracing.ZipkinConfig {
 	return zipkinTracingProviderConfig
 }
 
-func (c *KubernetesConfigurator) makeConnectionManager(virtualHosts []*route.VirtualHost, tracingProvider string) (*hcm.HttpConnectionManager, error) {
+func (c *KubernetesConfigurator) makeConnectionManager(virtualHosts []*route.VirtualHost) (*hcm.HttpConnectionManager, error) {
 	// Access Logs
 	accessLogConfig := makeFileAccessLog(c.accessLogger)
 	anyAccessLogConfig, err := anypb.New(accessLogConfig)
@@ -274,7 +274,7 @@ func (c *KubernetesConfigurator) makeConnectionManager(virtualHosts []*route.Vir
 
 	tracingProviderConfig := &hcm.HttpConnectionManager_Tracing{}
 
-	if tracingProvider == "zipkin" {
+	if c.tracingProvider == "zipkin" {
 		zipkinTracingProvider, err := anypb.New(makeZipkinTracingProvider())
 		if err != nil {
 			log.Fatal(err)
@@ -310,7 +310,7 @@ func (c *KubernetesConfigurator) makeConnectionManager(virtualHosts []*route.Vir
 }
 
 func (c *KubernetesConfigurator) makeFilterChain(certificate Certificate, virtualHosts []*route.VirtualHost) (listener.FilterChain, error) {
-	httpConnectionManager, err := c.makeConnectionManager(virtualHosts, c.tracingProvider)
+	httpConnectionManager, err := c.makeConnectionManager(virtualHosts)
 	if err != nil {
 		return listener.FilterChain{}, fmt.Errorf("failed to get httpConnectionManager: %s", err)
 	}

diff --git a/pkg/envoy/configurator.go b/pkg/envoy/configurator.go
@@ -237,7 +237,7 @@ func (c *KubernetesConfigurator) generateHTTPFilterChain(config *envoyConfigurat
 		virtualHosts = append(virtualHosts, vhost)
 	}
 
-	httpConnectionManager, err := c.makeConnectionManager(virtualHosts, c.tracingProvider)
+	httpConnectionManager, err := c.makeConnectionManager(virtualHosts)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/envoy/options.go b/pkg/envoy/options.go
@@ -85,3 +85,10 @@ func WithAccessLog(accessLogger AccessLogger) option {
 		c.accessLogger = accessLogger
 	}
 }
+
+// WithTracingProvider configures the tracing provider for HTTP connection manager
+func WithTracingProvider(tracingProvider string) option {
+	return func(c *KubernetesConfigurator) {
+		c.tracingProvider = tracingProvider
+	}
+}