Remove 'metrics' package, rename metrics

internal/helper/logging.go

@@ -9,19 +9,40 @@ import (
 	"strconv"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/metrics"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
-var responseLogger *log.Logger
+var (
+	responseLogger *log.Logger
+
+	sessionsActive = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "gitlab_workhorse_http_sessions_active",
+		Help: "Number of HTTP request-response cycles currently being handled by gitlab-workhorse.",
+	})
+
+	requestsTotal = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "gitlab_workhorse_http_requests_total",
+			Help: "How many HTTP requests have been processed by gitlab-workhorse, partitioned by status code and HTTP method.",
+		},
+		[]string{"code", "method"},
+	)
+)
 
 func init() {
 	SetCustomResponseLogger(os.Stderr)
+	registerPrometheusMetrics()
 }
 
 func SetCustomResponseLogger(writer io.Writer) {
 	responseLogger = log.New(writer, "", 0)
 }
 
+func registerPrometheusMetrics() {
+	prometheus.MustRegister(sessionsActive)
+	prometheus.MustRegister(requestsTotal)
+}
+
 type LoggingResponseWriter struct {
 	rw      http.ResponseWriter
 	status  int
@@ -30,7 +51,7 @@ type LoggingResponseWriter struct {
 }
 
 func NewLoggingResponseWriter(rw http.ResponseWriter) LoggingResponseWriter {
-	metrics.RequestsActive.Inc()
+	sessionsActive.Inc()
 	return LoggingResponseWriter{
 		rw:      rw,
 		started: time.Now(),
@@ -67,6 +88,6 @@ func (l *LoggingResponseWriter) Log(r *http.Request) {
 		l.status, l.written, r.Referer(), r.UserAgent(), duration.Seconds(),
 	)
 
-	metrics.RequestsActive.Dec()
-	metrics.RequestsTotal.WithLabelValues(strconv.Itoa(l.status), r.Method).Inc()
+	sessionsActive.Dec()
+	requestsTotal.WithLabelValues(strconv.Itoa(l.status), r.Method).Inc()
 }

internal/metrics/metrics.go

-package metrics
-
-import (
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-	RequestsActive = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "gitlab_workhorse_requests_active",
-		Help: "Number of HTTP requests currently being handled by gitlab-workhorse.",
-	})
-	RequestsTotal = prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "gitlab_workhorse_requests_total",
-			Help: "How many HTTP requests have been processed by gitlab-workhorse, partitioned by status code and HTTP method.",
-		},
-		[]string{"code", "method"},
-	)
-)
-
-func init() {
-	prometheus.MustRegister(RequestsActive)
-	prometheus.MustRegister(RequestsTotal)
-}