fix(api): always report grouped and granular status codes in metrics

Author: dobrac

packages/api/internal/middleware/otel/metrics/config.go

@@ -11,7 +11,6 @@ type config struct {
 	recordInFlight bool
 	recordSize     bool
 	recordDuration bool
-	groupedStatus  bool
 	recorder       Recorder
 	attributes     func(serverName, route string, request *http.Request) []attribute.KeyValue
 	shouldRecord   func(serverName, route string, request *http.Request) bool
@@ -22,7 +21,6 @@ func defaultConfig() *config {
 		recordInFlight: true,
 		recordDuration: true,
 		recordSize:     true,
-		groupedStatus:  true,
 		attributes:     DefaultAttributes,
 		shouldRecord: func(_, _ string, _ *http.Request) bool {
 			return true

packages/api/internal/middleware/otel/metrics/middleware.go

@@ -19,6 +19,8 @@ const MetricPrefix = "metric."
 // (after body parsing) began. This allows metrics to exclude body upload/parsing time.
 const processingStartTimeKey = "metrics.processingStartTime"
 
+const HTTPStatusCodeGranularKey = attribute.Key("http.status_code_granular")
+
 // SetProcessingStartTime stores the current time as the processing start time in the gin context.
 func SetProcessingStartTime(c *gin.Context) {
 	c.Set(processingStartTimeKey, time.Now())
@@ -73,17 +75,16 @@ func Middleware(meterProvider metric.MeterProvider, service string, options ...O
 				reqAttributes...,
 			)
 
+			code := ginCtx.Writer.Status()
 			if errors.Is(ctx.Err(), context.Canceled) {
 				// 499 is the nginx convention for "client closed request before server responded"
-				resAttributes = append(resAttributes, semconv.HTTPStatusCodeKey.Int(499))
-				resAttributes = append(resAttributes, attribute.Bool("client.canceled", true))
-			} else if cfg.groupedStatus {
-				code := ginCtx.Writer.Status() / 100 * 100
-				resAttributes = append(resAttributes, semconv.HTTPStatusCodeKey.Int(code))
-			} else {
-				resAttributes = append(resAttributes, semconv.HTTPAttributesFromHTTPStatusCode(ginCtx.Writer.Status())...)
+				code = 499
 			}
 
+			groupedCode := code / 100 * 100
+			resAttributes = append(resAttributes, semconv.HTTPStatusCodeKey.Int(groupedCode))
+			resAttributes = append(resAttributes, HTTPStatusCodeGranularKey.Int(code))
+
 			// Append attributes from ginCtx
 			resAttributes = append(resAttributes, attributesFromGinContext(ginCtx, MetricPrefix)...)