char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor InstrumentHandlerCounter definition

main
Andrew Morgan 2019-12-18 15:10:53 +00:00
parent 2baf5baa75
commit 9b5d6c9745
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mediaapi/routing/routing.go
View File

@ -85,14 +85,14 @@ func makeDownloadAPI(
activeRemoteRequests *types.ActiveRemoteRequests, activeRemoteRequests *types.ActiveRemoteRequests,
activeThumbnailGeneration *types.ActiveThumbnailGeneration, activeThumbnailGeneration *types.ActiveThumbnailGeneration,
) http.HandlerFunc { ) http.HandlerFunc {
return promhttp.InstrumentHandlerCounter( counterVec := promauto.NewCounterVec(
promauto.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: name, Name: name,
Help: "Total number of media_api requests for either thumbnails or full downloads", Help: "Total number of media_api requests for either thumbnails or full downloads",
}, },
[]string{"code"}, []string{"code"},
), http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { )
httpHandler := func(w http.ResponseWriter, req *http.Request) {
req = util.RequestWithLogging(req) req = util.RequestWithLogging(req)
// Set common headers returned regardless of the outcome of the request // Set common headers returned regardless of the outcome of the request
@ -112,6 +112,6 @@ func makeDownloadAPI(
activeThumbnailGeneration, activeThumbnailGeneration,
name == "thumbnail", name == "thumbnail",
) )
}, }
)) return promhttp.InstrumentHandlerCounter(counterVec, http.HandlerFunc(httpHandler))
} }