rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing trace and span id on graphql resolver

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2026-02-05 14:40:59 +01:00
parent 1393999d84
commit b016f44525
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/server/gqlutils/tracing.go
View File

@@ -17,7 +17,6 @@ package gqlutils
import ( import (
"context" "context"
"fmt" "fmt"
"strings"
"time" "time"
"github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql"
@@ -72,10 +71,13 @@ func (t TracingExtension) InterceptField(ctx context.Context, next graphql.Resol
} }
func (t TracingExtension) InterceptOperation(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler { func (t TracingExtension) InterceptOperation(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler {
rootSpan := trace.SpanFromContext(ctx)
requestContext := graphql.GetOperationContext(ctx) requestContext := graphql.GetOperationContext(ctx)
startTime := time.Now() startTime := time.Now()
rootSpan := trace.SpanFromContext(ctx)
spanCtx := ctx
var operationSpan trace.Span
if rootSpan.IsRecording() { if rootSpan.IsRecording() {
tracer := otel.Tracer("graphql-operation") tracer := otel.Tracer("graphql-operation")
operationName := "GraphQL Operation" operationName := "GraphQL Operation"
@@ -83,20 +85,25 @@ func (t TracingExtension) InterceptOperation(ctx context.Context, next graphql.O
operationName = "GraphQL " + requestContext.OperationName operationName = "GraphQL " + requestContext.OperationName
} }
var span trace.Span spanCtx, operationSpan = tracer.Start(ctx, operationName)
ctx, span = tracer.Start(ctx, operationName)
defer span.End()
span.SetAttributes( operationSpan.SetAttributes(
attribute.String("graphql.operation_name", strings.ToValidUTF8(requestContext.OperationName, "\uFFFD")), attribute.String("graphql.operation_name", requestContext.OperationName),
attribute.String("graphql.operation_type", string(requestContext.Operation.Operation)), attribute.String("graphql.operation_type", string(requestContext.Operation.Operation)),
attribute.String("graphql.query", strings.ToValidUTF8(requestContext.RawQuery, "\uFFFD")), attribute.String("graphql.query", requestContext.RawQuery),
) )
} }
handler := next(ctx) handler := next(spanCtx)
return func(ctx context.Context) *graphql.Response { return func(ctx context.Context) *graphql.Response {
// gqlgen invokes the response handler with a different ctx than the one
// passed to next(...). Re-attach the span so the logger can extract trace_id.
if operationSpan != nil {
ctx = trace.ContextWithSpan(ctx, operationSpan)
defer operationSpan.End()
}
resp := handler(ctx) resp := handler(ctx)
duration := time.Since(startTime) duration := time.Since(startTime)