diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go index f13b3bada3e..8850132105f 100644 --- a/pkg/cmd/grafana-server/commands/cli.go +++ b/pkg/cmd/grafana-server/commands/cli.go @@ -11,7 +11,9 @@ import ( "syscall" "time" + "github.com/grafana/grafana/pkg/services/featuremgmt" _ "github.com/grafana/pyroscope-go/godeltaprof/http/pprof" + "github.com/urfave/cli/v2" "github.com/grafana/grafana/pkg/api" @@ -19,10 +21,8 @@ import ( "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/process" - "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/server" "github.com/grafana/grafana/pkg/services/apiserver/standalone" - "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/setting" ) @@ -111,11 +111,6 @@ func RunServer(opts standalone.BuildInfo, cli *cli.Context) error { return err } - // Initialize tracing early to ensure it's always available for other services - if err := tracing.InitTracing(cfg); err != nil { - return err - } - s, err := server.Initialize( cli.Context, cfg, diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go index c015569cf8a..f8b340d12df 100644 --- a/pkg/infra/tracing/tracing.go +++ b/pkg/infra/tracing/tracing.go @@ -11,8 +11,6 @@ import ( "sync" "time" - "github.com/go-kit/log/level" - "github.com/grafana/dskit/services" jaegerpropagator "go.opentelemetry.io/contrib/propagators/jaeger" "go.opentelemetry.io/contrib/samplers/jaegerremote" "go.opentelemetry.io/otel" @@ -29,9 +27,11 @@ import ( "go.opentelemetry.io/otel/trace/noop" "google.golang.org/grpc/credentials" + "github.com/go-kit/log/level" + + "github.com/grafana/dskit/services" "github.com/grafana/grafana/pkg/apimachinery/errutil" "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/setting" ) const ( @@ -105,23 +105,6 @@ func ProvideService(tracingCfg *TracingConfig) (*TracingService, error) { return ots, nil } -// InitTracing initializes the tracing service with the provided configuration. -// Used to initialize tracing early to ensure it's always available for other -// services, outside of the wire context. -func InitTracing(cfg *setting.Cfg) error { - tracingCfg, err := ParseTracingConfig(cfg) - if err != nil { - return fmt.Errorf("parse tracing config: %w", err) - } - - _, err = ProvideService(tracingCfg) - if err != nil { - return fmt.Errorf("initialize tracing: %w", err) - } - - return nil -} - func NewNoopTracerService() *TracingService { tp := &noopTracerProvider{TracerProvider: noop.NewTracerProvider()} otel.SetTracerProvider(tp)