Skip to content

clustermetrics: add support for stopwatch type #164371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trunk-io merged 1 commit into from
Feb 27, 2026
Merged

clustermetrics: add support for stopwatch type #164371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/obs/clustermetrics/cmreader/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ go_test(
embed = [":cmreader"],
deps = [
"//pkg/base",
"//pkg/jobs",
"//pkg/obs/clustermetrics",
"//pkg/obs/clustermetrics/cmmetrics",
"//pkg/obs/clustermetrics/cmwatcher",
Expand All @@ -49,11 +50,11 @@ go_test(
"//pkg/sql",
"//pkg/testutils",
"//pkg/testutils/serverutils",
"//pkg/testutils/skip",
"//pkg/testutils/sqlutils",
"//pkg/util/leaktest",
"//pkg/util/log",
"//pkg/util/metric",
"//pkg/util/timeutil",
"@com_github_prometheus_common//expfmt",
"@com_github_stretchr_testify//require",
],
Expand Down
9 changes: 9 additions & 0 deletions pkg/obs/clustermetrics/cmreader/registry_syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ func (s *registrySyncer) deregisterMetricLocked(
func (s *registrySyncer) start(
ctx context.Context, tableResolver catalog.SystemTableIDResolver,
) error {
if s.knobs != nil && s.knobs.OnRegistrySyncerPreStart != nil {
s.knobs.OnRegistrySyncerPreStart()
}
err := s.tableWatcher.Start(ctx, tableResolver)
if err != nil {
log.Dev.Errorf(ctx, "failed to start cluster metrics rangefeed: %s", err)
Expand Down Expand Up @@ -174,6 +177,11 @@ func (s *registrySyncer) deregisterMetric(ctx context.Context, row cmwatcher.Clu
func (s *registrySyncer) reloadAllMetrics(
ctx context.Context, metrics map[int64]cmwatcher.ClusterMetricRow,
) {
defer func() {
if s.knobs != nil && s.knobs.OnReloadComplete != nil {
s.knobs.OnReloadComplete()
}
}()
s.mu.Lock()
defer s.mu.Unlock()
for _, m := range s.mu.trackedMetrics {
Expand All @@ -184,6 +192,7 @@ func (s *registrySyncer) reloadAllMetrics(
for _, row := range metrics {
s.updateMetricLocked(ctx, row)
}

}

type Syncer struct {
Expand Down
Loading