sessionError

mtojek · mtojek · commit e3d7493a752f · 2023-05-19T12:36:28.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -206,15 +206,13 @@ func (s *Server) sessionHandler(session ssh.Session) {
 	var exitError *exec.ExitError
 	if xerrors.As(err, &exitError) {
 		s.logger.Warn(ctx, "ssh session returned", slog.Error(exitError))
-		m.sessionError.Add(1)
 		_ = session.Exit(exitError.ExitCode())
 		return
 	}
 	if err != nil {
 		s.logger.Warn(ctx, "ssh session failed", slog.Error(err))
 		// This exit code is designed to be unlikely to be confused for a legit exit code
 		// from the process.
-		m.sessionError.Add(1)
 		_ = session.Exit(MagicSessionErrorCode)
 		return
 	}
diff --git a/agent/agentssh/metrics.go b/agent/agentssh/metrics.go
@@ -27,7 +27,6 @@ type sessionMetricsObject struct {
 	agentListenerError      prometheus.Counter
 	startPTYSession         prometheus.Counter
 	startNonPTYSession      prometheus.Counter
-	sessionError            prometheus.Counter
 
 	// Non-PTY sessions
 	nonPTYStdinPipeError   prometheus.Counter
@@ -114,11 +113,6 @@ func newSessionMetrics(registerer prometheus.Registerer) sessionMetrics {
 		})
 		registerer.MustRegister(startNonPTYSession)
 
-		sessionError := prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: "agent", Subsystem: fmt.Sprintf("sessions_%s", magicType), Name: "error",
-		})
-		registerer.MustRegister(sessionError)
-
 		nonPTYStdinPipeError := prometheus.NewCounter(prometheus.CounterOpts{
 			Namespace: "agent", Subsystem: fmt.Sprintf("sessions_%s", magicType), Name: "non_pty_stdin_pipe_error",
 		})
@@ -174,7 +168,6 @@ func newSessionMetrics(registerer prometheus.Registerer) sessionMetrics {
 			agentListenerError:      agentListenerError,
 			startPTYSession:         startPTYSession,
 			startNonPTYSession:      startNonPTYSession,
-			sessionError:            sessionError,
 
 			nonPTYStdinPipeError:   nonPTYStdinPipeError,
 			nonPTYStdinIoCopyError: nonPTYStdinIoCopyError,
