1 files changed, 11 insertions, 1 deletions

diff --git a/echo/prometheus/prometheus.go b/echo/prometheus/prometheus.go
index 2fbf252..5f93bea 100644
--- a/echo/prometheus/prometheus.go
+++ b/echo/prometheus/prometheus.go
@@ -64,9 +64,19 @@ func NewPrometheusWithConfig(c *PrometheusConfig) *Prometheus {
                 c.ExtractHost = DefaultPrometheusConfig.ExtractHost
         }
 
+        // Mostly matches promhttp.Handler implementation
+        hnd := echo.WrapHandler(promhttp.InstrumentMetricHandler(
+                prometheus.DefaultRegisterer,
+                promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{
+                        // We gzip by default in the echo warpper; with this enabled we
+                        // double gzip metrics and corrupt them
+                        DisableCompression: true,
+                }),
+        ))
+
         return &Prometheus{
                 Config:         c,
-                MetricsHandler: echo.WrapHandler(promhttp.Handler()),
+                MetricsHandler: hnd,
                 requestCount: promauto.NewCounterVec(prometheus.CounterOpts{
                         Subsystem: c.Subsystem,
                         Name:      "requests_total",