root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity

grpcserver: Extract existing span context from grpc request metadata prior to span creation (#77833) 

Extract existing span context from grpc metadata
This commit is contained in:
Alexander Weaver 2023-11-09 11:25:19 -06:00 committed by GitHub
parent 5bc4f56c79
commit 36dba7584d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/services/grpcserver/interceptors/tracing.go
View File

@ -3,7 +3,10 @@ package interceptors
import ( import (
"context" "context"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/propagation"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/metadata"
"github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/infra/tracing"
) )
@ -17,6 +20,10 @@ func TracingUnaryInterceptor(tracer tracing.Tracer) grpc.UnaryServerInterceptor
info *grpc.UnaryServerInfo, info *grpc.UnaryServerInfo,
handler grpc.UnaryHandler, handler grpc.UnaryHandler,
) (resp any, err error) { ) (resp any, err error) {
if md, ok := metadata.FromIncomingContext(ctx); ok {
ctx = otel.GetTextMapPropagator().Extract(ctx, propagation.HeaderCarrier(md))
}
ctx, span := tracer.Start(ctx, tracingPrefix+info.FullMethod) ctx, span := tracer.Start(ctx, tracingPrefix+info.FullMethod)
defer span.End() defer span.End()
resp, err = handler(ctx, req) resp, err = handler(ctx, req)
@ -26,7 +33,11 @@ func TracingUnaryInterceptor(tracer tracing.Tracer) grpc.UnaryServerInterceptor
func TracingStreamInterceptor(tracer tracing.Tracer) grpc.StreamServerInterceptor { func TracingStreamInterceptor(tracer tracing.Tracer) grpc.StreamServerInterceptor {
return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
ctx, span := tracer.Start(stream.Context(), tracingPrefix+info.FullMethod) ctx := stream.Context()
if md, ok := metadata.FromIncomingContext(ctx); ok {
ctx = otel.GetTextMapPropagator().Extract(ctx, propagation.HeaderCarrier(md))
}
ctx, span := tracer.Start(ctx, tracingPrefix+info.FullMethod)
defer span.End() defer span.End()
tracingStream := &tracingServerStream{ tracingStream := &tracingServerStream{
ServerStream: stream, ServerStream: stream,