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