[tracer] add tag response data

Author: agungdwiprasetyo

graphql.go

@@ -196,7 +196,7 @@ func (s *Schema) exec(ctx context.Context, queryString string, operationName str
 
 	validationFinish := s.validationTracer.TraceValidation(ctx)
 	errs := validation.Validate(s.schema, doc, variables, s.maxDepth)
-	validationFinish(errs)
+	validationFinish(nil, errs)
 	if len(errs) != 0 {
 		return &Response{Errors: errs}
 	}
@@ -253,7 +253,7 @@ func (s *Schema) exec(ctx context.Context, queryString string, operationName str
 	}
 	traceCtx, finish := s.tracer.TraceQuery(ctx, queryString, operationName, variables, varTypes)
 	data, errs := r.Execute(traceCtx, res, op)
-	finish(errs)
+	finish(data, errs)
 
 	return &Response{
 		Data:   data,

internal/exec/exec.go

@@ -190,7 +190,7 @@ func execFieldSelection(ctx context.Context, r *Request, s *resolvable.Schema, f
 
 	traceCtx, finish := r.Tracer.TraceField(ctx, f.field.TraceLabel, f.field.TypeName, f.field.Name, !f.field.Async, f.field.Args)
 	defer func() {
-		finish(err)
+		finish(f.out.Bytes(), err)
 	}()
 
 	err = func() (err *errors.QueryError) {

subscriptions.go

@@ -38,7 +38,7 @@ func (s *Schema) subscribe(ctx context.Context, queryString string, operationNam
 
 	validationFinish := s.validationTracer.TraceValidation(ctx)
 	errs := validation.Validate(s.schema, doc, variables, s.maxDepth)
-	validationFinish(errs)
+	validationFinish(nil, errs)
 	if len(errs) != 0 {
 		return sendAndReturnClosed(&Response{Errors: errs})
 	}

trace/trace.go

@@ -11,8 +11,8 @@ import (
 	"github.com/opentracing/opentracing-go/log"
 )
 
-type TraceQueryFinishFunc func([]*errors.QueryError)
-type TraceFieldFinishFunc func(*errors.QueryError)
+type TraceQueryFinishFunc func([]byte, []*errors.QueryError)
+type TraceFieldFinishFunc func([]byte, *errors.QueryError)
 
 type Tracer interface {
 	TraceQuery(ctx context.Context, queryString string, operationName string, variables map[string]interface{}, varTypes map[string]*introspection.Type) (context.Context, TraceQueryFinishFunc)
@@ -33,7 +33,7 @@ func (OpenTracingTracer) TraceQuery(ctx context.Context, queryString string, ope
 		span.LogFields(log.Object("graphql.variables", variables))
 	}
 
-	return spanCtx, func(errs []*errors.QueryError) {
+	return spanCtx, func(data []byte, errs []*errors.QueryError) {
 		if len(errs) > 0 {
 			msg := errs[0].Error()
 			if len(errs) > 1 {
@@ -58,7 +58,7 @@ func (OpenTracingTracer) TraceField(ctx context.Context, label, typeName, fieldN
 		span.SetTag("graphql.args."+name, value)
 	}
 
-	return spanCtx, func(err *errors.QueryError) {
+	return spanCtx, func(data []byte, err *errors.QueryError) {
 		if err != nil {
 			ext.Error.Set(span, true)
 			span.SetTag("graphql.error", err.Error())
@@ -67,30 +67,14 @@ func (OpenTracingTracer) TraceField(ctx context.Context, label, typeName, fieldN
 	}
 }
 
-func (OpenTracingTracer) TraceValidation(ctx context.Context) TraceValidationFinishFunc {
-	span, _ := opentracing.StartSpanFromContext(ctx, "Validate Query")
-
-	return func(errs []*errors.QueryError) {
-		if len(errs) > 0 {
-			msg := errs[0].Error()
-			if len(errs) > 1 {
-				msg += fmt.Sprintf(" (and %d more errors)", len(errs)-1)
-			}
-			ext.Error.Set(span, true)
-			span.SetTag("graphql.error", msg)
-		}
-		span.Finish()
-	}
-}
-
-func noop(*errors.QueryError) {}
+func noop([]byte, *errors.QueryError) {}
 
 type NoopTracer struct{}
 
 func (NoopTracer) TraceQuery(ctx context.Context, queryString string, operationName string, variables map[string]interface{}, varTypes map[string]*introspection.Type) (context.Context, TraceQueryFinishFunc) {
-	return ctx, func(errs []*errors.QueryError) {}
+	return ctx, func(data []byte, errs []*errors.QueryError) {}
 }
 
 func (NoopTracer) TraceField(ctx context.Context, label, typeName, fieldName string, trivial bool, args map[string]interface{}) (context.Context, TraceFieldFinishFunc) {
-	return ctx, func(err *errors.QueryError) {}
+	return ctx, func(data []byte, err *errors.QueryError) {}
 }

trace/validation_trace.go

@@ -21,5 +21,5 @@ type NoopValidationTracer struct{}
 
 // Deprecated: use a Tracer which implements ValidationTracerContext.
 func (NoopValidationTracer) TraceValidation() TraceValidationFinishFunc {
-	return func(errs []*errors.QueryError) {}
+	return func(data []byte, errs []*errors.QueryError) {}
 }