Refactor handler package

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/gorilla/websocket v1.2.0
 	github.com/hashicorp/golang-lru v0.5.0
 	github.com/kr/pretty v0.1.0 // indirect
+	github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd // indirect
 	github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047
 	github.com/opentracing/basictracer-go v1.0.0 // indirect
 	github.com/opentracing/opentracing-go v1.0.2

go.sum

@@ -23,6 +23,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd h1:HvFwW+cm9bCbZ/+vuGNq7CRWXql8c0y8nGeYpqmpvmk=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047 h1:zCoDWFD5nrJJVjbXiDZcVhOBSzKn3o9LgRLLMRNuru8=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=

graphql/context.go

@@ -75,6 +75,34 @@ func (rc *RequestContext) Validate(ctx context.Context) error {
 	return nil
 }
 
+// AddRequestMiddleware allows you to define a function that will be called around the root request,
+// after the query has been parsed. This is useful for logging
+func (cfg *RequestContext) AddRequestMiddleware(middleware RequestMiddleware) {
+	if cfg.RequestMiddleware == nil {
+		cfg.RequestMiddleware = middleware
+		return
+	}
+
+	lastResolve := cfg.RequestMiddleware
+	cfg.RequestMiddleware = func(ctx context.Context, next func(ctx context.Context) []byte) []byte {
+		return lastResolve(ctx, func(ctx context.Context) []byte {
+			return middleware(ctx, next)
+		})
+	}
+}
+
+func (cfg *RequestContext) AddTracer(tracer Tracer) {
+	if cfg.Tracer == nil {
+		cfg.Tracer = tracer
+		return
+	}
+	lastTracer := cfg.Tracer
+	cfg.Tracer = &tracerWrapper{
+		tracer1: lastTracer,
+		tracer2: tracer,
+	}
+}
+
 func DefaultResolverMiddleware(ctx context.Context, next Resolver) (res interface{}, err error) {
 	return next(ctx)
 }

graphql/exec.go

@@ -1,3 +1,5 @@
+//go:generate go run github.com/matryer/moq -out esmock.go . ExecutableSchema
+
 package graphql
 
 import (