Merge #157907

157907: rangefeed: remove kv.rangefeed.processors_goroutine, rename kv.rangefeed.processors_scheduler r=wenyihu6 a=stevendanna

We now only have 1 kind of processor. Here we update the metrics to reflect this
reality.

Fixes #132843
Release note (ops change): Removed the kv.rangefeed.processors_goroutine and kv.rangefeed.processors_scheduler metrics and replaced them with a single kv.rangefeed.processors metric.

Co-authored-by: Steven Danna <danna@cockroachlabs.com>

Author: craig[bot]

docs/generated/metrics/metrics.yaml

@@ -12348,17 +12348,9 @@ layers:
       unit: NANOSECONDS
       aggregation: AVG
       derivative: NON_NEGATIVE_DERIVATIVE
-    - name: kv.rangefeed.processors_goroutine
-      exported_name: kv_rangefeed_processors_goroutine
-      description: Number of active RangeFeed processors using goroutines
-      y_axis_label: Processors
-      type: GAUGE
-      unit: COUNT
-      aggregation: AVG
-      derivative: NONE
-    - name: kv.rangefeed.processors_scheduler
-      exported_name: kv_rangefeed_processors_scheduler
-      description: Number of active RangeFeed processors using scheduler
+    - name: kv.rangefeed.processors
+      exported_name: kv_rangefeed_processors
+      description: Number of active RangeFeed processors
       y_axis_label: Processors
       type: GAUGE
       unit: COUNT

pkg/kv/kvserver/rangefeed/metrics.go

@@ -71,15 +71,9 @@ var (
 		Measurement: "Cancellation Count",
 		Unit:        metric.Unit_COUNT,
 	}
-	metaRangeFeedProcessorsGO = metric.Metadata{
-		Name:        "kv.rangefeed.processors_goroutine",
-		Help:        "Number of active RangeFeed processors using goroutines",
-		Measurement: "Processors",
-		Unit:        metric.Unit_COUNT,
-	}
-	metaRangeFeedProcessorsScheduler = metric.Metadata{
-		Name:        "kv.rangefeed.processors_scheduler",
-		Help:        "Number of active RangeFeed processors using scheduler",
+	metaRangeFeedProcessors = metric.Metadata{
+		Name:        "kv.rangefeed.processors",
+		Help:        "Number of active RangeFeed processors",
 		Measurement: "Processors",
 		Unit:        metric.Unit_COUNT,
 	}
@@ -129,11 +123,7 @@ type Metrics struct {
 	// limit, but it's here to limit the effect on stability in case something
 	// unexpected happens.
 	RangeFeedSlowClosedTimestampNudgeSem chan struct{}
-	// Metrics exposing rangefeed processor by type. Those metrics are used to
-	// monitor processor switch over. They could be removed when legacy processor
-	// is removed.
-	RangeFeedProcessorsGO        *metric.Gauge
-	RangeFeedProcessorsScheduler *metric.Gauge
+	RangeFeedProcessors                  *metric.Gauge
 }
 
 // MetricStruct implements the metric.Struct interface.
@@ -152,8 +142,7 @@ func NewMetrics() *Metrics {
 		RangeFeedSlowClosedTimestampRanges:          metric.NewGauge(metaRangefeedSlowClosedTimestampRanges),
 		RangeFeedSlowClosedTimestampLogN:            log.Every(5 * time.Second),
 		RangeFeedSlowClosedTimestampNudgeSem:        make(chan struct{}, 1024),
-		RangeFeedProcessorsGO:                       metric.NewGauge(metaRangeFeedProcessorsGO),
-		RangeFeedProcessorsScheduler:                metric.NewGauge(metaRangeFeedProcessorsScheduler),
+		RangeFeedProcessors:                         metric.NewGauge(metaRangeFeedProcessors),
 		RangeFeedBufferedRegistrations:              metric.NewGauge(metaRangeFeedBufferedRegistrations),
 		RangeFeedUnbufferedRegistrations:            metric.NewGauge(metaRangeFeedUnbufferedRegistrations),
 		RangefeedOutputLoopNanosForUnbufferedReg:    metric.NewCounter(metaRangeFeedOutputLoopNanosUnbufferedRegistration),

pkg/kv/kvserver/rangefeed/scheduled_processor.go

@@ -149,7 +149,7 @@ func (p *ScheduledProcessor) Start(
 		p.initResolvedTS(p.taskCtx, nil)
 	}
 
-	p.Metrics.RangeFeedProcessorsScheduler.Inc(1)
+	p.Metrics.RangeFeedProcessors.Inc(1)
 	return nil
 }
 
@@ -251,7 +251,7 @@ func (p *ScheduledProcessor) processPushTxn(ctx context.Context) {
 
 func (p *ScheduledProcessor) processStop() {
 	p.cleanup()
-	p.Metrics.RangeFeedProcessorsScheduler.Dec(1)
+	p.Metrics.RangeFeedProcessors.Dec(1)
 }
 
 func (p *ScheduledProcessor) cleanup() {

pkg/roachprod/agents/opentelemetry/cockroachdb_metrics.go

@@ -1170,8 +1170,7 @@ var cockroachdbMetrics = map[string]string{
     "kv_rangefeed_mem_system": "kv.rangefeed.mem_system",
     "kv_rangefeed_mux_stream_send_slow_events": "kv.rangefeed.mux_stream_send.slow_events",
     "kv_rangefeed_output_loop_unbuffered_registration_nanos": "kv.rangefeed.output_loop_unbuffered_registration_nanos",
-    "kv_rangefeed_processors_goroutine": "kv.rangefeed.processors_goroutine",
-    "kv_rangefeed_processors_scheduler": "kv.rangefeed.processors_scheduler",
+    "kv_rangefeed_processors": "kv.rangefeed.processors",
     "kv_rangefeed_registrations": "kv.rangefeed.registrations",
     "kv_rangefeed_scheduled_processor_queue_timeout": "kv.rangefeed.scheduled_processor.queue_timeout",
     "kv_rangefeed_scheduler_normal_latency": "kv.rangefeed.scheduler.normal.latency",