diff --git a/pkg/handler/handler_test.go b/pkg/handler/handler_test.go index 00efb06..b75a1e4 100644 --- a/pkg/handler/handler_test.go +++ b/pkg/handler/handler_test.go @@ -393,7 +393,8 @@ func TestNonNavigationalRequests(t *testing.T) { } { t.Run("with fetch metadata", func(t *testing.T) { rpClient := idp.RelyingPartyClient() - resp := get(t, rpClient, idp.RelyingPartyServer.URL+path, + resp := get( + t, rpClient, idp.RelyingPartyServer.URL+path, header{"Sec-Fetch-Mode", "cors"}, header{"Sec-Fetch-Dest", "empty"}, ) diff --git a/pkg/handler/reverseproxy_test.go b/pkg/handler/reverseproxy_test.go index 0e2e132..ec37862 100644 --- a/pkg/handler/reverseproxy_test.go +++ b/pkg/handler/reverseproxy_test.go @@ -180,7 +180,8 @@ func TestReverseProxy(t *testing.T) { t.Run("with fetch metadata", func(t *testing.T) { target := idp.RelyingPartyServer.URL + "/" - resp := get(t, rpClient, target, + resp := get( + t, rpClient, target, header{"Sec-Fetch-Mode", "cors"}, header{"Sec-Fetch-Dest", "empty"}, ) diff --git a/pkg/middleware/prometheus.go b/pkg/middleware/prometheus.go index e2ad97d..c0404b4 100644 --- a/pkg/middleware/prometheus.go +++ b/pkg/middleware/prometheus.go @@ -46,12 +46,13 @@ func Prometheus(provider string, buckets ...float64) *PrometheusMiddleware { if len(buckets) == 0 { buckets = defaultBuckets } - m.latency = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Name: latencyName, - Help: "How long it took to process the request, partitioned by status code, method and HTTP path.", - ConstLabels: prometheus.Labels{"service": serviceName, metrics.LabelProvider: provider}, - Buckets: buckets, - }, + m.latency = prometheus.NewHistogramVec( + prometheus.HistogramOpts{ + Name: latencyName, + Help: "How long it took to process the request, partitioned by status code, method and HTTP path.", + ConstLabels: prometheus.Labels{"service": serviceName, metrics.LabelProvider: provider}, + Buckets: buckets, + }, []string{"code", "method", "path", "host"}, ) diff --git a/pkg/router/router.go b/pkg/router/router.go index a8e53fa..7e79a73 100644 --- a/pkg/router/router.go +++ b/pkg/router/router.go @@ -60,7 +60,8 @@ func New(src Source, cfg *config.Config) chi.Router { r := chi.NewRouter() r.Use(middleware.CorrelationIDHandler) if cfg.OpenTelemetry.Enabled { - r.Use(otelchi.Middleware(cfg.OpenTelemetry.ServiceName, + r.Use(otelchi.Middleware( + cfg.OpenTelemetry.ServiceName, otelchi.WithChiRoutes(r), otelchi.WithRequestMethodInSpanName(true), otelchi.WithFilter(func(r *http.Request) bool {