IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

use route as span name

Browse Source
This commit is contained in:
bergquist 2017-09-14 15:05:49 +02:00
parent ee2e4c6567
commit e3211f6e48
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

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

1
pkg/api/http_server.go
View File

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

4
pkg/middleware/request_tracing.go
View File

@ -10,14 +10,14 @@ import (
"gopkg.in/macaron.v1" "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) { return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) {
rw := res.(macaron.ResponseWriter) rw := res.(macaron.ResponseWriter)
var span opentracing.Span var span opentracing.Span
tracer := opentracing.GlobalTracer() tracer := opentracing.GlobalTracer()
wireContext, _ := tracer.Extract(opentracing.HTTPHeaders, opentracing.HTTPHeadersCarrier(req.Header)) 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)) span = tracer.StartSpan(spanName, ext.RPCServerOption(wireContext))
defer span.Finish() defer span.Finish()