From 57e2a5687676a9e651189551920dce3b0e69a106 Mon Sep 17 00:00:00 2001 From: Charandas <542168+charandas@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:57:58 -0700 Subject: [PATCH] K8s: fix tracer init by moving Config() above it (#90311) --- pkg/cmd/grafana/apiserver/cmd.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/grafana/apiserver/cmd.go b/pkg/cmd/grafana/apiserver/cmd.go index 585e00ebb5a..1d18265d8e6 100644 --- a/pkg/cmd/grafana/apiserver/cmd.go +++ b/pkg/cmd/grafana/apiserver/cmd.go @@ -74,15 +74,17 @@ func newCommandStartExampleAPIServer(o *APIServerOptions, stopCh <-chan struct{} return err } - if o.Options.TracingOptions.TracingService != nil { - tracer.InitTracer(o.Options.TracingOptions.TracingService) - } - + // o.Config(tracer) definitely needs to happen before we override the tracer below + // using tracer.InitTracer with the real tracer config, err := o.Config(tracer) if err != nil { return err } + if o.Options.TracingOptions.TracingService != nil { + tracer.InitTracer(o.Options.TracingOptions.TracingService) + } + defer o.factory.Shutdown() if err := o.RunAPIServer(config, stopCh); err != nil {