kvcoord: remove metrics for deprecated dist sender errors

Release note: None

Author: yuzefovich

docs/generated/metrics/metrics.yaml

@@ -2743,146 +2743,6 @@ layers:
       unit: COUNT
       aggregation: AVG
       derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(0)
-      exported_name: distsender_rpc_err_errordetailtype_0_
-      description: |
-        Number of ErrorDetailType(0) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(15)
-      exported_name: distsender_rpc_err_errordetailtype_15_
-      description: |
-        Number of ErrorDetailType(15) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(19)
-      exported_name: distsender_rpc_err_errordetailtype_19_
-      description: |
-        Number of ErrorDetailType(19) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(20)
-      exported_name: distsender_rpc_err_errordetailtype_20_
-      description: |
-        Number of ErrorDetailType(20) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(21)
-      exported_name: distsender_rpc_err_errordetailtype_21_
-      description: |
-        Number of ErrorDetailType(21) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(23)
-      exported_name: distsender_rpc_err_errordetailtype_23_
-      description: |
-        Number of ErrorDetailType(23) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(24)
-      exported_name: distsender_rpc_err_errordetailtype_24_
-      description: |
-        Number of ErrorDetailType(24) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(29)
-      exported_name: distsender_rpc_err_errordetailtype_29_
-      description: |
-        Number of ErrorDetailType(29) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(30)
-      exported_name: distsender_rpc_err_errordetailtype_30_
-      description: |
-        Number of ErrorDetailType(30) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
-    - name: distsender.rpc.err.errordetailtype(33)
-      exported_name: distsender_rpc_err_errordetailtype_33_
-      description: |
-        Number of ErrorDetailType(33) errors received replica-bound RPCs
-
-        This counts how often error of the specified type was received back from replicas
-        as part of executing possibly range-spanning requests. Failures to reach the target
-        replica will be accounted for as 'roachpb.CommunicationErrType' and unclassified
-        errors as 'roachpb.InternalErrType'.
-      y_axis_label: Errors
-      type: COUNTER
-      unit: COUNT
-      aggregation: AVG
-      derivative: NON_NEGATIVE_DERIVATIVE
     - name: distsender.rpc.err.exclusionviolationerrtype
       exported_name: distsender_rpc_err_exclusionviolationerrtype
       description: |

pkg/kv/kvclient/kvcoord/dist_sender.go

@@ -460,8 +460,9 @@ type DistSenderMetrics struct {
 	ProxyForwardSentCount              *metric.Counter
 	ProxyForwardErrCount               *metric.Counter
 	MethodCounts                       [kvpb.NumMethods]*metric.Counter
-	ErrCounts                          [kvpb.NumErrors]*metric.Counter
-	CircuitBreaker                     DistSenderCircuitBreakerMetrics
+	// ErrCounts[i] can be nil if i'th error has been deprecated.
+	ErrCounts      [kvpb.NumErrors]*metric.Counter
+	CircuitBreaker DistSenderCircuitBreakerMetrics
 	DistSenderRangeFeedMetrics
 }
 
@@ -526,6 +527,10 @@ func MakeDistSenderMetrics(locality roachpb.Locality) DistSenderMetrics {
 	}
 	for i := range m.ErrCounts {
 		errType := kvpb.ErrorDetailType(i).String()
+		if strings.HasPrefix(errType, "ErrorDetailType") {
+			// This error index has been deprecated.
+			continue
+		}
 		meta := metaDistSenderErrCountTmpl
 		meta.Name = fmt.Sprintf(meta.Name, strings.ToLower(errType))
 		meta.Help = fmt.Sprintf(meta.Help, errType)
@@ -3187,14 +3192,18 @@ func (ds *DistSender) maybeIncrementErrCounters(br *kvpb.BatchResponse, err erro
 	if err == nil && br.Error == nil {
 		return
 	}
+	var counter *metric.Counter
 	if err != nil {
-		ds.metrics.ErrCounts[kvpb.CommunicationErrType].Inc(1)
+		counter = ds.metrics.ErrCounts[kvpb.CommunicationErrType]
 	} else {
 		typ := kvpb.InternalErrType
 		if detail := br.Error.GetDetail(); detail != nil {
 			typ = detail.Type()
 		}
-		ds.metrics.ErrCounts[typ].Inc(1)
+		counter = ds.metrics.ErrCounts[typ]
+	}
+	if counter != nil {
+		counter.Inc(1)
 	}
 }