From 0ea4b0932126a577e9ce9af8d800d9031d47c604 Mon Sep 17 00:00:00 2001 From: Deepthi Sigireddi Date: Fri, 3 Nov 2023 09:37:44 -0700 Subject: [PATCH] tx_throttler: delete topo watcher metric instead of deprecating (#14445) Signed-off-by: deepthi --- changelog/19.0/19.0.0/summary.md | 1 - go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/changelog/19.0/19.0.0/summary.md b/changelog/19.0/19.0.0/summary.md index d9f655ecbc2..5d413c25cae 100644 --- a/changelog/19.0/19.0.0/summary.md +++ b/changelog/19.0/19.0.0/summary.md @@ -12,7 +12,6 @@ ### 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. ### Docker diff --git a/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go b/go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go index f78c65a4587..92976bbedf2 100644 --- 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",