use route as span name

Author: bergquist

pkg/api/api.go

@@ -21,7 +21,7 @@ func (hs *HttpServer) registerRoutes() {
 	// automatically set HEAD for every GET
 	macaronR.SetAutoHead(true)
 
-	r := newRouteRegister(middleware.RequestMetrics)
+	r := newRouteRegister(middleware.RequestMetrics, middleware.RequestTracing)
 
 	// not logged in views
 	r.Get("/", reqSignedIn, Index)

pkg/api/http_server.go

@@ -170,7 +170,6 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron {
 	m.Use(hs.metricsEndpoint)
 	m.Use(middleware.GetContextHandler())
 	m.Use(middleware.Sessioner(&setting.SessionOptions))
-	m.Use(middleware.RequestTracing())
 	m.Use(middleware.OrgRedirect())
 
 	// needs to be after context handler

pkg/middleware/request_tracing.go

@@ -10,14 +10,14 @@ import (
 	"gopkg.in/macaron.v1"
 )
 
-func RequestTracing() macaron.Handler {
+func RequestTracing(handler string) macaron.Handler {
 	return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
 		rw := res.(macaron.ResponseWriter)
 
 		var span opentracing.Span
 		tracer := opentracing.GlobalTracer()
 		wireContext, _ := tracer.Extract(opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(req.Header))
-		spanName := fmt.Sprintf("HTTP %s %s", req.Method, req.URL.Path)
+		spanName := fmt.Sprintf("HTTP %s", handler)
 		span = tracer.StartSpan(spanName, ext.RPCServerOption(wireContext))
 		defer span.Finish()