Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-27 13:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix instrumenting handler nest issue

Browse Source 
remove nested handler for instrumenting

Signed-off-by: DQ <dengq@vmware.com>
This commit is contained in:
DQ 2020-12-01 17:12:19 +08:00
parent f24d349ede
commit 72ff33f80b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/middleware/metric/metric.go
View File

@ -17,9 +17,7 @@ func instrumentHandler(next http.Handler) http.Handler {
metric.TotalInFlightGauge.WithLabelValues(url).Inc()
defer metric.TotalInFlightGauge.WithLabelValues(url).Dec()
rc := lib.NewResponseRecorder(w)
next.ServeHTTP(rc, r)
metric.TotalReqDurSummary.WithLabelValues(r.Method, url).Observe(time.Since(now).Seconds())
metric.TotalReqCnt.WithLabelValues(r.Method, strconv.Itoa(rc.StatusCode), url).Inc()
})
@ -28,12 +26,7 @@ func instrumentHandler(next http.Handler) http.Handler {
// Middleware returns a middleware for handling requests
func Middleware() func(http.Handler) http.Handler {
if config.Metric().Enabled {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
next = instrumentHandler(next)
next.ServeHTTP(rw, req)
})
}
return instrumentHandler
}
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {