Fix objstore tracing instrumentation (#5074)

* fix objstore tracing instrumentation

Signed-off-by: Ben Ye <[email protected]>

* add changelog

Signed-off-by: Ben Ye <[email protected]>

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

CHANGELOG.md

@@ -20,6 +20,7 @@
 * [BUGFIX] Updated `golang.org/x/net` dependency to fix CVE-2022-27664. #5008
 * [BUGFIX] Fix panic when otel and xray tracing is enabled. #5044
 * [BUGFIX] Fixed no compact block got grouped in shuffle sharding grouper. #5055
+* [BUGFIX] Tracing: Fix missing object storage span instrumentation. #5074
 
 ## 1.14.0 2022-12-02
 

pkg/cortex/tracing.go

@@ -4,21 +4,24 @@ import (
 	"context"
 
 	"github.com/opentracing/opentracing-go"
+	objstoretracing "github.com/thanos-io/objstore/tracing"
 	"github.com/thanos-io/thanos/pkg/tracing"
 	"google.golang.org/grpc"
 )
 
 // ThanosTracerUnaryInterceptor injects the opentracing global tracer into the context
 // in order to get it picked up by Thanos components.
 func ThanosTracerUnaryInterceptor(ctx context.Context, req interface{}, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	ctx = objstoretracing.ContextWithTracer(ctx, opentracing.GlobalTracer())
 	return handler(tracing.ContextWithTracer(ctx, opentracing.GlobalTracer()), req)
 }
 
 // ThanosTracerStreamInterceptor injects the opentracing global tracer into the context
 // in order to get it picked up by Thanos components.
 func ThanosTracerStreamInterceptor(srv interface{}, ss grpc.ServerStream, _ *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+	ctx := objstoretracing.ContextWithTracer(ss.Context(), opentracing.GlobalTracer())
 	return handler(srv, wrappedServerStream{
-		ctx:          tracing.ContextWithTracer(ss.Context(), opentracing.GlobalTracer()),
+		ctx:          tracing.ContextWithTracer(ctx, opentracing.GlobalTracer()),
 		ServerStream: ss,
 	})
 }