Remove callbacks

mtojek · mtojek · commit 90b351d16848 · 2023-05-19T12:28:02.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -122,19 +122,16 @@ func NewServer(ctx context.Context, logger slog.Logger, prometheusRegistry *prom
 			s.logger.Debug(ctx, "local port forward",
 				slog.F("destination-host", destinationHost),
 				slog.F("destination-port", destinationPort))
-			metrics.localPortForwardingCallback.Add(1)
 			return true
 		},
 		PtyCallback: func(ctx ssh.Context, pty ssh.Pty) bool {
-			metrics.ptyCallback.Add(1)
 			return true
 		},
 		ReversePortForwardingCallback: func(ctx ssh.Context, bindHost string, bindPort uint32) bool {
 			// Allow reverse port forwarding all!
 			s.logger.Debug(ctx, "local port forward",
 				slog.F("bind-host", bindHost),
 				slog.F("bind-port", bindPort))
-			metrics.reversePortForwardingCallback.Add(1)
 			return true
 		},
 		RequestHandlers: map[string]ssh.RequestHandler{
diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go
@@ -7,12 +7,7 @@ import (
 )
 
 type sshServerMetrics struct {
-	// SSH callbacks
-	connectionFailedCallback      prometheus.Counter
-	localPortForwardingCallback   prometheus.Counter
-	ptyCallback                   prometheus.Counter
-	reversePortForwardingCallback prometheus.Counter
-	x11Callback                   prometheus.Counter
+	connectionFailedCallback prometheus.Counter
 
 	// SFTP
 	sftpHandler     prometheus.Counter
@@ -57,26 +52,6 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 	})
 	registerer.MustRegister(connectionFailedCallback)
 
-	localPortForwardingCallback := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "local_port_forwarding_callback",
-	})
-	registerer.MustRegister(localPortForwardingCallback)
-
-	ptyCallback := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "pty_callback",
-	})
-	registerer.MustRegister(ptyCallback)
-
-	reversePortForwardingCallback := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "reverse_port_forwarding_callback",
-	})
-	registerer.MustRegister(reversePortForwardingCallback)
-
-	x11Callback := prometheus.NewCounter(prometheus.CounterOpts{
-		Namespace: "agent", Subsystem: "ssh_server", Name: "x11_callback",
-	})
-	registerer.MustRegister(x11Callback)
-
 	sftpHandler := prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace: "agent", Subsystem: "ssh_server", Name: "sftp_handler",
 	})
@@ -105,16 +80,12 @@ func newSSHServerMetrics(registerer prometheus.Registerer) *sshServerMetrics {
 	sessions := newSessionMetrics(registerer)
 
 	return &sshServerMetrics{
-		connectionFailedCallback:      connectionFailedCallback,
-		localPortForwardingCallback:   localPortForwardingCallback,
-		ptyCallback:                   ptyCallback,
-		reversePortForwardingCallback: reversePortForwardingCallback,
-		x11Callback:                   x11Callback,
-		sftpHandler:                   sftpHandler,
-		sftpServerError:               sftpServerError,
-		x11HostnameError:              x11HostnameError,
-		x11SocketDirError:             x11SocketDirError,
-		x11XauthorityError:            x11XauthorityError,
+		connectionFailedCallback: connectionFailedCallback,
+		sftpHandler:              sftpHandler,
+		sftpServerError:          sftpServerError,
+		x11HostnameError:         x11HostnameError,
+		x11SocketDirError:        x11SocketDirError,
+		x11XauthorityError:       x11XauthorityError,
 
 		sessions: sessions,
 	}
diff --git a/agent/agentssh/x11.go b/agent/agentssh/x11.go
@@ -24,8 +24,6 @@ import (
 // x11Callback is called when the client requests X11 forwarding.
 // It adds an Xauthority entry to the Xauthority file.
 func (s *Server) x11Callback(ctx ssh.Context, x11 ssh.X11) bool {
-	s.metrics.x11Callback.Add(1)
-
 	hostname, err := os.Hostname()
 	if err != nil {
 		s.logger.Warn(ctx, "failed to get hostname", slog.Error(err))
