hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some tags to opentracing spans

Browse source
This commit is contained in:
Erik Johnston 2017-11-29 17:59:06 +00:00
parent cc12fc930a
commit 3ca9ed0407
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/github.com/matrix-org/dendrite/common/httpapi.go
View file

@ -21,6 +21,13 @@ func MakeAuthAPI(metricsName string, deviceDB auth.DeviceDatabase, f func(*http.
if resErr != nil { if resErr != nil {
return *resErr return *resErr
} }
span := opentracing.SpanFromContext(req.Context())
if span != nil {
span.SetTag("userID", device.UserID)
span.SetTag("deviceID", device.ID)
}
return f(req, device) return f(req, device)
} }
return MakeExternalAPI(metricsName, h) return MakeExternalAPI(metricsName, h)
@ -29,15 +36,30 @@ func MakeAuthAPI(metricsName string, deviceDB auth.DeviceDatabase, f func(*http.
// MakeExternalAPI turns a util.JSONRequestHandler function into an http.Handler. // MakeExternalAPI turns a util.JSONRequestHandler function into an http.Handler.
// This is used for APIs that are called from the internet. // This is used for APIs that are called from the internet.
func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse) http.Handler { func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse) http.Handler {
h := util.MakeJSONAPI(util.NewJSONRequestHandler(f)) // After we've assigned a request ID we want to start an opentracing span
withSpan := func(w http.ResponseWriter, req *http.Request) { // with that tagged.
withSpan := func(req *http.Request) util.JSONResponse {
ctx := req.Context()
reqID := util.GetRequestID(ctx)
span := opentracing.StartSpan(metricsName) span := opentracing.StartSpan(metricsName)
span.SetTag("req.id", reqID)
defer span.Finish() defer span.Finish()
req = req.WithContext(opentracing.ContextWithSpan(req.Context(), span)) req = req.WithContext(opentracing.ContextWithSpan(ctx, span))
h.ServeHTTP(w, req)
// Actually do the request
response := f(req)
// Tag the span with status code
ext.HTTPStatusCode.Set(span, uint16(response.Code))
return response
} }
return prometheus.InstrumentHandler(metricsName, http.HandlerFunc(withSpan)) h := util.MakeJSONAPI(util.NewJSONRequestHandler(withSpan))
return prometheus.InstrumentHandler(metricsName, h)
} }
// MakeInternalAPI turns a util.JSONRequestHandler function into an http.Handler. // MakeInternalAPI turns a util.JSONRequestHandler function into an http.Handler.