echo: skip redirects for metricsecho/v0.5.2

1 files changed, 32 insertions, 13 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index 569d686..a63f25f 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -34,6 +34,25 @@ const (
         defaultBodySizeLimit = "10M"
 )
 
+func makeMiddlewareSkipper(c *prometheus.PrometheusConfig) middleware.Skipper {
+        var path string
+
+        if c != nil {
+                path = c.MetricsPath
+        }
+
+        if path == "" {
+                path = prometheus.DefaultPrometheusConfig.MetricsPath
+        }
+
+        return func(c echo.Context) bool {
+                if c.Path() == path {
+                        return true
+                }
+                return false
+        }
+}
+
 type EchoConfig struct {
         Debug                 bool
         Hostnames             []string
@@ -224,6 +243,8 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
                 }
         }
 
+        metricsSkipper := makeMiddlewareSkipper(c.PrometheusConfig)
+
         e.Use(middleware.Logger())
         e.Use(glmw.Recover())
 
@@ -241,25 +262,23 @@ func NewDefaultEchoWithConfig(c EchoConfig) (*EchoWrapper, error) {
         if err != nil {
                 return nil, fmt.Errorf("Unable to convert TLS port to int: %w", err)
         }
-        e.Use(glmw.HTTPSRedirectWithConfig(glmw.HTTPSRedirectConfig{Port: tlsPortI}))
+        e.Use(glmw.HTTPSRedirectWithConfig(glmw.HTTPSRedirectConfig{
+                Skipper: metricsSkipper,
+                Port:    tlsPortI,
+        }))
 
         if c.RedirectToWWW {
-                e.Use(middleware.WWWRedirect())
+                e.Use(middleware.WWWRedirectWithConfig(middleware.RedirectConfig{
+                        Skipper: metricsSkipper,
+                }))
         }
 
         e.Use(middleware.Decompress())
+
+        // TODO: This mangles responses but only for Accept: */* (browsers). Why?
         e.Use(middleware.GzipWithConfig(middleware.GzipConfig{
-                // TODO: This mw causes prometheus responses to show up compressed for
-                // browsers. Why?
-                //
-                // Also, this path should use the config path if we keep it
-                Skipper: func(c echo.Context) bool {
-                        if c.Path() == "/metrics" {
-                                return true
-                        }
-                        return false
-                },
-                Level: 5,
+                Skipper: metricsSkipper,
+                Level:   5,
         }))
 
         e.Use(glmw.StrictSecure())