diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d988563e8..2f76be4f52f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ * [ENHANCEMENT] Query-frontend: include route name in query stats log lines. #8191 * [ENHANCEMENT] OTLP: Speed up conversion from OTel to Mimir format by about 8% and reduce memory consumption by about 30%. Can be disabled via `-distributor.direct-otlp-translation-enabled=false` #7957 * [ENHANCEMENT] Ingester/Querier: Optimise regexps with long lists of alternates. #8221 +* [ENHANCEMENT] Ingester: Include more detail in tracing of queries. #8242 * [BUGFIX] Rules: improve error handling when querier is local to the ruler. #7567 * [BUGFIX] Querier, store-gateway: Protect against panics raised during snappy encoding. #7520 * [BUGFIX] Ingester: Prevent timely compaction of empty blocks. #7624 diff --git a/pkg/ingester/active_series.go b/pkg/ingester/active_series.go index b8233ae7b20..dc31e0ed536 100644 --- a/pkg/ingester/active_series.go +++ b/pkg/ingester/active_series.go @@ -18,6 +18,7 @@ import ( "github.com/grafana/mimir/pkg/mimirpb" "github.com/grafana/mimir/pkg/storage/sharding" "github.com/grafana/mimir/pkg/util/spanlogger" + "github.com/grafana/mimir/pkg/util/tracing" ) const activeSeriesMaxSizeBytes = 1 * 1024 * 1024 @@ -35,6 +36,7 @@ func (i *Ingester) ActiveSeries(request *client.ActiveSeriesRequest, stream clie spanlog, ctx := spanlogger.NewWithLogger(stream.Context(), i.logger, "Ingester.ActiveSeries") defer spanlog.Finish() + ctx = tracing.BridgeOpenTracingToOtel(ctx) userID, err := tenant.TenantID(ctx) if err != nil { diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index 240bee2cc6d..f62171d9995 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -68,6 +68,7 @@ import ( util_math "github.com/grafana/mimir/pkg/util/math" "github.com/grafana/mimir/pkg/util/shutdownmarker" "github.com/grafana/mimir/pkg/util/spanlogger" + "github.com/grafana/mimir/pkg/util/tracing" "github.com/grafana/mimir/pkg/util/validation" ) @@ -1550,6 +1551,7 @@ func (i *Ingester) QueryExemplars(ctx context.Context, req *client.ExemplarQuery spanlog, ctx := spanlogger.NewWithLogger(ctx, i.logger, "Ingester.QueryExemplars") defer spanlog.Finish() + ctx = tracing.BridgeOpenTracingToOtel(ctx) userID, err := tenant.TenantID(ctx) if err != nil { @@ -1996,6 +1998,7 @@ func (i *Ingester) QueryStream(req *client.QueryRequest, stream client.Ingester_ spanlog, ctx := spanlogger.NewWithLogger(stream.Context(), i.logger, "Ingester.QueryStream") defer spanlog.Finish() + ctx = tracing.BridgeOpenTracingToOtel(ctx) userID, err := tenant.TenantID(ctx) if err != nil {