diff --git a/pkg/queue/sharedmain/main.go b/pkg/queue/sharedmain/main.go index b8d035c1081e..51c173080396 100644 --- a/pkg/queue/sharedmain/main.go +++ b/pkg/queue/sharedmain/main.go @@ -104,10 +104,11 @@ type config struct { MetricsCollectorAddress string `split_words:"true"` // optional // Tracing configuration - TracingConfigDebug bool `split_words:"true"` // optional - TracingConfigBackend tracingconfig.BackendType `split_words:"true"` // optional - TracingConfigSampleRate float64 `split_words:"true"` // optional - TracingConfigZipkinEndpoint string `split_words:"true"` // optional + TracingConfigDebug bool `split_words:"true"` // optional + TracingConfigBackend tracingconfig.BackendType `split_words:"true"` // optional + TracingConfigSampleRate float64 `split_words:"true"` // optional + TracingConfigZipkinEndpoint string `split_words:"true"` // optional + TracingConfigUseServingService bool `split_words:"true"` // optional Env } @@ -194,7 +195,12 @@ func Main(opts ...Option) error { d.Transport = buildTransport(env) if env.TracingConfigBackend != tracingconfig.None { - oct := tracing.NewOpenCensusTracer(tracing.WithExporterFull(env.ServingPod, env.ServingPodIP, logger)) + tracingServiceName := env.ServingPod + if env.TracingConfigUseServingService { + tracingServiceName = env.ServingService + } + + oct := tracing.NewOpenCensusTracer(tracing.WithExporterFull(tracingServiceName, env.ServingPodIP, logger)) oct.ApplyConfig(&tracingconfig.Config{ Backend: env.TracingConfigBackend, Debug: env.TracingConfigDebug, diff --git a/pkg/reconciler/revision/resources/queue.go b/pkg/reconciler/revision/resources/queue.go index 1ef7f58e40b0..07b8fa0b66a7 100644 --- a/pkg/reconciler/revision/resources/queue.go +++ b/pkg/reconciler/revision/resources/queue.go @@ -422,6 +422,9 @@ func makeQueueContainer(rev *v1.Revision, cfg *config.Config) (*corev1.Container }, { Name: "TRACING_CONFIG_SAMPLE_RATE", Value: fmt.Sprint(cfg.Tracing.SampleRate), + }, { + Name: "TRACING_CONFIG_USE_SERVING_SERVICE", + Value: fmt.Sprint(cfg.Tracing.UseServingService), }, { Name: "USER_PORT", Value: strconv.Itoa(int(userPort)),