Re-use CountingResponseWriter for Git HTTP metrics

internal/git/responsewriter.go

@@ -4,6 +4,8 @@ import (
 	"net/http"
 	"strconv"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -42,39 +44,14 @@ func init() {
 }
 type GitHttpResponseWriter struct {
-	rw      http.ResponseWriter
-	status  int
-	written int64
+	helper.CountingResponseWriter
 }
 func NewGitHttpResponseWriter(rw http.ResponseWriter) *GitHttpResponseWriter {
 	gitHTTPSessionsActive.Inc()
 	return &GitHttpResponseWriter{
-		rw: rw,
-	}
-}
-
-func (w *GitHttpResponseWriter) Header() http.Header {
-	return w.rw.Header()
-}
-
-func (w *GitHttpResponseWriter) Write(data []byte) (n int, err error) {
-	if w.status == 0 {
-		w.WriteHeader(http.StatusOK)
+		CountingResponseWriter: helper.NewCountingResponseWriter(rw),
 	}
-
-	n, err = w.rw.Write(data)
-	w.written += int64(n)
-	return n, err
-}
-
-func (w *GitHttpResponseWriter) WriteHeader(status int) {
-	if w.status != 0 {
-		return
-	}
-
-	w.status = status
-	w.rw.WriteHeader(status)
 }
 func (w *GitHttpResponseWriter) Log(r *http.Request, writtenIn int64) {
@@ -82,11 +59,11 @@ func (w *GitHttpResponseWriter) Log(r *http.Request, writtenIn int64) {
 	agent := getRequestAgent(r)
 	gitHTTPSessionsActive.Dec()
-	gitHTTPRequests.WithLabelValues(r.Method, strconv.Itoa(w.status), service, agent).Inc()
-	gitHTTPBytes.WithLabelValues(r.Method, strconv.Itoa(w.status), service, agent, directionIn).
+	gitHTTPRequests.WithLabelValues(r.Method, strconv.Itoa(w.Status()), service, agent).Inc()
+	gitHTTPBytes.WithLabelValues(r.Method, strconv.Itoa(w.Status()), service, agent, directionIn).
 		Add(float64(writtenIn))
-	gitHTTPBytes.WithLabelValues(r.Method, strconv.Itoa(w.status), service, agent, directionOut).
-		Add(float64(w.written))
+	gitHTTPBytes.WithLabelValues(r.Method, strconv.Itoa(w.Status()), service, agent, directionOut).
+		Add(float64(w.Count()))
 }
 func getRequestAgent(r *http.Request) string {

internal/helper/countingresponsewriter.go

@@ -7,6 +7,7 @@ import (
 type CountingResponseWriter interface {
 	http.ResponseWriter
 	Count() int64
+	Status() int
 }
 type countingResponseWriter struct {
@@ -42,6 +43,14 @@ func (c *countingResponseWriter) WriteHeader(status int) {
 	c.rw.WriteHeader(status)
 }
+// Count returns the number of bytes written to the ResponseWriter. This
+// function is not thread-safe.
 func (c *countingResponseWriter) Count() int64 {
 	return c.count
 }
+
+// Status returns the first HTTP status value that was written to the
+// ResponseWriter. This function is not thread-safe.
+func (c *countingResponseWriter) Status() int {
+	return c.status
+}