Proper shutdown tracer when the work is done

knative · Aug 17, 2022 · 2e34855 · 2e34855
1 parent dbd3fc3
commit 2e34855
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/cmd/activator/main.go b/cmd/activator/main.go
@@ -192,6 +192,7 @@ func main() {
 	go throttler.Run(ctx, transport, networkConfig.EnableMeshPodAddressability, networkConfig.MeshCompatibilityMode)
 
 	oct := tracing.NewOpenCensusTracer(tracing.WithExporterFull(networking.ActivatorServiceName, env.PodIP, logger))
+	defer oct.Shutdown(context.Background())
 
 	tracerUpdater := configmap.TypeFilter(&tracingconfig.Config{})(func(name string, value interface{}) {
 		cfg := value.(*tracingconfig.Config)

diff --git a/pkg/queue/sharedmain/main.go b/pkg/queue/sharedmain/main.go
@@ -192,7 +192,18 @@ func Main(opts ...Option) error {
 		zap.String(logkey.Pod, env.ServingPod))
 
 	d.Logger = logger
-	d.Transport = buildTransport(env, logger)
+	d.Transport = buildTransport(env)
+
+	if env.TracingConfigBackend != tracingconfig.None {
+		oct := tracing.NewOpenCensusTracer(tracing.WithExporterFull(env.ServingPod, env.ServingPodIP, logger))
+		oct.ApplyConfig(&tracingconfig.Config{
+			Backend:        env.TracingConfigBackend,
+			Debug:          env.TracingConfigDebug,
+			ZipkinEndpoint: env.TracingConfigZipkinEndpoint,
+			SampleRate:     env.TracingConfigSampleRate,
+		})
+		defer oct.Shutdown(context.Background())
+	}
 
 	// allow extensions to read d and return modified context and transport
 	for _, opts := range opts {
@@ -400,7 +411,7 @@ func buildServer(ctx context.Context, env config, transport http.RoundTripper, p
 	return pkgnet.NewServer(":"+env.QueueServingPort, composedHandler), drainer.Drain
 }
 
-func buildTransport(env config, logger *zap.SugaredLogger) http.RoundTripper {
+func buildTransport(env config) http.RoundTripper {
 	maxIdleConns := 1000 // TODO: somewhat arbitrary value for CC=0, needs experimental validation.
 	if env.ContainerConcurrency > 0 {
 		maxIdleConns = env.ContainerConcurrency
@@ -412,14 +423,6 @@ func buildTransport(env config, logger *zap.SugaredLogger) http.RoundTripper {
 		return transport
 	}
 
-	oct := tracing.NewOpenCensusTracer(tracing.WithExporterFull(env.ServingPod, env.ServingPodIP, logger))
-	oct.ApplyConfig(&tracingconfig.Config{
-		Backend:        env.TracingConfigBackend,
-		Debug:          env.TracingConfigDebug,
-		ZipkinEndpoint: env.TracingConfigZipkinEndpoint,
-		SampleRate:     env.TracingConfigSampleRate,
-	})
-
 	return &ochttp.Transport{
 		Base:        transport,
 		Propagation: tracecontextb3.TraceContextB3Egress,