Merge branch '767-ensure-lfs-protocol-logic-has-prometheus-metrics-http' into 'main'

Add basic LFS connections metric for HTTP

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1108



Merged-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: James Fargher <jfargher@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

cmd/gitlab-shell/command/command.go

@@ -16,6 +16,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadarchive"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadpack"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
+	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/metrics"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv"
 )
 
@@ -115,6 +116,7 @@ func Build(args *commandargs.Shell, config *config.Config, readWriter *readwrite
 	case commandargs.TwoFactorVerify:
 		return &twofactorverify.Command{Config: config, Args: args, ReadWriter: readWriter}
 	case commandargs.LfsAuthenticate:
+		metrics.LfsHTTPConnectionsTotal.Inc()
 		return &lfsauthenticate.Command{Config: config, Args: args, ReadWriter: readWriter}
 	case commandargs.LfsTransfer:
 		if config.LFSConfig.PureSSHProtocol {

cmd/gitlab-shell/command/command_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/require"
 	cmd "gitlab.com/gitlab-org/gitlab-shell/v14/cmd/gitlab-shell/command"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/commandargs"
@@ -19,6 +20,7 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command/uploadpack"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/executable"
+	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/metrics"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/sshenv"
 )
 
@@ -104,6 +106,21 @@ func TestNew(t *testing.T) {
 	}
 }
 
+func TestLFSAuthenticateCommands(t *testing.T) {
+	arguments := []string{}
+	env := buildEnv("git-lfs-authenticate")
+	config := &config.Config{GitlabUrl: "http+unix://gitlab.socket"}
+
+	lfsHTTPConnectionsTotal := testutil.ToFloat64(metrics.LfsHTTPConnectionsTotal)
+
+	command, err := cmd.New(arguments, env, config, nil)
+
+	require.NoError(t, err)
+	require.IsType(t, &lfsauthenticate.Command{}, command)
+
+	require.InDelta(t, lfsHTTPConnectionsTotal+1, testutil.ToFloat64(metrics.LfsHTTPConnectionsTotal), 0)
+}
+
 func TestLFSTransferCommands(t *testing.T) {
 	testCases := []struct {
 		desc         string

internal/metrics/metrics.go

@@ -27,6 +27,8 @@ const (
 	sliSshdSessionsTotalName       = "gitlab_sli:shell_sshd_sessions:total"
 	sliSshdSessionsErrorsTotalName = "gitlab_sli:shell_sshd_sessions:errors_total"
 
+	lfsHTTPConnectionsTotalName = "lfs_http_connections_total"
+
 	gitalyConnectionsTotalName = "connections_total"
 )
 
@@ -143,6 +145,13 @@ var (
 			Help:      "A gauge of requests currently being performed.",
 		},
 	)
+
+	LfsHTTPConnectionsTotal = promauto.NewCounter(
+		prometheus.CounterOpts{
+			Name: lfsHTTPConnectionsTotalName,
+			Help: "Number of LFS over HTTP connections that have been established",
+		},
+	)
 )
 
 func NewRoundTripper(next http.RoundTripper) promhttp.RoundTripperFunc {