Merge pull request #84 from aereal/propagate-errors

faet: Propagate errors

Author: aereal

test/resolvers/main.resolvers.go

@@ -5,3 +5,9 @@ package resolvers
 // It serves as dependency injection for your app, add any dependencies you require here.
 
 type Resolver struct{}
+
+type ForbiddenError struct{}
+
+func (ForbiddenError) Error() string {
+	return "forbidden"
+}

test/resolvers/resolver.go

@@ -86,6 +86,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 3),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -136,6 +137,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 3),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -187,6 +189,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 3),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -241,6 +244,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 3),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -281,8 +285,24 @@ func TestTracer(t *testing.T) {
 							Name: semconv.ExceptionEventName,
 							Attributes: []attribute.KeyValue{
 								attribute.String("graphql.errors.path", "user"),
-								semconv.ExceptionTypeKey.String("*gqlerror.Error"),
-								semconv.ExceptionMessageKey.String("input: user forbidden"),
+								semconv.ExceptionTypeKey.String("github.com/aereal/otelgqlgen/test/resolvers.ForbiddenError"),
+								semconv.ExceptionMessageKey.String("forbidden"),
+								attrStacktrace,
+							},
+						},
+					},
+				},
+				{
+					Name:     "http_handler",
+					SpanKind: trace.SpanKindInternal,
+					Status:   sdktrace.Status{Code: codes.Error, Description: "input: user forbidden\n"},
+					Events: []sdktrace.Event{
+						{
+							Name: semconv.ExceptionEventName,
+							Attributes: []attribute.KeyValue{
+								attribute.String("graphql.errors.path", "user"),
+								semconv.ExceptionTypeKey.String("github.com/aereal/otelgqlgen/test/resolvers.ForbiddenError"),
+								semconv.ExceptionMessageKey.String("forbidden"),
 								attrStacktrace,
 							},
 						},
@@ -352,17 +372,42 @@ func TestTracer(t *testing.T) {
 							Name: semconv.ExceptionEventName,
 							Attributes: []attribute.KeyValue{
 								attribute.String("graphql.errors.path", "user.name"),
-								semconv.ExceptionTypeKey.String("*gqlerror.Error"),
-								semconv.ExceptionMessageKey.String("input: user.name invalid name"),
+								semconv.ExceptionTypeKey.String("*errors.errorString"),
+								semconv.ExceptionMessageKey.String("invalid name"),
+								attrStacktrace,
+							},
+						},
+						{
+							Name: semconv.ExceptionEventName,
+							Attributes: []attribute.KeyValue{
+								attribute.String("graphql.errors.path", "user.age"),
+								semconv.ExceptionTypeKey.String("*errors.errorString"),
+								semconv.ExceptionMessageKey.String("invalid age"),
+								attrStacktrace,
+							},
+						},
+					},
+				},
+				{
+					Name:     "http_handler",
+					SpanKind: trace.SpanKindInternal,
+					Status:   sdktrace.Status{Code: codes.Error, Description: "input: user.name invalid name\ninput: user.age invalid age\n"},
+					Events: []sdktrace.Event{
+						{
+							Name: semconv.ExceptionEventName,
+							Attributes: []attribute.KeyValue{
+								attribute.String("graphql.errors.path", "user.name"),
+								semconv.ExceptionTypeKey.String("*errors.errorString"),
+								semconv.ExceptionMessageKey.String("invalid name"),
 								attrStacktrace,
 							},
 						},
 						{
 							Name: semconv.ExceptionEventName,
 							Attributes: []attribute.KeyValue{
 								attribute.String("graphql.errors.path", "user.age"),
-								semconv.ExceptionTypeKey.String("*gqlerror.Error"),
-								semconv.ExceptionMessageKey.String("input: user.age invalid age"),
+								semconv.ExceptionTypeKey.String("*errors.errorString"),
+								semconv.ExceptionMessageKey.String("invalid age"),
 								attrStacktrace,
 							},
 						},
@@ -404,6 +449,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 1),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -439,6 +485,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 1),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -501,6 +548,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 3),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 		{
@@ -537,6 +585,7 @@ func TestTracer(t *testing.T) {
 						attribute.Int("graphql.operation.complexity.calculated", 1),
 					},
 				},
+				{Name: "http_handler", SpanKind: trace.SpanKindInternal},
 			},
 		},
 	}
@@ -556,7 +605,12 @@ func TestTracer(t *testing.T) {
 			options = append(options, otelgqlgen.WithTracerProvider(tp))
 			gqlsrv.Use(otelgqlgen.New(options...))
 			gqlsrv.Use(extension.FixedComplexityLimit(1000))
-			srv := httptest.NewServer(gqlsrv)
+			testTracer := tp.Tracer("test")
+			srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				ctx, span := testTracer.Start(r.Context(), "http_handler")
+				defer span.End()
+				gqlsrv.ServeHTTP(w, r.WithContext(ctx))
+			}))
 			defer srv.Close()
 			body, err := json.Marshal(tc.params)
 			if err != nil {

test/tracer_test.go

@@ -115,6 +115,7 @@ func (t Tracer) startResponseSpan(ctx context.Context) (context.Context, trace.S
 }
 
 func (t Tracer) InterceptResponse(ctx context.Context, next graphql.ResponseHandler) *graphql.Response {
+	parentSpan := trace.SpanFromContext(ctx)
 	ctx, span := t.startResponseSpan(ctx)
 	defer span.End()
 	if !span.IsRecording() {
@@ -143,6 +144,9 @@ func (t Tracer) InterceptResponse(ctx context.Context, next graphql.ResponseHand
 	resp := next(ctx)
 	if resp != nil && len(resp.Errors) > 0 {
 		recordGQLErrors(span, resp.Errors)
+		if parentSpan.SpanContext().IsValid() {
+			recordGQLErrors(parentSpan, resp.Errors)
+		}
 	}
 	return resp
 }
@@ -225,7 +229,23 @@ func recordGQLErrors(span trace.Span, errs gqlerror.List) {
 		attrs := []attribute.KeyValue{
 			keyErrorPath.String(e.Path.String()),
 		}
-		span.RecordError(e, trace.WithStackTrace(true), trace.WithAttributes(attrs...))
+		err := unwrapErr(e)
+		span.RecordError(err, trace.WithStackTrace(true), trace.WithAttributes(attrs...))
+	}
+}
+
+func unwrapErr(err error) error {
+	var underlying error = err
+	for {
+		wrapped, ok := underlying.(interface{ Unwrap() error })
+		if !ok {
+			return underlying
+		}
+		unwrapped := wrapped.Unwrap()
+		if unwrapped == nil {
+			return underlying
+		}
+		underlying = unwrapped
 	}
 }