Skip to content

Commit 4bcccc8

Browse files
craig[bot]jasonlmfong
andcommitted
Merge #158148
158148: ts: record child metrics with low frequency poller r=jasonlmfong a=jasonlmfong This change adds the ability to get changefeed child metrics to be recorded. The child metrics have their names augmented with their labels. Epic: CRDB-55079 Release: None Co-authored-by: Jason Fong <[email protected]>
2 parents 2bf30c4 + cd2f7a0 commit 4bcccc8

File tree

14 files changed

+2005
-1430
lines changed

14 files changed

+2005
-1430
lines changed

docs/generated/metrics/metrics.yaml

Lines changed: 1420 additions & 1420 deletions
Large diffs are not rendered by default.

pkg/ccl/changefeedccl/cdcutils/throttle.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ func MakeMetrics(histogramWindow time.Duration) Metrics {
150150
Help: fmt.Sprintf("Total time spent throttled for %s quota", n),
151151
Measurement: "Nanoseconds",
152152
Unit: metric.Unit_NANOSECONDS,
153+
Category: metric.Metadata_CHANGEFEEDS,
153154
}
154155
}
155156

pkg/ccl/changefeedccl/checkpoint/metrics.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,31 @@ var (
1717
Help: "Time it takes to create a changefeed checkpoint",
1818
Unit: metric.Unit_NANOSECONDS,
1919
Measurement: "Nanoseconds",
20+
Category: metric.Metadata_CHANGEFEEDS,
2021
}
2122

2223
metaTotalBytes = metric.Metadata{
2324
Name: "changefeed.checkpoint.total_bytes",
2425
Help: "Total size of a changefeed checkpoint",
2526
Unit: metric.Unit_BYTES,
2627
Measurement: "Bytes",
28+
Category: metric.Metadata_CHANGEFEEDS,
2729
}
2830

2931
metaTimestampCount = metric.Metadata{
3032
Name: "changefeed.checkpoint.timestamp_count",
3133
Help: "Number of unique timestamps in a changefeed checkpoint",
3234
Unit: metric.Unit_COUNT,
3335
Measurement: "Timestamps",
36+
Category: metric.Metadata_CHANGEFEEDS,
3437
}
3538

3639
metaSpanCount = metric.Metadata{
3740
Name: "changefeed.checkpoint.span_count",
3841
Help: "Number of spans in a changefeed checkpoint",
3942
Unit: metric.Unit_COUNT,
4043
Measurement: "Spans",
44+
Category: metric.Metadata_CHANGEFEEDS,
4145
}
4246
)
4347

pkg/ccl/changefeedccl/kvevent/metrics.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,49 @@ var (
1818
Help: "Total entries entering the buffer between raft and changefeed sinks",
1919
Measurement: "Entries",
2020
Unit: metric.Unit_COUNT,
21+
Category: metric.Metadata_CHANGEFEEDS,
2122
}
2223
metaChangefeedBufferEntriesOut = metric.Metadata{
2324
Name: "changefeed.buffer_entries.out",
2425
Help: "Total entries leaving the buffer between raft and changefeed sinks",
2526
Measurement: "Entries",
2627
Unit: metric.Unit_COUNT,
28+
Category: metric.Metadata_CHANGEFEEDS,
2729
}
2830
metaChangefeedBufferEntriesReleased = metric.Metadata{
2931
Name: "changefeed.buffer_entries.released",
3032
Help: "Total entries processed, emitted and acknowledged by the sinks",
3133
Measurement: "Entries",
3234
Unit: metric.Unit_COUNT,
35+
Category: metric.Metadata_CHANGEFEEDS,
3336
}
3437
metaChangefeedBufferMemAcquired = metric.Metadata{
3538
Name: "changefeed.buffer_entries_mem.acquired",
3639
Help: "Total amount of memory acquired for entries as they enter the system",
3740
Measurement: "Entries",
3841
Unit: metric.Unit_COUNT,
42+
Category: metric.Metadata_CHANGEFEEDS,
3943
}
4044
metaChangefeedBufferMemReleased = metric.Metadata{
4145
Name: "changefeed.buffer_entries_mem.released",
4246
Help: "Total amount of memory released by the entries after they have been emitted",
4347
Measurement: "Entries",
4448
Unit: metric.Unit_COUNT,
49+
Category: metric.Metadata_CHANGEFEEDS,
4550
}
4651
metaChangefeedBufferPushbackNanos = metric.Metadata{
4752
Name: "changefeed.buffer_pushback_nanos",
4853
Help: "Total time spent waiting while the buffer was full",
4954
Measurement: "Nanoseconds",
5055
Unit: metric.Unit_NANOSECONDS,
56+
Category: metric.Metadata_CHANGEFEEDS,
5157
}
5258
metaChangefeedAllocatedMemory = metric.Metadata{
5359
Name: "changefeed.buffer_entries.allocated_mem",
5460
Help: "Current quota pool memory allocation",
5561
Measurement: "Bytes",
5662
Unit: metric.Unit_BYTES,
63+
Category: metric.Metadata_CHANGEFEEDS,
5764
}
5865
)
5966

@@ -138,6 +145,7 @@ func MakeMetrics(histogramWindow time.Duration) Metrics {
138145
Help: fmt.Sprintf("Number of %s elements added to the buffer", eventTypeName),
139146
Measurement: "Events",
140147
Unit: metric.Unit_COUNT,
148+
Category: metric.Metadata_CHANGEFEEDS,
141149
}
142150
}
143151
commonBufferMetrics := CommonBufferMetrics{

0 commit comments

Comments
 (0)