Extreme Makeover: server refactoring

middlewares/tracing/wrapper.go

@@ -6,20 +6,6 @@ import (
 	"github.com/urfave/negroni"
 )
 
-// NegroniHandlerWrapper is used to wrap negroni handler middleware
-type NegroniHandlerWrapper struct {
-	name           string
-	next           negroni.Handler
-	clientSpanKind bool
-}
-
-// HTTPHandlerWrapper is used to wrap http handler middleware
-type HTTPHandlerWrapper struct {
-	name           string
-	handler        http.Handler
-	clientSpanKind bool
-}
-
 // NewNegroniHandlerWrapper return a negroni.Handler struct
 func (t *Tracing) NewNegroniHandlerWrapper(name string, handler negroni.Handler, clientSpanKind bool) negroni.Handler {
 	if t.IsEnabled() && handler != nil {
@@ -44,6 +30,13 @@ func (t *Tracing) NewHTTPHandlerWrapper(name string, handler http.Handler, clien
 	return handler
 }
 
+// NegroniHandlerWrapper is used to wrap negroni handler middleware
+type NegroniHandlerWrapper struct {
+	name           string
+	next           negroni.Handler
+	clientSpanKind bool
+}
+
 func (t *NegroniHandlerWrapper) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	var finish func()
 	_, r, finish = StartSpan(r, t.name, t.clientSpanKind)
@@ -54,6 +47,13 @@ func (t *NegroniHandlerWrapper) ServeHTTP(rw http.ResponseWriter, r *http.Reques
 	}
 }
 
+// HTTPHandlerWrapper is used to wrap http handler middleware
+type HTTPHandlerWrapper struct {
+	name           string
+	handler        http.Handler
+	clientSpanKind bool
+}
+
 func (t *HTTPHandlerWrapper) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	var finish func()
 	_, r, finish = StartSpan(r, t.name, t.clientSpanKind)