diff --git a/codegen/templates/data.go b/codegen/templates/data.go
index 4a2eda7547e..8aee36f1d36 100644
--- a/codegen/templates/data.go
+++ b/codegen/templates/data.go
@@ -2,7 +2,7 @@ package templates
 
 var data = map[string]string{
 	"args.gotpl":      "\targs := map[string]interface{}{}\n\t{{- range $i, $arg := . }}\n\t\tvar arg{{$i}} {{$arg.Signature }}\n\t\tif tmp, ok := rawArgs[{{$arg.GQLName|quote}}]; ok {\n\t\t\tvar err error\n\t\t\t{{$arg.Unmarshal (print \"arg\" $i) \"tmp\" }}\n\t\t\tif err != nil {\n\t\t\t\treturn nil, err\n\t\t\t}\n\t\t}\n\t\targs[{{$arg.GQLName|quote}}] = arg{{$i}}\n\t{{- end }}\n\treturn args, nil\n",
-	"field.gotpl":     "{{ $field := . }}\n{{ $object := $field.Object }}\n\n{{- if $object.Stream }}\n\tfunc (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField) func() graphql.Marshaler {\n\t\t{{- if $field.Args }}\n\t\t\trawArgs := field.ArgumentMap(ec.Variables)\n\t\t\targs, err := {{ $field.ArgsFunc }}(rawArgs)\n\t\t\tif err != nil {\n\t\t\t\tec.Error(ctx, err)\n\t\t\t\treturn nil\n\t\t\t}\n\t\t{{- end }}\n\t\tctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{\n\t\t\tField: field,\n\t\t})\n\t\t// FIXME: subscriptions are missing request middleware stack https://github.com/99designs/gqlgen/issues/259\n\t\t//          and Tracer stack\n\t\trctx := ctx\n\t\tresults, err := ec.resolvers.{{ $field.ShortInvocation }}\n\t\tif err != nil {\n\t\t\tec.Error(ctx, err)\n\t\t\treturn nil\n\t\t}\n\t\treturn func() graphql.Marshaler {\n\t\t\tres, ok := <-results\n\t\t\tif !ok {\n\t\t\t\treturn nil\n\t\t\t}\n\t\t\tvar out graphql.OrderedMap\n\t\t\tout.Add(field.Alias, func() graphql.Marshaler { return {{ $field.WriteJson }} }())\n\t\t\treturn &out\n\t\t}\n\t}\n{{ else }}\n\t// nolint: vetshadow\n\tfunc (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField, {{if not $object.Root}}obj *{{$object.FullName}}{{end}}) graphql.Marshaler {\n\t\t{{- if $field.Args }}\n\t\t\trawArgs := field.ArgumentMap(ec.Variables)\n\t\t\targs, err := {{ $field.ArgsFunc }}(rawArgs)\n\t\t\tif err != nil {\n\t\t\t\tec.Error(ctx, err)\n\t\t\t\treturn graphql.Null\n\t\t\t}\n\t\t{{- end }}\n\t\trctx := &graphql.ResolverContext{\n\t\t\tObject: {{$object.GQLType|quote}},\n\t\t\tArgs: {{if $field.Args }}args{{else}}nil{{end}},\n\t\t\tField: field,\n\t\t}\n\t\tctx = graphql.WithResolverContext(ctx, rctx)\n\t\tctx = ec.Tracer.StartFieldTracing(ctx)\n\t\tresTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {\n\t\t\tctx = rctx  // use context from middleware stack in children\n\t\t\t{{- if $field.IsResolver }}\n\t\t\t\treturn ec.resolvers.{{ $field.ShortInvocation }}\n\t\t\t{{- else if $field.IsMethod }}\n\t\t\t\t{{- if $field.NoErr }}\n\t\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}({{ $field.CallArgs }}), nil\n\t\t\t\t{{- else }}\n\t\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}({{ $field.CallArgs }})\n\t\t\t\t{{- end }}\n\t\t\t{{- else if $field.IsVariable }}\n\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}, nil\n\t\t\t{{- end }}\n\t\t})\n\t\tif resTmp == nil {\n\t\t\t{{- if $field.ASTType.NonNull }}\n\t\t\t\tif !ec.HasError(rctx) {\n\t\t\t\t\tec.Errorf(ctx, \"must not be null\")\n\t\t\t\t}\n\t\t\t{{- end }}\n\t\t\treturn graphql.Null\n\t\t}\n\t\tres := resTmp.({{$field.Signature}})\n\t\trctx.Result = res\n\t\tresMarshaler := {{ $field.WriteJson }}\n\t\tec.Tracer.EndFieldTracing(ctx)\n\t\treturn resMarshaler\n\t}\n{{ end }}\n",
+	"field.gotpl":     "{{ $field := . }}\n{{ $object := $field.Object }}\n\n{{- if $object.Stream }}\n\tfunc (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField) func() graphql.Marshaler {\n\t\t{{- if $field.Args }}\n\t\t\trawArgs := field.ArgumentMap(ec.Variables)\n\t\t\targs, err := {{ $field.ArgsFunc }}(rawArgs)\n\t\t\tif err != nil {\n\t\t\t\tec.Error(ctx, err)\n\t\t\t\treturn nil\n\t\t\t}\n\t\t{{- end }}\n\t\tctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{\n\t\t\tField: field,\n\t\t})\n\t\t// FIXME: subscriptions are missing request middleware stack https://github.com/99designs/gqlgen/issues/259\n\t\t//          and Tracer stack\n\t\trctx := ctx\n\t\tresults, err := ec.resolvers.{{ $field.ShortInvocation }}\n\t\tif err != nil {\n\t\t\tec.Error(ctx, err)\n\t\t\treturn nil\n\t\t}\n\t\treturn func() graphql.Marshaler {\n\t\t\tres, ok := <-results\n\t\t\tif !ok {\n\t\t\t\treturn nil\n\t\t\t}\n\t\t\tvar out graphql.OrderedMap\n\t\t\tout.Add(field.Alias, func() graphql.Marshaler { return {{ $field.WriteJson }} }())\n\t\t\treturn &out\n\t\t}\n\t}\n{{ else }}\n\t// nolint: vetshadow\n\tfunc (ec *executionContext) _{{$object.GQLType}}_{{$field.GQLName}}(ctx context.Context, field graphql.CollectedField, {{if not $object.Root}}obj *{{$object.FullName}}{{end}}) graphql.Marshaler {\n\t\t{{- if $field.Args }}\n\t\t\trawArgs := field.ArgumentMap(ec.Variables)\n\t\t\targs, err := {{ $field.ArgsFunc }}(rawArgs)\n\t\t\tif err != nil {\n\t\t\t\tec.Error(ctx, err)\n\t\t\t\treturn graphql.Null\n\t\t\t}\n\t\t{{- end }}\n\t\trctx := &graphql.ResolverContext{\n\t\t\tObject: {{$object.GQLType|quote}},\n\t\t\tArgs: {{if $field.Args }}args{{else}}nil{{end}},\n\t\t\tField: field,\n\t\t}\n\t\tctx = graphql.WithResolverContext(ctx, rctx)\n\t\tctx = ec.Tracer.StartFieldExecution(ctx)\n\t\tresTmp := ec.FieldMiddleware(ctx, {{if $object.Root}}nil{{else}}obj{{end}}, func(rctx context.Context) (interface{}, error) {\n\t\t\tctx = rctx  // use context from middleware stack in children\n\t\t\t{{- if $field.IsResolver }}\n\t\t\t\treturn ec.resolvers.{{ $field.ShortInvocation }}\n\t\t\t{{- else if $field.IsMethod }}\n\t\t\t\t{{- if $field.NoErr }}\n\t\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}({{ $field.CallArgs }}), nil\n\t\t\t\t{{- else }}\n\t\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}({{ $field.CallArgs }})\n\t\t\t\t{{- end }}\n\t\t\t{{- else if $field.IsVariable }}\n\t\t\t\treturn {{$field.GoReceiverName}}.{{$field.GoFieldName}}, nil\n\t\t\t{{- end }}\n\t\t})\n\t\tif resTmp == nil {\n\t\t\t{{- if $field.ASTType.NonNull }}\n\t\t\t\tif !ec.HasError(rctx) {\n\t\t\t\t\tec.Errorf(ctx, \"must not be null\")\n\t\t\t\t}\n\t\t\t{{- end }}\n\t\t\treturn graphql.Null\n\t\t}\n\t\tres := resTmp.({{$field.Signature}})\n\t\trctx.Result = res\n\t\tresMarshaler := {{ $field.WriteJson }}\n\t\tec.Tracer.EndFieldExecution(ctx)\n\t\treturn resMarshaler\n\t}\n{{ end }}\n",
 	"generated.gotpl": "// Code generated by github.com/99designs/gqlgen, DO NOT EDIT.\n\npackage {{ .PackageName }}\n\nimport (\n{{- range $import := .Imports }}\n\t{{- $import.Write }}\n{{ end }}\n)\n\n// NewExecutableSchema creates an ExecutableSchema from the ResolverRoot interface.\nfunc NewExecutableSchema(cfg Config) graphql.ExecutableSchema {\n\treturn &executableSchema{\n\t\tresolvers: cfg.Resolvers,\n\t\tdirectives: cfg.Directives,\n\t\tcomplexity: cfg.Complexity,\n\t}\n}\n\ntype Config struct {\n\tResolvers  ResolverRoot\n\tDirectives DirectiveRoot\n\tComplexity ComplexityRoot\n}\n\ntype ResolverRoot interface {\n{{- range $object := .Objects -}}\n\t{{ if $object.HasResolvers -}}\n\t\t{{$object.GQLType}}() {{$object.GQLType}}Resolver\n\t{{ end }}\n{{- end }}\n}\n\ntype DirectiveRoot struct {\n{{ range $directive := .Directives }}\n\t{{ $directive.Declaration }}\n{{ end }}\n}\n\ntype ComplexityRoot struct {\n{{ range $object := .Objects }}\n\t{{ if not $object.IsReserved -}}\n\t\t{{ $object.GQLType|toCamel }} struct {\n\t\t{{ range $field := $object.Fields -}}\n\t\t\t{{ if not $field.IsReserved -}}\n\t\t\t\t{{ $field.GQLName|toCamel }} {{ $field.ComplexitySignature }}\n\t\t\t{{ end }}\n\t\t{{- end }}\n\t\t}\n\t{{- end }}\n{{ end }}\n}\n\n{{ range $object := .Objects -}}\n\t{{ if $object.HasResolvers }}\n\t\ttype {{$object.GQLType}}Resolver interface {\n\t\t{{ range $field := $object.Fields -}}\n\t\t\t{{ $field.ShortResolverDeclaration }}\n\t\t{{ end }}\n\t\t}\n\t{{- end }}\n{{- end }}\n\n{{ range $object := .Objects -}}\n\t{{ range $field := $object.Fields -}}\n\t\t{{ if $field.Args }}\n\t\t\tfunc {{ $field.ArgsFunc }}(rawArgs map[string]interface{}) (map[string]interface{}, error) {\n\t\t\t{{ template \"args.gotpl\" $field.Args }}\n\t\t\t}\n\t\t{{ end }}\n\t{{ end }}\n{{- end }}\n\n{{ range $directive := .Directives }}\n\t{{ if $directive.Args }}\n\t\tfunc {{ $directive.ArgsFunc }}(rawArgs map[string]interface{}) (map[string]interface{}, error) {\n\t\t{{ template \"args.gotpl\" $directive.Args }}\n\t\t}\n\t{{ end }}\n{{ end }}\n\ntype executableSchema struct {\n\tresolvers  ResolverRoot\n\tdirectives DirectiveRoot\n\tcomplexity ComplexityRoot\n}\n\nfunc (e *executableSchema) Schema() *ast.Schema {\n\treturn parsedSchema\n}\n\nfunc (e *executableSchema) Complexity(typeName, field string, childComplexity int, rawArgs map[string]interface{}) (int, bool) {\n\tswitch typeName + \".\" + field {\n\t{{ range $object := .Objects }}\n\t\t{{ if not $object.IsReserved }}\n\t\t\t{{ range $field := $object.Fields }}\n\t\t\t\t{{ if not $field.IsReserved }}\n\t\t\t\t\tcase \"{{$object.GQLType}}.{{$field.GQLName}}\":\n\t\t\t\t\t\tif e.complexity.{{$object.GQLType|toCamel}}.{{$field.GQLName|toCamel}} == nil {\n\t\t\t\t\t\t\tbreak\n\t\t\t\t\t\t}\n\t\t\t\t\t\t{{ if $field.Args }}\n\t\t\t\t\t\t\targs, err := {{ $field.ArgsFunc }}(rawArgs)\n\t\t\t\t\t\t\tif err != nil {\n\t\t\t\t\t\t\t\treturn 0, false\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t{{ end }}\n\t\t\t\t\t\treturn e.complexity.{{$object.GQLType|toCamel}}.{{$field.GQLName|toCamel}}(childComplexity{{if $field.Args}}, {{$field.ComplexityArgs}} {{end}}), true\n\t\t\t\t{{ end }}\n\t\t\t{{ end }}\n\t\t{{ end }}\n\t{{ end }}\n\t}\n\treturn 0, false\n}\n\nfunc (e *executableSchema) Query(ctx context.Context, op *ast.OperationDefinition) *graphql.Response {\n\t{{- if .QueryRoot }}\n\t\tec := executionContext{graphql.GetRequestContext(ctx), e}\n\n\t\tbuf := ec.RequestMiddleware(ctx, func(ctx context.Context) []byte {\n\t\t\tdata := ec._{{.QueryRoot.GQLType}}(ctx, op.SelectionSet)\n\t\t\tvar buf bytes.Buffer\n\t\t\tdata.MarshalGQL(&buf)\n\t\t\treturn buf.Bytes()\n\t\t})\n\n\t\treturn &graphql.Response{\n\t\t\tData:       buf,\n\t\t\tErrors:     ec.Errors,\n\t\t\tExtensions: ec.Extensions,\t\t}\n\t{{- else }}\n\t\treturn graphql.ErrorResponse(ctx, \"queries are not supported\")\n\t{{- end }}\n}\n\nfunc (e *executableSchema) Mutation(ctx context.Context, op *ast.OperationDefinition) *graphql.Response {\n\t{{- if .MutationRoot }}\n\t\tec := executionContext{graphql.GetRequestContext(ctx), e}\n\n\t\tbuf := ec.RequestMiddleware(ctx, func(ctx context.Context) []byte {\n\t\t\tdata := ec._{{.MutationRoot.GQLType}}(ctx, op.SelectionSet)\n\t\t\tvar buf bytes.Buffer\n\t\t\tdata.MarshalGQL(&buf)\n\t\t\treturn buf.Bytes()\n\t\t})\n\n\t\treturn &graphql.Response{\n\t\t\tData:       buf,\n\t\t\tErrors:     ec.Errors,\n\t\t\tExtensions: ec.Extensions,\n\t\t}\n\t{{- else }}\n\t\treturn graphql.ErrorResponse(ctx, \"mutations are not supported\")\n\t{{- end }}\n}\n\nfunc (e *executableSchema) Subscription(ctx context.Context, op *ast.OperationDefinition) func() *graphql.Response {\n\t{{- if .SubscriptionRoot }}\n\t\tec := executionContext{graphql.GetRequestContext(ctx), e}\n\n\t\tnext := ec._{{.SubscriptionRoot.GQLType}}(ctx, op.SelectionSet)\n\t\tif ec.Errors != nil {\n\t\t\treturn graphql.OneShot(&graphql.Response{Data: []byte(\"null\"), Errors: ec.Errors})\n\t\t}\n\n\t\tvar buf bytes.Buffer\n\t\treturn func() *graphql.Response {\n\t\t\tbuf := ec.RequestMiddleware(ctx, func(ctx context.Context) []byte {\n\t\t\t\tbuf.Reset()\n\t\t\t\tdata := next()\n\n\t\t\t\tif data == nil {\n\t\t\t\t\treturn nil\n\t\t\t\t}\n\t\t\t\tdata.MarshalGQL(&buf)\n\t\t\t\treturn buf.Bytes()\n\t\t\t})\n\n\t\t\tif buf == nil {\n\t\t\t\treturn nil\n\t\t\t}\n\n\t\t\treturn &graphql.Response{\n\t\t\t\tData:       buf,\n\t\t\t\tErrors:     ec.Errors,\n\t\t\t\tExtensions: ec.Extensions,\n\t\t\t}\n\t\t}\n\t{{- else }}\n\t\treturn graphql.OneShot(graphql.ErrorResponse(ctx, \"subscriptions are not supported\"))\n\t{{- end }}\n}\n\ntype executionContext struct {\n\t*graphql.RequestContext\n\t*executableSchema\n}\n\n{{- range $object := .Objects }}\n\t{{ template \"object.gotpl\" $object }}\n\n\t{{- range $field := $object.Fields }}\n\t\t{{ template \"field.gotpl\" $field }}\n\t{{ end }}\n{{- end}}\n\n{{- range $interface := .Interfaces }}\n\t{{ template \"interface.gotpl\" $interface }}\n{{- end }}\n\n{{- range $input := .Inputs }}\n\t{{ template \"input.gotpl\" $input }}\n{{- end }}\n\nfunc (ec *executionContext) FieldMiddleware(ctx context.Context, obj interface{}, next graphql.Resolver) (ret interface{}) {\n\tdefer func() {\n\t\tif r := recover(); r != nil {\n\t\t\tec.Error(ctx, ec.Recover(ctx, r))\n\t\t\tret = nil\n\t\t}\n\t}()\n\t{{- if .Directives }}\n\trctx := graphql.GetResolverContext(ctx)\n\tfor _, d := range rctx.Field.Definition.Directives {\n\t\tswitch d.Name {\n\t\t{{- range $directive := .Directives }}\n\t\tcase \"{{$directive.Name}}\":\n\t\t\tif ec.directives.{{$directive.Name|ucFirst}} != nil {\n\t\t\t\t{{- if $directive.Args }}\n\t\t\t\t\trawArgs := d.ArgumentMap(ec.Variables)\n\t\t\t\t\targs, err := {{ $directive.ArgsFunc }}(rawArgs)\n\t\t\t\t\tif err != nil {\n\t\t\t\t\t\tec.Error(ctx, err)\n\t\t\t\t\t\treturn nil\n\t\t\t\t\t}\n\t\t\t\t{{- end }}\n\t\t\t\tn := next\n\t\t\t\tnext = func(ctx context.Context) (interface{}, error) {\n\t\t\t\t\treturn ec.directives.{{$directive.Name|ucFirst}}({{$directive.CallArgs}})\n\t\t\t\t}\n\t\t\t}\n\t\t{{- end }}\n\t\t}\n\t}\n\t{{- end }}\n\tres, err := ec.ResolverMiddleware(ctx, next)\n\tif err != nil {\n\t\tec.Error(ctx, err)\n\t\treturn nil\n\t}\n\treturn res\n}\n\nfunc (ec *executionContext) introspectSchema() *introspection.Schema {\n\treturn introspection.WrapSchema(parsedSchema)\n}\n\nfunc (ec *executionContext) introspectType(name string) *introspection.Type {\n\treturn introspection.WrapTypeFromDef(parsedSchema, parsedSchema.Types[name])\n}\n\nvar parsedSchema = gqlparser.MustLoadSchema(\n\t{{- range $filename, $schema := .SchemaRaw }}\n\t\t&ast.Source{Name: {{$filename|quote}}, Input: {{$schema|rawQuote}}},\n\t{{- end }}\n)\n",
 	"input.gotpl":     "\t{{- if .IsMarshaled }}\n\tfunc Unmarshal{{ .GQLType }}(v interface{}) ({{.FullName}}, error) {\n\t\tvar it {{.FullName}}\n\t\tvar asMap = v.(map[string]interface{})\n\t\t{{ range $field := .Fields}}\n\t\t\t{{- if $field.Default}}\n\t\t\t\tif _, present := asMap[{{$field.GQLName|quote}}] ; !present {\n\t\t\t\t\tasMap[{{$field.GQLName|quote}}] = {{ $field.Default | dump }}\n\t\t\t\t}\n\t\t\t{{- end}}\n\t\t{{- end }}\n\n\t\tfor k, v := range asMap {\n\t\t\tswitch k {\n\t\t\t{{- range $field := .Fields }}\n\t\t\tcase {{$field.GQLName|quote}}:\n\t\t\t\tvar err error\n\t\t\t\t{{ $field.Unmarshal (print \"it.\" $field.GoFieldName) \"v\" }}\n\t\t\t\tif err != nil {\n\t\t\t\t\treturn it, err\n\t\t\t\t}\n\t\t\t{{- end }}\n\t\t\t}\n\t\t}\n\n\t\treturn it, nil\n\t}\n\t{{- end }}\n",
 	"interface.gotpl": "{{- $interface := . }}\n\nfunc (ec *executionContext) _{{$interface.GQLType}}(ctx context.Context, sel ast.SelectionSet, obj *{{$interface.FullName}}) graphql.Marshaler {\n\tswitch obj := (*obj).(type) {\n\tcase nil:\n\t\treturn graphql.Null\n\t{{- range $implementor := $interface.Implementors }}\n\t\t{{- if $implementor.ValueReceiver }}\n\t\t\tcase {{$implementor.FullName}}:\n\t\t\t\treturn ec._{{$implementor.GQLType}}(ctx, sel, &obj)\n\t\t{{- end}}\n\t\tcase *{{$implementor.FullName}}:\n\t\t\treturn ec._{{$implementor.GQLType}}(ctx, sel, obj)\n\t{{- end }}\n\tdefault:\n\t\tpanic(fmt.Errorf(\"unexpected type %T\", obj))\n\t}\n}\n",
diff --git a/codegen/templates/field.gotpl b/codegen/templates/field.gotpl
index f9cc55f64e3..71e950f16c8 100644
--- a/codegen/templates/field.gotpl
+++ b/codegen/templates/field.gotpl
@@ -49,7 +49,7 @@
 			Field: field,
 		}
 		ctx = graphql.WithResolverContext(ctx, rctx)
-		ctx = ec.Tracer.StartFieldTracing(ctx)
+		ctx = ec.Tracer.StartFieldExecution(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
 			{{- if $field.IsResolver }}
@@ -75,7 +75,7 @@
 		res := resTmp.({{$field.Signature}})
 		rctx.Result = res
 		resMarshaler := {{ $field.WriteJson }}
-		ec.Tracer.EndFieldTracing(ctx)
+		ec.Tracer.EndFieldExecution(ctx)
 		return resMarshaler
 	}
 {{ end }}
diff --git a/codegen/testserver/generated.go b/codegen/testserver/generated.go
index 062a41735a2..7cc81cfe886 100644
--- a/codegen/testserver/generated.go
+++ b/codegen/testserver/generated.go
@@ -929,7 +929,7 @@ func (ec *executionContext) _Circle_radius(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Radius, nil
@@ -942,7 +942,7 @@ func (ec *executionContext) _Circle_radius(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -954,7 +954,7 @@ func (ec *executionContext) _Circle_area(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Area(), nil
@@ -967,7 +967,7 @@ func (ec *executionContext) _Circle_area(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1008,7 +1008,7 @@ func (ec *executionContext) _EmbeddedPointer_ID(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1021,7 +1021,7 @@ func (ec *executionContext) _EmbeddedPointer_ID(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1033,7 +1033,7 @@ func (ec *executionContext) _EmbeddedPointer_Title(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Title, nil
@@ -1046,7 +1046,7 @@ func (ec *executionContext) _EmbeddedPointer_Title(ctx context.Context, field gr
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1100,7 +1100,7 @@ func (ec *executionContext) _Error_id(ctx context.Context, field graphql.Collect
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1116,7 +1116,7 @@ func (ec *executionContext) _Error_id(ctx context.Context, field graphql.Collect
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1128,7 +1128,7 @@ func (ec *executionContext) _Error_errorOnNonRequiredField(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ErrorOnNonRequiredField()
@@ -1141,7 +1141,7 @@ func (ec *executionContext) _Error_errorOnNonRequiredField(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1153,7 +1153,7 @@ func (ec *executionContext) _Error_errorOnRequiredField(ctx context.Context, fie
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ErrorOnRequiredField()
@@ -1169,7 +1169,7 @@ func (ec *executionContext) _Error_errorOnRequiredField(ctx context.Context, fie
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1181,7 +1181,7 @@ func (ec *executionContext) _Error_nilOnRequiredField(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.NilOnRequiredField(), nil
@@ -1204,7 +1204,7 @@ func (ec *executionContext) _Error_nilOnRequiredField(ctx context.Context, field
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1248,7 +1248,7 @@ func (ec *executionContext) _ForcedResolver_field(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.ForcedResolver().Field(rctx, obj)
@@ -1266,7 +1266,7 @@ func (ec *executionContext) _ForcedResolver_field(ctx context.Context, field gra
 
 		return ec._Circle(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1308,7 +1308,7 @@ func (ec *executionContext) _InnerObject_id(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1324,7 +1324,7 @@ func (ec *executionContext) _InnerObject_id(ctx context.Context, field graphql.C
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1366,7 +1366,7 @@ func (ec *executionContext) _InvalidIdentifier_id(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1382,7 +1382,7 @@ func (ec *executionContext) _InvalidIdentifier_id(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1424,7 +1424,7 @@ func (ec *executionContext) _It_id(ctx context.Context, field graphql.CollectedF
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1440,7 +1440,7 @@ func (ec *executionContext) _It_id(ctx context.Context, field graphql.CollectedF
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1482,7 +1482,7 @@ func (ec *executionContext) _OuterObject_inner(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Inner, nil
@@ -1499,7 +1499,7 @@ func (ec *executionContext) _OuterObject_inner(ctx context.Context, field graphq
 
 		return ec._InnerObject(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1635,7 +1635,7 @@ func (ec *executionContext) _Query_invalidIdentifier(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().InvalidIdentifier(rctx)
@@ -1653,7 +1653,7 @@ func (ec *executionContext) _Query_invalidIdentifier(ctx context.Context, field
 
 		return ec._InvalidIdentifier(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1665,7 +1665,7 @@ func (ec *executionContext) _Query_collision(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Collision(rctx)
@@ -1683,7 +1683,7 @@ func (ec *executionContext) _Query_collision(ctx context.Context, field graphql.
 
 		return ec._It(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1701,7 +1701,7 @@ func (ec *executionContext) _Query_mapInput(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().MapInput(rctx, args["input"].(*map[string]interface{}))
@@ -1718,7 +1718,7 @@ func (ec *executionContext) _Query_mapInput(ctx context.Context, field graphql.C
 		}
 		return graphql.MarshalBoolean(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1736,7 +1736,7 @@ func (ec *executionContext) _Query_recursive(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Recursive(rctx, args["input"].(*RecursiveInputSlice))
@@ -1753,7 +1753,7 @@ func (ec *executionContext) _Query_recursive(ctx context.Context, field graphql.
 		}
 		return graphql.MarshalBoolean(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1771,7 +1771,7 @@ func (ec *executionContext) _Query_nestedInputs(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().NestedInputs(rctx, args["input"].([][]*OuterInput))
@@ -1788,7 +1788,7 @@ func (ec *executionContext) _Query_nestedInputs(ctx context.Context, field graph
 		}
 		return graphql.MarshalBoolean(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1800,7 +1800,7 @@ func (ec *executionContext) _Query_nestedOutputs(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().NestedOutputs(rctx)
@@ -1881,7 +1881,7 @@ func (ec *executionContext) _Query_nestedOutputs(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1899,7 +1899,7 @@ func (ec *executionContext) _Query_keywords(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Keywords(rctx, args["input"].(*Keywords))
@@ -1915,7 +1915,7 @@ func (ec *executionContext) _Query_keywords(ctx context.Context, field graphql.C
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1927,7 +1927,7 @@ func (ec *executionContext) _Query_shapes(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Shapes(rctx)
@@ -1977,7 +1977,7 @@ func (ec *executionContext) _Query_shapes(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1989,7 +1989,7 @@ func (ec *executionContext) _Query_errorBubble(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().ErrorBubble(rctx)
@@ -2007,7 +2007,7 @@ func (ec *executionContext) _Query_errorBubble(ctx context.Context, field graphq
 
 		return ec._Error(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2019,7 +2019,7 @@ func (ec *executionContext) _Query_valid(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Valid(rctx)
@@ -2035,7 +2035,7 @@ func (ec *executionContext) _Query_valid(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2053,7 +2053,7 @@ func (ec *executionContext) _Query_user(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().User(rctx, args["id"].(int))
@@ -2070,7 +2070,7 @@ func (ec *executionContext) _Query_user(ctx context.Context, field graphql.Colle
 
 		return ec._User(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2088,7 +2088,7 @@ func (ec *executionContext) _Query_nullableArg(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().NullableArg(rctx, args["arg"].(*int))
@@ -2105,7 +2105,7 @@ func (ec *executionContext) _Query_nullableArg(ctx context.Context, field graphq
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2123,7 +2123,7 @@ func (ec *executionContext) _Query_keywordArgs(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().KeywordArgs(rctx, args["break"].(string), args["default"].(string), args["func"].(string), args["interface"].(string), args["select"].(string), args["case"].(string), args["defer"].(string), args["go"].(string), args["map"].(string), args["struct"].(string), args["chan"].(string), args["else"].(string), args["goto"].(string), args["package"].(string), args["switch"].(string), args["const"].(string), args["fallthrough"].(string), args["if"].(string), args["range"].(string), args["type"].(string), args["continue"].(string), args["for"].(string), args["import"].(string), args["return"].(string), args["var"].(string))
@@ -2139,7 +2139,7 @@ func (ec *executionContext) _Query_keywordArgs(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2157,7 +2157,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -2175,7 +2175,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2187,7 +2187,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -2205,7 +2205,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2248,7 +2248,7 @@ func (ec *executionContext) _Rectangle_length(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Length, nil
@@ -2261,7 +2261,7 @@ func (ec *executionContext) _Rectangle_length(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2273,7 +2273,7 @@ func (ec *executionContext) _Rectangle_width(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Width, nil
@@ -2286,7 +2286,7 @@ func (ec *executionContext) _Rectangle_width(ctx context.Context, field graphql.
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2298,7 +2298,7 @@ func (ec *executionContext) _Rectangle_area(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Area(), nil
@@ -2311,7 +2311,7 @@ func (ec *executionContext) _Rectangle_area(ctx context.Context, field graphql.C
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2440,7 +2440,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -2456,7 +2456,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2468,7 +2468,7 @@ func (ec *executionContext) _User_friends(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.User().Friends(rctx, obj)
@@ -2517,7 +2517,7 @@ func (ec *executionContext) _User_friends(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2571,7 +2571,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2587,7 +2587,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2599,7 +2599,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -2612,7 +2612,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2624,7 +2624,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -2649,7 +2649,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2661,7 +2661,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -2710,7 +2710,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2761,7 +2761,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2777,7 +2777,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2789,7 +2789,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -2802,7 +2802,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2814,7 +2814,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -2830,7 +2830,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2842,7 +2842,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -2855,7 +2855,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2916,7 +2916,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2932,7 +2932,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2944,7 +2944,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -2957,7 +2957,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2969,7 +2969,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -3018,7 +3018,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3030,7 +3030,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -3054,7 +3054,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3066,7 +3066,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -3082,7 +3082,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3094,7 +3094,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -3107,7 +3107,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3158,7 +3158,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -3174,7 +3174,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3186,7 +3186,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -3199,7 +3199,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3211,7 +3211,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -3235,7 +3235,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3247,7 +3247,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -3264,7 +3264,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3320,7 +3320,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -3369,7 +3369,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3381,7 +3381,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -3405,7 +3405,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3417,7 +3417,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -3435,7 +3435,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3447,7 +3447,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -3465,7 +3465,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3477,7 +3477,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -3526,7 +3526,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3584,7 +3584,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -3600,7 +3600,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3612,7 +3612,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -3629,7 +3629,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3641,7 +3641,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -3654,7 +3654,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3672,7 +3672,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -3718,7 +3718,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3730,7 +3730,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -3776,7 +3776,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3788,7 +3788,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -3834,7 +3834,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3852,7 +3852,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -3898,7 +3898,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3910,7 +3910,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -3956,7 +3956,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3968,7 +3968,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -3986,7 +3986,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/codegen/testserver/generated_test.go b/codegen/testserver/generated_test.go
index 4d98e166323..e73f237edc1 100644
--- a/codegen/testserver/generated_test.go
+++ b/codegen/testserver/generated_test.go
@@ -40,7 +40,7 @@ type testTracer struct {
 	append func(string)
 }
 
-func (tt *testTracer) StartRequestTracing(ctx context.Context) context.Context {
+func (tt *testTracer) StartOperationExecution(ctx context.Context) context.Context {
 	line := fmt.Sprintf("request:start:%d", tt.id)
 
 	tracerLogs, _ := ctx.Value("tracer").([]string)
@@ -49,11 +49,11 @@ func (tt *testTracer) StartRequestTracing(ctx context.Context) context.Context {
 	return ctx
 }
 
-func (tt *testTracer) EndRequestTracing(ctx context.Context) {
+func (tt *testTracer) EndOperationExecution(ctx context.Context) {
 	tt.append(fmt.Sprintf("request:end:%d", tt.id))
 }
 
-func (tt *testTracer) StartFieldTracing(ctx context.Context) context.Context {
+func (tt *testTracer) StartFieldExecution(ctx context.Context) context.Context {
 	rc := graphql.GetResolverContext(ctx)
 	line := fmt.Sprintf("resolver:start:%d:%v", tt.id, rc.Path())
 
@@ -63,7 +63,7 @@ func (tt *testTracer) StartFieldTracing(ctx context.Context) context.Context {
 	return ctx
 }
 
-func (tt *testTracer) EndFieldTracing(ctx context.Context) {
+func (tt *testTracer) EndFieldExecution(ctx context.Context) {
 	tt.append(fmt.Sprintf("resolver:end:%d", tt.id))
 }
 
diff --git a/example/chat/generated.go b/example/chat/generated.go
index d8d232cf73a..89b0f4d01df 100644
--- a/example/chat/generated.go
+++ b/example/chat/generated.go
@@ -392,7 +392,7 @@ func (ec *executionContext) _Chatroom_name(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -408,7 +408,7 @@ func (ec *executionContext) _Chatroom_name(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -420,7 +420,7 @@ func (ec *executionContext) _Chatroom_messages(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Messages, nil
@@ -469,7 +469,7 @@ func (ec *executionContext) _Chatroom_messages(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -526,7 +526,7 @@ func (ec *executionContext) _Message_id(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -542,7 +542,7 @@ func (ec *executionContext) _Message_id(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -554,7 +554,7 @@ func (ec *executionContext) _Message_text(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Text, nil
@@ -570,7 +570,7 @@ func (ec *executionContext) _Message_text(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -582,7 +582,7 @@ func (ec *executionContext) _Message_createdBy(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.CreatedBy, nil
@@ -598,7 +598,7 @@ func (ec *executionContext) _Message_createdBy(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -610,7 +610,7 @@ func (ec *executionContext) _Message_createdAt(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.CreatedAt, nil
@@ -626,7 +626,7 @@ func (ec *executionContext) _Message_createdAt(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalTime(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -678,7 +678,7 @@ func (ec *executionContext) _Mutation_post(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Mutation().Post(rctx, args["text"].(string), args["username"].(string), args["roomName"].(string))
@@ -695,7 +695,7 @@ func (ec *executionContext) _Mutation_post(ctx context.Context, field graphql.Co
 
 		return ec._Message(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -753,7 +753,7 @@ func (ec *executionContext) _Query_room(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Room(rctx, args["name"].(string))
@@ -771,7 +771,7 @@ func (ec *executionContext) _Query_room(ctx context.Context, field graphql.Colle
 
 		return ec._Chatroom(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -789,7 +789,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -807,7 +807,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -819,7 +819,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -837,7 +837,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -946,7 +946,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -962,7 +962,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -974,7 +974,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -987,7 +987,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -999,7 +999,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -1024,7 +1024,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1036,7 +1036,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1085,7 +1085,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1136,7 +1136,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1152,7 +1152,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1164,7 +1164,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1177,7 +1177,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1189,7 +1189,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1205,7 +1205,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1217,7 +1217,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1230,7 +1230,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1291,7 +1291,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1307,7 +1307,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1319,7 +1319,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1332,7 +1332,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1344,7 +1344,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1393,7 +1393,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1405,7 +1405,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1429,7 +1429,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1441,7 +1441,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1457,7 +1457,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1469,7 +1469,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1482,7 +1482,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1533,7 +1533,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1549,7 +1549,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1561,7 +1561,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1574,7 +1574,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1586,7 +1586,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1610,7 +1610,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1622,7 +1622,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1639,7 +1639,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1695,7 +1695,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1744,7 +1744,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1756,7 +1756,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1780,7 +1780,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1792,7 +1792,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1810,7 +1810,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1822,7 +1822,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1840,7 +1840,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1852,7 +1852,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1901,7 +1901,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1959,7 +1959,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -1975,7 +1975,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1987,7 +1987,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -2004,7 +2004,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2016,7 +2016,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -2029,7 +2029,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2047,7 +2047,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -2093,7 +2093,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2105,7 +2105,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2151,7 +2151,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2163,7 +2163,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2209,7 +2209,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2227,7 +2227,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2273,7 +2273,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2285,7 +2285,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2331,7 +2331,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2343,7 +2343,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2361,7 +2361,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/config/generated.go b/example/config/generated.go
index c16df3f5a2b..af17d74180e 100644
--- a/example/config/generated.go
+++ b/example/config/generated.go
@@ -306,7 +306,7 @@ func (ec *executionContext) _Mutation_createTodo(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Mutation().CreateTodo(rctx, args["input"].(NewTodo))
@@ -323,7 +323,7 @@ func (ec *executionContext) _Mutation_createTodo(ctx context.Context, field grap
 
 		return ec._Todo(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -378,7 +378,7 @@ func (ec *executionContext) _Query_todos(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Todos(rctx)
@@ -427,7 +427,7 @@ func (ec *executionContext) _Query_todos(ctx context.Context, field graphql.Coll
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -445,7 +445,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -463,7 +463,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -475,7 +475,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -493,7 +493,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -560,7 +560,7 @@ func (ec *executionContext) _Todo_id(ctx context.Context, field graphql.Collecte
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Todo().ID(rctx, obj)
@@ -576,7 +576,7 @@ func (ec *executionContext) _Todo_id(ctx context.Context, field graphql.Collecte
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -588,7 +588,7 @@ func (ec *executionContext) _Todo_databaseId(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DatabaseID, nil
@@ -604,7 +604,7 @@ func (ec *executionContext) _Todo_databaseId(ctx context.Context, field graphql.
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -616,7 +616,7 @@ func (ec *executionContext) _Todo_text(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -632,7 +632,7 @@ func (ec *executionContext) _Todo_text(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -644,7 +644,7 @@ func (ec *executionContext) _Todo_done(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Done, nil
@@ -660,7 +660,7 @@ func (ec *executionContext) _Todo_done(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -672,7 +672,7 @@ func (ec *executionContext) _Todo_user(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.User, nil
@@ -689,7 +689,7 @@ func (ec *executionContext) _Todo_user(ctx context.Context, field graphql.Collec
 
 		return ec._User(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -736,7 +736,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -752,7 +752,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -764,7 +764,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.FullName(), nil
@@ -780,7 +780,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -834,7 +834,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -850,7 +850,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -862,7 +862,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -875,7 +875,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -887,7 +887,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -912,7 +912,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -924,7 +924,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -973,7 +973,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1024,7 +1024,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1040,7 +1040,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1052,7 +1052,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1065,7 +1065,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1077,7 +1077,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1093,7 +1093,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1105,7 +1105,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1118,7 +1118,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1179,7 +1179,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1195,7 +1195,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1207,7 +1207,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1220,7 +1220,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1232,7 +1232,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1281,7 +1281,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1293,7 +1293,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1317,7 +1317,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1329,7 +1329,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1345,7 +1345,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1357,7 +1357,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1370,7 +1370,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1421,7 +1421,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1437,7 +1437,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1449,7 +1449,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1462,7 +1462,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1474,7 +1474,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1498,7 +1498,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1510,7 +1510,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1527,7 +1527,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1583,7 +1583,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1632,7 +1632,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1644,7 +1644,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1668,7 +1668,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1680,7 +1680,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1698,7 +1698,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1710,7 +1710,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1728,7 +1728,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1740,7 +1740,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1789,7 +1789,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1847,7 +1847,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -1863,7 +1863,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1875,7 +1875,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -1892,7 +1892,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1904,7 +1904,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -1917,7 +1917,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1935,7 +1935,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -1981,7 +1981,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1993,7 +1993,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2039,7 +2039,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2051,7 +2051,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2097,7 +2097,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2115,7 +2115,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2161,7 +2161,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2173,7 +2173,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2219,7 +2219,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2231,7 +2231,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2249,7 +2249,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/dataloader/generated.go b/example/dataloader/generated.go
index b8222c515be..18f17851e64 100644
--- a/example/dataloader/generated.go
+++ b/example/dataloader/generated.go
@@ -401,7 +401,7 @@ func (ec *executionContext) _Address_id(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -417,7 +417,7 @@ func (ec *executionContext) _Address_id(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -429,7 +429,7 @@ func (ec *executionContext) _Address_street(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Street, nil
@@ -445,7 +445,7 @@ func (ec *executionContext) _Address_street(ctx context.Context, field graphql.C
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -457,7 +457,7 @@ func (ec *executionContext) _Address_country(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Country, nil
@@ -473,7 +473,7 @@ func (ec *executionContext) _Address_country(ctx context.Context, field graphql.
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -533,7 +533,7 @@ func (ec *executionContext) _Customer_id(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -549,7 +549,7 @@ func (ec *executionContext) _Customer_id(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -561,7 +561,7 @@ func (ec *executionContext) _Customer_name(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -577,7 +577,7 @@ func (ec *executionContext) _Customer_name(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -589,7 +589,7 @@ func (ec *executionContext) _Customer_address(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Customer().Address(rctx, obj)
@@ -607,7 +607,7 @@ func (ec *executionContext) _Customer_address(ctx context.Context, field graphql
 
 		return ec._Address(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -619,7 +619,7 @@ func (ec *executionContext) _Customer_orders(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Customer().Orders(rctx, obj)
@@ -665,7 +665,7 @@ func (ec *executionContext) _Customer_orders(ctx context.Context, field graphql.
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -707,7 +707,7 @@ func (ec *executionContext) _Item_name(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -723,7 +723,7 @@ func (ec *executionContext) _Item_name(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -782,7 +782,7 @@ func (ec *executionContext) _Order_id(ctx context.Context, field graphql.Collect
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -798,7 +798,7 @@ func (ec *executionContext) _Order_id(ctx context.Context, field graphql.Collect
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -810,7 +810,7 @@ func (ec *executionContext) _Order_date(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Date, nil
@@ -826,7 +826,7 @@ func (ec *executionContext) _Order_date(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalTime(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -838,7 +838,7 @@ func (ec *executionContext) _Order_amount(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Amount, nil
@@ -854,7 +854,7 @@ func (ec *executionContext) _Order_amount(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -866,7 +866,7 @@ func (ec *executionContext) _Order_items(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Order().Items(rctx, obj)
@@ -912,7 +912,7 @@ func (ec *executionContext) _Order_items(ctx context.Context, field graphql.Coll
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -976,7 +976,7 @@ func (ec *executionContext) _Query_customers(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Customers(rctx)
@@ -1022,7 +1022,7 @@ func (ec *executionContext) _Query_customers(ctx context.Context, field graphql.
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1040,7 +1040,7 @@ func (ec *executionContext) _Query_torture1d(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Torture1d(rctx, args["customerIds"].([]int))
@@ -1086,7 +1086,7 @@ func (ec *executionContext) _Query_torture1d(ctx context.Context, field graphql.
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1104,7 +1104,7 @@ func (ec *executionContext) _Query_torture2d(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Torture2d(rctx, args["customerIds"].([][]int))
@@ -1181,7 +1181,7 @@ func (ec *executionContext) _Query_torture2d(ctx context.Context, field graphql.
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1199,7 +1199,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -1217,7 +1217,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1229,7 +1229,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -1247,7 +1247,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1301,7 +1301,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1317,7 +1317,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1329,7 +1329,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1342,7 +1342,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1354,7 +1354,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -1379,7 +1379,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1391,7 +1391,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1440,7 +1440,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1491,7 +1491,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1507,7 +1507,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1519,7 +1519,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1532,7 +1532,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1544,7 +1544,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1560,7 +1560,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1572,7 +1572,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1585,7 +1585,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1646,7 +1646,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1662,7 +1662,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1674,7 +1674,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1687,7 +1687,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1699,7 +1699,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1748,7 +1748,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1760,7 +1760,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1784,7 +1784,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1796,7 +1796,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1812,7 +1812,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1824,7 +1824,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1837,7 +1837,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1888,7 +1888,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1904,7 +1904,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1916,7 +1916,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1929,7 +1929,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1941,7 +1941,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1965,7 +1965,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1977,7 +1977,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1994,7 +1994,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2050,7 +2050,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -2099,7 +2099,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2111,7 +2111,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -2135,7 +2135,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2147,7 +2147,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -2165,7 +2165,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2177,7 +2177,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -2195,7 +2195,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2207,7 +2207,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -2256,7 +2256,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2314,7 +2314,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -2330,7 +2330,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2342,7 +2342,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -2359,7 +2359,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2371,7 +2371,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -2384,7 +2384,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2402,7 +2402,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -2448,7 +2448,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2460,7 +2460,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2506,7 +2506,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2518,7 +2518,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2564,7 +2564,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2582,7 +2582,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2628,7 +2628,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2640,7 +2640,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2686,7 +2686,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2698,7 +2698,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2716,7 +2716,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/scalars/generated.go b/example/scalars/generated.go
index a0811e9906a..bb7738e39dd 100644
--- a/example/scalars/generated.go
+++ b/example/scalars/generated.go
@@ -332,7 +332,7 @@ func (ec *executionContext) _Address_id(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -348,7 +348,7 @@ func (ec *executionContext) _Address_id(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return model.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -360,7 +360,7 @@ func (ec *executionContext) _Address_location(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Location, nil
@@ -377,7 +377,7 @@ func (ec *executionContext) _Address_location(ctx context.Context, field graphql
 		}
 		return *res
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -444,7 +444,7 @@ func (ec *executionContext) _Query_user(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().User(rctx, args["id"].(external.ObjectID))
@@ -462,7 +462,7 @@ func (ec *executionContext) _Query_user(ctx context.Context, field graphql.Colle
 
 		return ec._User(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -480,7 +480,7 @@ func (ec *executionContext) _Query_search(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Search(rctx, args["input"].(*model.SearchArgs))
@@ -529,7 +529,7 @@ func (ec *executionContext) _Query_search(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -547,7 +547,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -565,7 +565,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -577,7 +577,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -595,7 +595,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -672,7 +672,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -688,7 +688,7 @@ func (ec *executionContext) _User_id(ctx context.Context, field graphql.Collecte
 	resMarshaler := func() graphql.Marshaler {
 		return model.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -700,7 +700,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -716,7 +716,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -728,7 +728,7 @@ func (ec *executionContext) _User_created(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Created, nil
@@ -741,7 +741,7 @@ func (ec *executionContext) _User_created(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return model.MarshalTimestamp(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -753,7 +753,7 @@ func (ec *executionContext) _User_isBanned(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsBanned, nil
@@ -769,7 +769,7 @@ func (ec *executionContext) _User_isBanned(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(bool(res))
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -781,7 +781,7 @@ func (ec *executionContext) _User_primitiveResolver(ctx context.Context, field g
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.User().PrimitiveResolver(rctx, obj)
@@ -797,7 +797,7 @@ func (ec *executionContext) _User_primitiveResolver(ctx context.Context, field g
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -809,7 +809,7 @@ func (ec *executionContext) _User_customResolver(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.User().CustomResolver(rctx, obj)
@@ -825,7 +825,7 @@ func (ec *executionContext) _User_customResolver(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return res
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -837,7 +837,7 @@ func (ec *executionContext) _User_address(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Address, nil
@@ -851,7 +851,7 @@ func (ec *executionContext) _User_address(ctx context.Context, field graphql.Col
 
 		return ec._Address(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -863,7 +863,7 @@ func (ec *executionContext) _User_tier(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Tier, nil
@@ -876,7 +876,7 @@ func (ec *executionContext) _User_tier(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return res
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -930,7 +930,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -946,7 +946,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -958,7 +958,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -971,7 +971,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -983,7 +983,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -1008,7 +1008,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1020,7 +1020,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1069,7 +1069,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1120,7 +1120,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1136,7 +1136,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1148,7 +1148,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1161,7 +1161,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1173,7 +1173,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1189,7 +1189,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1201,7 +1201,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1214,7 +1214,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1275,7 +1275,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1291,7 +1291,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1303,7 +1303,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1316,7 +1316,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1328,7 +1328,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1377,7 +1377,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1389,7 +1389,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1413,7 +1413,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1425,7 +1425,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1441,7 +1441,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1453,7 +1453,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1466,7 +1466,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1517,7 +1517,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1533,7 +1533,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1545,7 +1545,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1558,7 +1558,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1570,7 +1570,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1594,7 +1594,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1606,7 +1606,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1623,7 +1623,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1679,7 +1679,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1728,7 +1728,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1740,7 +1740,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1764,7 +1764,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1776,7 +1776,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1794,7 +1794,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1806,7 +1806,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1824,7 +1824,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1836,7 +1836,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1885,7 +1885,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1943,7 +1943,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -1959,7 +1959,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1971,7 +1971,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -1988,7 +1988,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2000,7 +2000,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -2013,7 +2013,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2031,7 +2031,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -2077,7 +2077,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2089,7 +2089,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2135,7 +2135,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2147,7 +2147,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2193,7 +2193,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2211,7 +2211,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2257,7 +2257,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2269,7 +2269,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2315,7 +2315,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2327,7 +2327,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2345,7 +2345,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/selection/generated.go b/example/selection/generated.go
index 1e55434e961..94eca6a622d 100644
--- a/example/selection/generated.go
+++ b/example/selection/generated.go
@@ -263,7 +263,7 @@ func (ec *executionContext) _Like_reaction(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Reaction, nil
@@ -279,7 +279,7 @@ func (ec *executionContext) _Like_reaction(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -291,7 +291,7 @@ func (ec *executionContext) _Like_sent(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Sent, nil
@@ -307,7 +307,7 @@ func (ec *executionContext) _Like_sent(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalTime(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -319,7 +319,7 @@ func (ec *executionContext) _Like_selection(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Selection, nil
@@ -341,7 +341,7 @@ func (ec *executionContext) _Like_selection(ctx context.Context, field graphql.C
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -353,7 +353,7 @@ func (ec *executionContext) _Like_collected(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Collected, nil
@@ -375,7 +375,7 @@ func (ec *executionContext) _Like_collected(ctx context.Context, field graphql.C
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -426,7 +426,7 @@ func (ec *executionContext) _Post_message(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Message, nil
@@ -442,7 +442,7 @@ func (ec *executionContext) _Post_message(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -454,7 +454,7 @@ func (ec *executionContext) _Post_sent(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Sent, nil
@@ -470,7 +470,7 @@ func (ec *executionContext) _Post_sent(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalTime(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -482,7 +482,7 @@ func (ec *executionContext) _Post_selection(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Selection, nil
@@ -504,7 +504,7 @@ func (ec *executionContext) _Post_selection(ctx context.Context, field graphql.C
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -516,7 +516,7 @@ func (ec *executionContext) _Post_collected(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Collected, nil
@@ -538,7 +538,7 @@ func (ec *executionContext) _Post_collected(ctx context.Context, field graphql.C
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -590,7 +590,7 @@ func (ec *executionContext) _Query_events(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Events(rctx)
@@ -636,7 +636,7 @@ func (ec *executionContext) _Query_events(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -654,7 +654,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -672,7 +672,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -684,7 +684,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -702,7 +702,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -756,7 +756,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -772,7 +772,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -784,7 +784,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -797,7 +797,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -809,7 +809,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -834,7 +834,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -846,7 +846,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -895,7 +895,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -946,7 +946,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -962,7 +962,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -974,7 +974,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -987,7 +987,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -999,7 +999,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1015,7 +1015,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1027,7 +1027,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1040,7 +1040,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1101,7 +1101,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1117,7 +1117,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1129,7 +1129,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1142,7 +1142,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1154,7 +1154,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1203,7 +1203,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1215,7 +1215,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1239,7 +1239,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1251,7 +1251,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1267,7 +1267,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1279,7 +1279,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1292,7 +1292,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1343,7 +1343,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1359,7 +1359,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1371,7 +1371,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1384,7 +1384,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1396,7 +1396,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1420,7 +1420,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1432,7 +1432,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1449,7 +1449,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1505,7 +1505,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1554,7 +1554,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1566,7 +1566,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1590,7 +1590,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1602,7 +1602,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1620,7 +1620,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1632,7 +1632,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1650,7 +1650,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1662,7 +1662,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1711,7 +1711,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1769,7 +1769,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -1785,7 +1785,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1797,7 +1797,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -1814,7 +1814,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1826,7 +1826,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -1839,7 +1839,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1857,7 +1857,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -1903,7 +1903,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1915,7 +1915,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -1961,7 +1961,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1973,7 +1973,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2019,7 +2019,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2037,7 +2037,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2083,7 +2083,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2095,7 +2095,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2141,7 +2141,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2153,7 +2153,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2171,7 +2171,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/starwars/generated.go b/example/starwars/generated.go
index 2cd1198168c..e2bb6a8c183 100644
--- a/example/starwars/generated.go
+++ b/example/starwars/generated.go
@@ -887,7 +887,7 @@ func (ec *executionContext) _Droid_id(ctx context.Context, field graphql.Collect
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -903,7 +903,7 @@ func (ec *executionContext) _Droid_id(ctx context.Context, field graphql.Collect
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -915,7 +915,7 @@ func (ec *executionContext) _Droid_name(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -931,7 +931,7 @@ func (ec *executionContext) _Droid_name(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -943,7 +943,7 @@ func (ec *executionContext) _Droid_friends(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Droid().Friends(rctx, obj)
@@ -989,7 +989,7 @@ func (ec *executionContext) _Droid_friends(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1007,7 +1007,7 @@ func (ec *executionContext) _Droid_friendsConnection(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Droid().FriendsConnection(rctx, obj, args["first"].(*int), args["after"].(*string))
@@ -1024,7 +1024,7 @@ func (ec *executionContext) _Droid_friendsConnection(ctx context.Context, field
 
 		return ec._FriendsConnection(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1036,7 +1036,7 @@ func (ec *executionContext) _Droid_appearsIn(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.AppearsIn, nil
@@ -1061,7 +1061,7 @@ func (ec *executionContext) _Droid_appearsIn(ctx context.Context, field graphql.
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1073,7 +1073,7 @@ func (ec *executionContext) _Droid_primaryFunction(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PrimaryFunction, nil
@@ -1086,7 +1086,7 @@ func (ec *executionContext) _Droid_primaryFunction(ctx context.Context, field gr
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1146,7 +1146,7 @@ func (ec *executionContext) _FriendsConnection_totalCount(ctx context.Context, f
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.TotalCount(), nil
@@ -1162,7 +1162,7 @@ func (ec *executionContext) _FriendsConnection_totalCount(ctx context.Context, f
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1174,7 +1174,7 @@ func (ec *executionContext) _FriendsConnection_edges(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.FriendsConnection().Edges(rctx, obj)
@@ -1220,7 +1220,7 @@ func (ec *executionContext) _FriendsConnection_edges(ctx context.Context, field
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1232,7 +1232,7 @@ func (ec *executionContext) _FriendsConnection_friends(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.FriendsConnection().Friends(rctx, obj)
@@ -1278,7 +1278,7 @@ func (ec *executionContext) _FriendsConnection_friends(ctx context.Context, fiel
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1290,7 +1290,7 @@ func (ec *executionContext) _FriendsConnection_pageInfo(ctx context.Context, fie
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PageInfo(), nil
@@ -1307,7 +1307,7 @@ func (ec *executionContext) _FriendsConnection_pageInfo(ctx context.Context, fie
 
 		return ec._PageInfo(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1351,7 +1351,7 @@ func (ec *executionContext) _FriendsEdge_cursor(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Cursor, nil
@@ -1367,7 +1367,7 @@ func (ec *executionContext) _FriendsEdge_cursor(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1379,7 +1379,7 @@ func (ec *executionContext) _FriendsEdge_node(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Node, nil
@@ -1393,7 +1393,7 @@ func (ec *executionContext) _FriendsEdge_node(ctx context.Context, field graphql
 
 		return ec._Character(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1474,7 +1474,7 @@ func (ec *executionContext) _Human_id(ctx context.Context, field graphql.Collect
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -1490,7 +1490,7 @@ func (ec *executionContext) _Human_id(ctx context.Context, field graphql.Collect
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1502,7 +1502,7 @@ func (ec *executionContext) _Human_name(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1518,7 +1518,7 @@ func (ec *executionContext) _Human_name(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1536,7 +1536,7 @@ func (ec *executionContext) _Human_height(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Height(args["unit"].(LengthUnit)), nil
@@ -1552,7 +1552,7 @@ func (ec *executionContext) _Human_height(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1564,7 +1564,7 @@ func (ec *executionContext) _Human_mass(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Mass, nil
@@ -1577,7 +1577,7 @@ func (ec *executionContext) _Human_mass(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1589,7 +1589,7 @@ func (ec *executionContext) _Human_friends(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Human().Friends(rctx, obj)
@@ -1635,7 +1635,7 @@ func (ec *executionContext) _Human_friends(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1653,7 +1653,7 @@ func (ec *executionContext) _Human_friendsConnection(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Human().FriendsConnection(rctx, obj, args["first"].(*int), args["after"].(*string))
@@ -1670,7 +1670,7 @@ func (ec *executionContext) _Human_friendsConnection(ctx context.Context, field
 
 		return ec._FriendsConnection(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1682,7 +1682,7 @@ func (ec *executionContext) _Human_appearsIn(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.AppearsIn, nil
@@ -1707,7 +1707,7 @@ func (ec *executionContext) _Human_appearsIn(ctx context.Context, field graphql.
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1719,7 +1719,7 @@ func (ec *executionContext) _Human_starships(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Human().Starships(rctx, obj)
@@ -1765,7 +1765,7 @@ func (ec *executionContext) _Human_starships(ctx context.Context, field graphql.
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1814,7 +1814,7 @@ func (ec *executionContext) _Mutation_createReview(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Mutation().CreateReview(rctx, args["episode"].(Episode), args["review"].(Review))
@@ -1832,7 +1832,7 @@ func (ec *executionContext) _Mutation_createReview(ctx context.Context, field gr
 
 		return ec._Review(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1884,7 +1884,7 @@ func (ec *executionContext) _PageInfo_startCursor(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.StartCursor, nil
@@ -1900,7 +1900,7 @@ func (ec *executionContext) _PageInfo_startCursor(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1912,7 +1912,7 @@ func (ec *executionContext) _PageInfo_endCursor(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EndCursor, nil
@@ -1928,7 +1928,7 @@ func (ec *executionContext) _PageInfo_endCursor(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1940,7 +1940,7 @@ func (ec *executionContext) _PageInfo_hasNextPage(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.HasNextPage, nil
@@ -1956,7 +1956,7 @@ func (ec *executionContext) _PageInfo_hasNextPage(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2056,7 +2056,7 @@ func (ec *executionContext) _Query_hero(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Hero(rctx, args["episode"].(*Episode))
@@ -2070,7 +2070,7 @@ func (ec *executionContext) _Query_hero(ctx context.Context, field graphql.Colle
 
 		return ec._Character(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2088,7 +2088,7 @@ func (ec *executionContext) _Query_reviews(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Reviews(rctx, args["episode"].(Episode), args["since"].(*time.Time))
@@ -2137,7 +2137,7 @@ func (ec *executionContext) _Query_reviews(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2155,7 +2155,7 @@ func (ec *executionContext) _Query_search(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Search(rctx, args["text"].(string))
@@ -2204,7 +2204,7 @@ func (ec *executionContext) _Query_search(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2222,7 +2222,7 @@ func (ec *executionContext) _Query_character(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Character(rctx, args["id"].(string))
@@ -2236,7 +2236,7 @@ func (ec *executionContext) _Query_character(ctx context.Context, field graphql.
 
 		return ec._Character(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2254,7 +2254,7 @@ func (ec *executionContext) _Query_droid(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Droid(rctx, args["id"].(string))
@@ -2272,7 +2272,7 @@ func (ec *executionContext) _Query_droid(ctx context.Context, field graphql.Coll
 
 		return ec._Droid(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2290,7 +2290,7 @@ func (ec *executionContext) _Query_human(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Human(rctx, args["id"].(string))
@@ -2308,7 +2308,7 @@ func (ec *executionContext) _Query_human(ctx context.Context, field graphql.Coll
 
 		return ec._Human(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2326,7 +2326,7 @@ func (ec *executionContext) _Query_starship(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Starship(rctx, args["id"].(string))
@@ -2344,7 +2344,7 @@ func (ec *executionContext) _Query_starship(ctx context.Context, field graphql.C
 
 		return ec._Starship(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2362,7 +2362,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -2380,7 +2380,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2392,7 +2392,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -2410,7 +2410,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2456,7 +2456,7 @@ func (ec *executionContext) _Review_stars(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Stars, nil
@@ -2472,7 +2472,7 @@ func (ec *executionContext) _Review_stars(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2484,7 +2484,7 @@ func (ec *executionContext) _Review_commentary(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Commentary, nil
@@ -2501,7 +2501,7 @@ func (ec *executionContext) _Review_commentary(ctx context.Context, field graphq
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2513,7 +2513,7 @@ func (ec *executionContext) _Review_time(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Time, nil
@@ -2526,7 +2526,7 @@ func (ec *executionContext) _Review_time(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalTime(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2588,7 +2588,7 @@ func (ec *executionContext) _Starship_id(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -2604,7 +2604,7 @@ func (ec *executionContext) _Starship_id(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalID(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2616,7 +2616,7 @@ func (ec *executionContext) _Starship_name(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2632,7 +2632,7 @@ func (ec *executionContext) _Starship_name(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2650,7 +2650,7 @@ func (ec *executionContext) _Starship_length(ctx context.Context, field graphql.
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Starship().Length(rctx, obj, args["unit"].(*LengthUnit))
@@ -2666,7 +2666,7 @@ func (ec *executionContext) _Starship_length(ctx context.Context, field graphql.
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalFloat(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2678,7 +2678,7 @@ func (ec *executionContext) _Starship_history(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.History, nil
@@ -2712,7 +2712,7 @@ func (ec *executionContext) _Starship_history(ctx context.Context, field graphql
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2766,7 +2766,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2782,7 +2782,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2794,7 +2794,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -2807,7 +2807,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2819,7 +2819,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -2844,7 +2844,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2856,7 +2856,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -2905,7 +2905,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2956,7 +2956,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -2972,7 +2972,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2984,7 +2984,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -2997,7 +2997,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3009,7 +3009,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -3025,7 +3025,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3037,7 +3037,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -3050,7 +3050,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3111,7 +3111,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -3127,7 +3127,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3139,7 +3139,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -3152,7 +3152,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3164,7 +3164,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -3213,7 +3213,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3225,7 +3225,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -3249,7 +3249,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3261,7 +3261,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -3277,7 +3277,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3289,7 +3289,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -3302,7 +3302,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3353,7 +3353,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -3369,7 +3369,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3381,7 +3381,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -3394,7 +3394,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3406,7 +3406,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -3430,7 +3430,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3442,7 +3442,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -3459,7 +3459,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3515,7 +3515,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -3564,7 +3564,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3576,7 +3576,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -3600,7 +3600,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3612,7 +3612,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -3630,7 +3630,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3642,7 +3642,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -3660,7 +3660,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3672,7 +3672,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -3721,7 +3721,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3779,7 +3779,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -3795,7 +3795,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3807,7 +3807,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -3824,7 +3824,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3836,7 +3836,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -3849,7 +3849,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3867,7 +3867,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -3913,7 +3913,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3925,7 +3925,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -3971,7 +3971,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -3983,7 +3983,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -4029,7 +4029,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -4047,7 +4047,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -4093,7 +4093,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -4105,7 +4105,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -4151,7 +4151,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -4163,7 +4163,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -4181,7 +4181,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/example/todo/generated.go b/example/todo/generated.go
index 258b729207e..9f86f72e94b 100644
--- a/example/todo/generated.go
+++ b/example/todo/generated.go
@@ -361,7 +361,7 @@ func (ec *executionContext) _MyMutation_createTodo(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.MyMutation().CreateTodo(rctx, args["todo"].(TodoInput))
@@ -378,7 +378,7 @@ func (ec *executionContext) _MyMutation_createTodo(ctx context.Context, field gr
 
 		return ec._Todo(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -396,7 +396,7 @@ func (ec *executionContext) _MyMutation_updateTodo(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.MyMutation().UpdateTodo(rctx, args["id"].(int), args["changes"].(map[string]interface{}))
@@ -414,7 +414,7 @@ func (ec *executionContext) _MyMutation_updateTodo(ctx context.Context, field gr
 
 		return ec._Todo(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -487,7 +487,7 @@ func (ec *executionContext) _MyQuery_todo(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.MyQuery().Todo(rctx, args["id"].(int))
@@ -505,7 +505,7 @@ func (ec *executionContext) _MyQuery_todo(ctx context.Context, field graphql.Col
 
 		return ec._Todo(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -517,7 +517,7 @@ func (ec *executionContext) _MyQuery_lastTodo(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.MyQuery().LastTodo(rctx)
@@ -535,7 +535,7 @@ func (ec *executionContext) _MyQuery_lastTodo(ctx context.Context, field graphql
 
 		return ec._Todo(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -547,7 +547,7 @@ func (ec *executionContext) _MyQuery_todos(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.MyQuery().Todos(rctx)
@@ -596,7 +596,7 @@ func (ec *executionContext) _MyQuery_todos(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -614,7 +614,7 @@ func (ec *executionContext) _MyQuery___type(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -632,7 +632,7 @@ func (ec *executionContext) _MyQuery___type(ctx context.Context, field graphql.C
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -644,7 +644,7 @@ func (ec *executionContext) _MyQuery___schema(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -662,7 +662,7 @@ func (ec *executionContext) _MyQuery___schema(ctx context.Context, field graphql
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -714,7 +714,7 @@ func (ec *executionContext) _Todo_id(ctx context.Context, field graphql.Collecte
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.ID, nil
@@ -730,7 +730,7 @@ func (ec *executionContext) _Todo_id(ctx context.Context, field graphql.Collecte
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalInt(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -742,7 +742,7 @@ func (ec *executionContext) _Todo_text(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Text, nil
@@ -758,7 +758,7 @@ func (ec *executionContext) _Todo_text(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -770,7 +770,7 @@ func (ec *executionContext) _Todo_done(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Done, nil
@@ -786,7 +786,7 @@ func (ec *executionContext) _Todo_done(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -840,7 +840,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -856,7 +856,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -868,7 +868,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -881,7 +881,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -893,7 +893,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -918,7 +918,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -930,7 +930,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -979,7 +979,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1030,7 +1030,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1046,7 +1046,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1058,7 +1058,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1071,7 +1071,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1083,7 +1083,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1099,7 +1099,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1111,7 +1111,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1124,7 +1124,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1185,7 +1185,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1201,7 +1201,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1213,7 +1213,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1226,7 +1226,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1238,7 +1238,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1287,7 +1287,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1299,7 +1299,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1323,7 +1323,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1335,7 +1335,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1351,7 +1351,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1363,7 +1363,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1376,7 +1376,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1427,7 +1427,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1443,7 +1443,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1455,7 +1455,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1468,7 +1468,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1480,7 +1480,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1504,7 +1504,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1516,7 +1516,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1533,7 +1533,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1589,7 +1589,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1638,7 +1638,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1650,7 +1650,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1674,7 +1674,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1686,7 +1686,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1704,7 +1704,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1716,7 +1716,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1734,7 +1734,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1746,7 +1746,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1795,7 +1795,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1853,7 +1853,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -1869,7 +1869,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1881,7 +1881,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -1898,7 +1898,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1910,7 +1910,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -1923,7 +1923,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1941,7 +1941,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -1987,7 +1987,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1999,7 +1999,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2045,7 +2045,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2057,7 +2057,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2103,7 +2103,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2121,7 +2121,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2167,7 +2167,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2179,7 +2179,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2225,7 +2225,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2237,7 +2237,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2255,7 +2255,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
diff --git a/graphql/tracer.go b/graphql/tracer.go
index cd38a870351..b40dd143923 100644
--- a/graphql/tracer.go
+++ b/graphql/tracer.go
@@ -5,24 +5,24 @@ import "context"
 var _ Tracer = (*NopTracer)(nil)
 
 type Tracer interface {
-	StartRequestTracing(ctx context.Context) context.Context
-	EndRequestTracing(ctx context.Context)
-	StartFieldTracing(ctx context.Context) context.Context
-	EndFieldTracing(ctx context.Context)
+	StartOperationExecution(ctx context.Context) context.Context
+	EndOperationExecution(ctx context.Context)
+	StartFieldExecution(ctx context.Context) context.Context
+	EndFieldExecution(ctx context.Context)
 }
 
 type NopTracer struct{}
 
-func (NopTracer) StartRequestTracing(ctx context.Context) context.Context {
+func (NopTracer) StartOperationExecution(ctx context.Context) context.Context {
 	return ctx
 }
 
-func (NopTracer) EndRequestTracing(ctx context.Context) {
+func (NopTracer) EndOperationExecution(ctx context.Context) {
 }
 
-func (NopTracer) StartFieldTracing(ctx context.Context) context.Context {
+func (NopTracer) StartFieldExecution(ctx context.Context) context.Context {
 	return ctx
 }
 
-func (NopTracer) EndFieldTracing(ctx context.Context) {
+func (NopTracer) EndFieldExecution(ctx context.Context) {
 }
diff --git a/handler/graphql.go b/handler/graphql.go
index 091451971c5..cb2e2a7de78 100644
--- a/handler/graphql.go
+++ b/handler/graphql.go
@@ -145,9 +145,9 @@ func Tracer(tracer graphql.Tracer) Option {
 		}
 
 		opt := RequestMiddleware(func(ctx context.Context, next func(ctx context.Context) []byte) []byte {
-			ctx = tracer.StartRequestTracing(ctx)
+			ctx = tracer.StartOperationExecution(ctx)
 			resp := next(ctx)
-			tracer.EndRequestTracing(ctx)
+			tracer.EndOperationExecution(ctx)
 
 			return resp
 		})
@@ -160,26 +160,26 @@ type tracerWrapper struct {
 	tracer2 graphql.Tracer
 }
 
-func (tw *tracerWrapper) StartRequestTracing(ctx context.Context) context.Context {
-	ctx = tw.tracer1.StartRequestTracing(ctx)
-	ctx = tw.tracer2.StartRequestTracing(ctx)
+func (tw *tracerWrapper) StartOperationExecution(ctx context.Context) context.Context {
+	ctx = tw.tracer1.StartOperationExecution(ctx)
+	ctx = tw.tracer2.StartOperationExecution(ctx)
 	return ctx
 }
 
-func (tw *tracerWrapper) EndRequestTracing(ctx context.Context) {
-	tw.tracer2.EndRequestTracing(ctx)
-	tw.tracer1.EndRequestTracing(ctx)
+func (tw *tracerWrapper) EndOperationExecution(ctx context.Context) {
+	tw.tracer2.EndOperationExecution(ctx)
+	tw.tracer1.EndOperationExecution(ctx)
 }
 
-func (tw *tracerWrapper) StartFieldTracing(ctx context.Context) context.Context {
-	ctx = tw.tracer1.StartFieldTracing(ctx)
-	ctx = tw.tracer2.StartFieldTracing(ctx)
+func (tw *tracerWrapper) StartFieldExecution(ctx context.Context) context.Context {
+	ctx = tw.tracer1.StartFieldExecution(ctx)
+	ctx = tw.tracer2.StartFieldExecution(ctx)
 	return ctx
 }
 
-func (tw *tracerWrapper) EndFieldTracing(ctx context.Context) {
-	tw.tracer2.EndFieldTracing(ctx)
-	tw.tracer1.EndFieldTracing(ctx)
+func (tw *tracerWrapper) EndFieldExecution(ctx context.Context) {
+	tw.tracer2.EndFieldExecution(ctx)
+	tw.tracer1.EndFieldExecution(ctx)
 }
 
 // CacheSize sets the maximum size of the query cache.
diff --git a/integration/generated.go b/integration/generated.go
index 4af60c76e16..e8da5ca07b5 100644
--- a/integration/generated.go
+++ b/integration/generated.go
@@ -373,7 +373,7 @@ func (ec *executionContext) _Element_child(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Element().Child(rctx, obj)
@@ -390,7 +390,7 @@ func (ec *executionContext) _Element_child(ctx context.Context, field graphql.Co
 
 		return ec._Element(ctx, field.Selections, &res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -402,7 +402,7 @@ func (ec *executionContext) _Element_error(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Element().Error(rctx, obj)
@@ -418,7 +418,7 @@ func (ec *executionContext) _Element_error(ctx context.Context, field graphql.Co
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -430,7 +430,7 @@ func (ec *executionContext) _Element_mismatched(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Element().Mismatched(rctx, obj)
@@ -452,7 +452,7 @@ func (ec *executionContext) _Element_mismatched(ctx context.Context, field graph
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -537,7 +537,7 @@ func (ec *executionContext) _Query_path(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Path(rctx)
@@ -587,7 +587,7 @@ func (ec *executionContext) _Query_path(ctx context.Context, field graphql.Colle
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -605,7 +605,7 @@ func (ec *executionContext) _Query_date(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Date(rctx, args["filter"].(models.DateFilter))
@@ -621,7 +621,7 @@ func (ec *executionContext) _Query_date(ctx context.Context, field graphql.Colle
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -633,7 +633,7 @@ func (ec *executionContext) _Query_viewer(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Viewer(rctx)
@@ -651,7 +651,7 @@ func (ec *executionContext) _Query_viewer(ctx context.Context, field graphql.Col
 
 		return ec._Viewer(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -663,7 +663,7 @@ func (ec *executionContext) _Query_jsonEncoding(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().JSONEncoding(rctx)
@@ -679,7 +679,7 @@ func (ec *executionContext) _Query_jsonEncoding(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -697,7 +697,7 @@ func (ec *executionContext) _Query_error(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.Query().Error(rctx, args["type"].(*models.ErrorType))
@@ -713,7 +713,7 @@ func (ec *executionContext) _Query_error(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -731,7 +731,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectType(args["name"].(string)), nil
@@ -749,7 +749,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -761,7 +761,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, nil, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.introspectSchema(), nil
@@ -779,7 +779,7 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 
 		return ec.___Schema(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -831,7 +831,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -847,7 +847,7 @@ func (ec *executionContext) _User_name(ctx context.Context, field graphql.Collec
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -859,7 +859,7 @@ func (ec *executionContext) _User_likes(ctx context.Context, field graphql.Colle
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return ec.resolvers.User().Likes(rctx, obj)
@@ -884,7 +884,7 @@ func (ec *executionContext) _User_likes(ctx context.Context, field graphql.Colle
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -923,7 +923,7 @@ func (ec *executionContext) _Viewer_user(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.User, nil
@@ -941,7 +941,7 @@ func (ec *executionContext) _Viewer_user(ctx context.Context, field graphql.Coll
 
 		return ec._User(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -995,7 +995,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1011,7 +1011,7 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1023,7 +1023,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1036,7 +1036,7 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1048,7 +1048,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Locations, nil
@@ -1073,7 +1073,7 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1085,7 +1085,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1134,7 +1134,7 @@ func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1185,7 +1185,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1201,7 +1201,7 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1213,7 +1213,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1226,7 +1226,7 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1238,7 +1238,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1254,7 +1254,7 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1266,7 +1266,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1279,7 +1279,7 @@ func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context,
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1340,7 +1340,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1356,7 +1356,7 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1368,7 +1368,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1381,7 +1381,7 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1393,7 +1393,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Args, nil
@@ -1442,7 +1442,7 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1454,7 +1454,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1478,7 +1478,7 @@ func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.Col
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1490,7 +1490,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.IsDeprecated, nil
@@ -1506,7 +1506,7 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalBoolean(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1518,7 +1518,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DeprecationReason, nil
@@ -1531,7 +1531,7 @@ func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, fiel
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1582,7 +1582,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name, nil
@@ -1598,7 +1598,7 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1610,7 +1610,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description, nil
@@ -1623,7 +1623,7 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1635,7 +1635,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Type, nil
@@ -1659,7 +1659,7 @@ func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphq
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1671,7 +1671,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.DefaultValue, nil
@@ -1688,7 +1688,7 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1744,7 +1744,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Types(), nil
@@ -1793,7 +1793,7 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1805,7 +1805,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.QueryType(), nil
@@ -1829,7 +1829,7 @@ func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graph
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1841,7 +1841,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.MutationType(), nil
@@ -1859,7 +1859,7 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1871,7 +1871,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.SubscriptionType(), nil
@@ -1889,7 +1889,7 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -1901,7 +1901,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Directives(), nil
@@ -1950,7 +1950,7 @@ func (ec *executionContext) ___Schema_directives(ctx context.Context, field grap
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2008,7 +2008,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Kind(), nil
@@ -2024,7 +2024,7 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2036,7 +2036,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Name(), nil
@@ -2053,7 +2053,7 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		}
 		return graphql.MarshalString(*res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2065,7 +2065,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Description(), nil
@@ -2078,7 +2078,7 @@ func (ec *executionContext) ___Type_description(ctx context.Context, field graph
 	resMarshaler := func() graphql.Marshaler {
 		return graphql.MarshalString(res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2096,7 +2096,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
@@ -2142,7 +2142,7 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2154,7 +2154,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.Interfaces(), nil
@@ -2200,7 +2200,7 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2212,7 +2212,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.PossibleTypes(), nil
@@ -2258,7 +2258,7 @@ func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field gra
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2276,7 +2276,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
@@ -2322,7 +2322,7 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2334,7 +2334,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.InputFields(), nil
@@ -2380,7 +2380,7 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 		wg.Wait()
 		return arr1
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }
 
@@ -2392,7 +2392,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		Field:  field,
 	}
 	ctx = graphql.WithResolverContext(ctx, rctx)
-	ctx = ec.Tracer.StartFieldTracing(ctx)
+	ctx = ec.Tracer.StartFieldExecution(ctx)
 	resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
 		return obj.OfType(), nil
@@ -2410,7 +2410,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 
 		return ec.___Type(ctx, field.Selections, res)
 	}()
-	ec.Tracer.EndFieldTracing(ctx)
+	ec.Tracer.EndFieldExecution(ctx)
 	return resMarshaler
 }