Merge pull request #419 from 99designs/fix-capture-ctx

fix unexpected ctx variable capture on Tracing
99designs · Nov 12, 2018 · 981fd10 · 981fd10
2 parents 4bda3bc + 027803d
commit 981fd10
Show file tree

Hide file tree

Showing 14 changed files with 825 additions and 644 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
@@ -36,7 +36,7 @@
 	// 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)
-		defer ec.Tracer.EndFieldExecution(ctx)
+		defer func () { ec.Tracer.EndFieldExecution(ctx) }()
 		{{- if $field.Args }}
 			rawArgs := field.ArgumentMap(ec.Variables)
 			args, err := {{ $field.ArgsFunc }}(rawArgs)