highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-09 19:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

IMG-52: rename metrics to monitoring (#1498)

Browse Source 
* Removed bufpool

* metrics -> monitoring

* metricsMeta -> monitoringMeta

* monitoring.Meta -> Filter
This commit is contained in:
Victor Sokolov
2025-08-20 17:17:18 +02:00
committed by GitHub
parent 08d20d46e6
commit 697c2ddcd6
17 changed files with 97 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/middlewares.go
View File

@@ -10,22 +10,22 @@ import (
"github.com/imgproxy/imgproxy/v3/errorreport"
"github.com/imgproxy/imgproxy/v3/httpheaders"
"github.com/imgproxy/imgproxy/v3/ierrors"
"github.com/imgproxy/imgproxy/v3/metrics"
"github.com/imgproxy/imgproxy/v3/monitoring"
)
const (
categoryTimeout = "timeout"
)
// WithMetrics wraps RouteHandler with metrics handling.
func (r *Router) WithMetrics(h RouteHandler) RouteHandler {
if !metrics.Enabled() {
// WithMonitoring wraps RouteHandler with monitoring handling.
func (r *Router) WithMonitoring(h RouteHandler) RouteHandler {
if !monitoring.Enabled() {
return h
}
return func(reqID string, rw http.ResponseWriter, req *http.Request) error {
ctx, metricsCancel, rw := metrics.StartRequest(req.Context(), rw, req)
defer metricsCancel()
ctx, cancel, rw := monitoring.StartRequest(req.Context(), rw, req)
defer cancel()
return h(reqID, rw, req.WithContext(ctx))
}
@@ -92,7 +92,7 @@ func (r *Router) WithPanic(h RouteHandler) RouteHandler {
}
// WithReportError handles error reporting.
// It should be placed after `WithMetrics`, but before `WithPanic`.
// It should be placed after `WithMonitoring`, but before `WithPanic`.
func (r *Router) WithReportError(h RouteHandler) RouteHandler {
return func(reqID string, rw http.ResponseWriter, req *http.Request) error {
// Open the error context
@@ -119,7 +119,7 @@ func (r *Router) WithReportError(h RouteHandler) RouteHandler {
// We do not need to send any canceled context
if !errors.Is(ierr, context.Canceled) {
metrics.SendError(ctx, errCat, err)
monitoring.SendError(ctx, errCat, err)
}
// Report error to error collectors