HGWGDC-19759: Separate port for metrics in petasos-rewriter. (#7)

* HGWGDC-19759: Separate port for metrics in petasos-rewriter.

* HGWGDC-19759: Revert petasos endpoint config changes

forwarder.go

@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/getsentry/sentry-go"
-	"github.com/spf13/viper"
 	"io/ioutil"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"regexp"
 	"strings"
 
+	"github.com/getsentry/sentry-go"
+	"github.com/spf13/viper"
+
 	"github.com/labstack/echo/v4"
 	"github.com/rs/zerolog/log"
 )

main.go

@@ -35,6 +35,7 @@ const (
 	spanIdHeader                 = "span-id"
 	traceIdHeader                = "trace-id"
 	remoteUpdateEndpoint         = "remoteUpdate.url"
+	metricsServerPort            = "metricsOptions.port"
 )
 
 func init() {

metrics.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/viper"
@@ -18,17 +19,27 @@ type metricRegistry struct {
 }
 
 func provideMetrics(e *echo.Echo) {
+	metrics := echo.New()
+	metrics.Use(middleware.Logger())
+	metrics.Use(middleware.Recover())
+
 	mr := registerMetrics()
 
 	if err := prometheus.Register(mr.TotalRequests); err != nil {
-		e.Logger.Fatal(err)
+		metrics.Logger.Fatal(err)
 	}
 	if err := prometheus.Register(mr.ServerRequestDuration); err != nil {
-		e.Logger.Fatal(err)
+		metrics.Logger.Fatal(err)
 	}
 
+	metrics.Use(mr.getMiddleware())
+	metrics.GET("/metrics", echo.WrapHandler(promhttp.Handler()))
+
+	go func() {
+		metrics.Logger.Fatal(metrics.Start(":" + viper.GetString(metricsServerPort)))
+	}()
+
 	e.Use(mr.getMiddleware())
-	e.GET("/metrics", echo.WrapHandler(promhttp.Handler()))
 }
 
 func registerMetrics() *metricRegistry {

petasos-rewriter.yaml

@@ -78,6 +78,8 @@ remoteUpdate:
 #
 # (Optional)
 metricsOptions:
+  # port on which metrics will be running
+  port: 1324
   # namespace is the namespace of the metrics provided
   # (Optional)
   namespace: xmidt