feat: Add tracing integration to profiling.

cmd/tempo/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
 	dslog "github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/spanprofiler"
 	"github.com/grafana/dskit/tracing"
 	ot "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
@@ -228,6 +229,8 @@ func installOpenTracingTracer(config *app.Config) (func(), error) {
 	if err != nil {
 		return nil, fmt.Errorf("error initialising tracer: %w", err)
 	}
+	ot.SetGlobalTracer(spanprofiler.NewTracer(ot.GlobalTracer()))
+
 	return func() {
 		if err := trace.Close(); err != nil {
 			level.Error(log.Logger).Log("msg", "error closing tracing", "err", err)
@@ -286,7 +289,7 @@ func installOpenTelemetryTracer(config *app.Config) (func(), error) {
 	bridgeTracer.SetWarningHandler(func(msg string) {
 		level.Warn(log.Logger).Log("msg", msg, "source", "BridgeTracer.OnWarningHandler")
 	})
-	ot.SetGlobalTracer(bridgeTracer)
+	ot.SetGlobalTracer(spanprofiler.NewTracer(bridgeTracer))
 
 	// Install the OpenCensus bridge
 	oc_bridge.InstallTraceBridge(oc_bridge.WithTracerProvider(tp))

modules/distributor/distributor_test.go

@@ -1492,6 +1492,10 @@ func (r mockRing) ShuffleShardWithLookback(string, int, time.Duration, time.Time
 	return r
 }
 
+func (r mockRing) GetTokenRangesForInstance(_ string) (ring.TokenRanges, error) {
+	return nil, nil
+}
+
 func (r mockRing) InstancesCount() int {
 	return len(r.ingesters)
 }
@@ -1506,7 +1510,3 @@ func (r mockRing) CleanupShuffleShardCache(string) {
 func (r mockRing) GetInstanceState(string) (ring.InstanceState, error) {
 	return ring.ACTIVE, nil
 }
-
-func (r mockRing) GetTokenRangesForInstance(_ string) (ring.TokenRanges, error) {
-	return nil, nil
-}

vendor/modules.txt

@@ -528,6 +528,7 @@ github.com/grafana/dskit/server
 github.com/grafana/dskit/services
 github.com/grafana/dskit/signals
 github.com/grafana/dskit/spanlogger
+github.com/grafana/dskit/spanprofiler
 github.com/grafana/dskit/tenant
 github.com/grafana/dskit/tracing
 github.com/grafana/dskit/user