tx_throttler: delete topo watcher metric instead of deprecating (#14445)

Signed-off-by: deepthi <[email protected]>
vitessio · Nov 3, 2023 · 0ea4b09 · 0ea4b09
1 parent 369b6a1
commit 0ea4b09
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/changelog/19.0/19.0.0/summary.md b/changelog/19.0/19.0.0/summary.md
@@ -12,7 +12,6 @@
 ### <a id="deprecations-and-deletions"/>Deprecations and Deletions
 
 - The `MYSQL_FLAVOR` environment variable is now removed from all Docker Images.
-- VTTablet metrics for TxThrottler's topology watchers have been deprecated. They will be deleted in the next release.
 
 ### <a id="docker"/>Docker
 

diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go
@@ -144,9 +144,7 @@ type txThrottler struct {
 	topoServer *topo.Server
 
 	// stats
-	throttlerRunning *stats.Gauge
-	// TODO(deepthi): deprecated, should be deleted in v20
-	topoWatchers              *stats.GaugesWithSingleLabel
+	throttlerRunning          *stats.Gauge
 	healthChecksReadTotal     *stats.CountersWithMultiLabels
 	healthChecksRecordedTotal *stats.CountersWithMultiLabels
 	requestsTotal             *stats.CountersWithSingleLabel
@@ -199,7 +197,6 @@ func NewTxThrottler(env tabletenv.Env, topoServer *topo.Server) TxThrottler {
 		config:           config,
 		topoServer:       topoServer,
 		throttlerRunning: env.Exporter().NewGauge(TxThrottlerName+"Running", "transaction throttler running state"),
-		topoWatchers:     env.Exporter().NewGaugesWithSingleLabel(TxThrottlerName+"TopoWatchers", "DEPRECATED: transaction throttler topology watchers", "cell"),
 		healthChecksReadTotal: env.Exporter().NewCountersWithMultiLabels(TxThrottlerName+"HealthchecksRead", "transaction throttler healthchecks read",
 			[]string{"cell", "DbType"}),
 		healthChecksRecordedTotal: env.Exporter().NewCountersWithMultiLabels(TxThrottlerName+"HealthchecksRecorded", "transaction throttler healthchecks recorded",