refactor Tracer interface signature that fit to apollo-tracing specs

99designs · Oct 23, 2018 · 94b7ab0 · 94b7ab0
1 parent 8eb2675
commit 94b7ab0
Show file tree

Hide file tree

Showing 14 changed files with 1,423 additions and 483 deletions.
diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
@@ -35,6 +35,7 @@
 {{ else }}
 	// nolint: vetshadow
 	func (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField, {{if not $object.Root}}obj *{{$object.FullName}}{{end}}) graphql.Marshaler {
+		ctx = ec.Tracer.StartFieldExecution(ctx, field)
 		{{- if $field.Args }}
 			rawArgs := field.ArgumentMap(ec.Variables)
 			args, err := {{ $field.ArgsFunc }}(rawArgs)
@@ -49,7 +50,7 @@
 			Field: field,
 		}
 		ctx = graphql.WithResolverContext(ctx, rctx)
-		ctx = ec.Tracer.StartFieldExecution(ctx)
+		ctx = ec.Tracer.StartFieldResolverExecution(ctx, rctx)
 		defer ec.Tracer.EndFieldExecution(ctx)
 		resTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {
 			ctx = rctx  // use context from middleware stack in children
@@ -75,6 +76,7 @@
 		}
 		res := resTmp.({{$field.Signature}})
 		rctx.Result = res
+		ctx = ec.Tracer.StartFieldChildExecution(ctx)
 		{{ $field.WriteJson }}
 	}
 {{ end }}