Remove unused aws-sdk-go S3 metrics wrapper (#51674)

The wrapper is no longer used since all S3 code has been converted
to use aws-sdk-go-v2.

lib/events/s3sessions/s3handler.go

@@ -48,6 +48,7 @@ import (
 	"github.com/gravitational/teleport/lib/events"
 	"github.com/gravitational/teleport/lib/modules"
 	awsmetrics "github.com/gravitational/teleport/lib/observability/metrics/aws"
+	s3metrics "github.com/gravitational/teleport/lib/observability/metrics/s3"
 	"github.com/gravitational/teleport/lib/session"
 	awsutils "github.com/gravitational/teleport/lib/utils/aws"
 	"github.com/gravitational/teleport/lib/utils/aws/endpoint"
@@ -197,7 +198,10 @@ func NewHandler(ctx context.Context, cfg Config) (*Handler, error) {
 		opts = append(opts, config.WithCredentialsProvider(cfg.CredentialsProvider))
 	}
 
-	opts = append(opts, config.WithAPIOptions(awsmetrics.MetricsMiddleware()))
+	opts = append(opts,
+		config.WithAPIOptions(awsmetrics.MetricsMiddleware()),
+		config.WithAPIOptions(s3metrics.MetricsMiddleware()),
+	)
 
 	resolver, err := endpoint.NewLoggingResolver(
 		s3.NewDefaultEndpointResolverV2(),

lib/observability/metrics/s3/s3.go

@@ -25,6 +25,8 @@ import (
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/smithy-go/middleware"
 	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/gravitational/teleport/lib/observability/metrics"
 )
 
 var (
@@ -52,24 +54,10 @@ var (
 		},
 		[]string{"operation"},
 	)
-
-	s3Collectors = []prometheus.Collector{
-		apiRequestsTotal,
-		apiRequests,
-		apiRequestLatencies,
-	}
 )
 
-// recordMetrics updates the set of s3 api metrics
-func recordMetrics(operation string, err error, latency float64) {
-	apiRequestLatencies.WithLabelValues(operation).Observe(latency)
-	apiRequestsTotal.WithLabelValues(operation).Inc()
-
-	result := "success"
-	if err != nil {
-		result = "error"
-	}
-	apiRequests.WithLabelValues(operation, result).Inc()
+func init() {
+	_ = metrics.RegisterPrometheusCollectors(apiRequests, apiRequestsTotal, apiRequestLatencies)
 }
 
 // MetricsMiddleware returns middleware that can be used to capture
@@ -97,13 +85,12 @@ func MetricsMiddleware() []func(stack *middleware.Stack) error {
 					}
 
 					then := ctx.Value(timestampKey{}).(time.Time)
-					service := awsmiddleware.GetServiceID(ctx)
 					operation := awsmiddleware.GetOperationName(ctx)
 					latency := time.Since(then).Seconds()
 
-					apiRequestsTotal.WithLabelValues(service, operation).Inc()
-					apiRequestLatencies.WithLabelValues(service, operation).Observe(latency)
-					apiRequests.WithLabelValues(service, operation, result).Inc()
+					apiRequestsTotal.WithLabelValues(operation).Inc()
+					apiRequestLatencies.WithLabelValues(operation).Observe(latency)
+					apiRequests.WithLabelValues(operation, result).Inc()
 
 					return out, md, err
 				}), middleware.After)