Skip to content

Commit 715f5bc

Browse files
committed
[metrics] add copy_keys_qps and copy_time_us to DataStorageMetricsCollector
1 parent 0e1b055 commit 715f5bc

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎kv_cache_manager/metrics/metrics_collector.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ DEFINE_METRICS_NAME_FOR_DATA_STORAGE(create_counter);
196196
DEFINE_METRICS_NAME_FOR_DATA_STORAGE(create_keys_qps);
197197
DEFINE_METRICS_NAME_FOR_DATA_STORAGE(create_keys_counter);
198198
DEFINE_METRICS_NAME_FOR_DATA_STORAGE(create_time_us);
199+
DEFINE_METRICS_NAME_FOR_DATA_STORAGE(copy_keys_qps);
200+
DEFINE_METRICS_NAME_FOR_DATA_STORAGE(copy_time_us);
199201

200202
DataStorageMetricsCollector::DataStorageMetricsCollector(std::shared_ptr<MetricsRegistry> metrics_registry) noexcept
201203
: MetricsCollector(std::move(metrics_registry)) {}
@@ -213,6 +215,8 @@ bool DataStorageMetricsCollector::Init() {
213215
REGISTER_GAUGE_METRICS_FOR_DATA_STORAGE(create_keys_qps);
214216
REGISTER_COUNTER_METRICS_FOR_DATA_STORAGE(create_keys_counter);
215217
REGISTER_GAUGE_METRICS_FOR_DATA_STORAGE(create_time_us);
218+
REGISTER_GAUGE_METRICS_FOR_DATA_STORAGE(copy_keys_qps);
219+
REGISTER_GAUGE_METRICS_FOR_DATA_STORAGE(copy_time_us);
216220

217221
return true;
218222
}

‎kv_cache_manager/metrics/metrics_collector.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ class DataStorageMetricsCollector final : public MetricsCollector {
335335

336336
KVCM_CHRONO_METRICS(data_storage, create_time_us, DataStorageCreate)
337337

338+
KVCM_GAUGE_METRICS(data_storage, copy_keys_qps)
339+
KVCM_CHRONO_METRICS(data_storage, copy_time_us, DataStorageCopy)
340+
338341
public:
339342
DataStorageMetricsCollector() = delete;
340343
explicit DataStorageMetricsCollector(std::shared_ptr<MetricsRegistry> metrics_registry) noexcept;

‎kv_cache_manager/metrics/test/local_metrics_reporter_test.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@ TEST_F(LocalMetricsReporterTest, TestReportPerQuery00) {
110110
}
111111

112112
TEST_F(LocalMetricsReporterTest, TestReportPerQuery01) {
113+
constexpr int kDataStorageMetricsCount = 9;
113114
EXPECT_EQ(3, metrics_registry_->GetSize());
114115

115116
DataStorageMetricsCollector collector(metrics_registry_);
116117
collector.Init();
117118

118-
EXPECT_EQ(7, metrics_registry_->GetSize());
119+
EXPECT_EQ(kDataStorageMetricsCount, metrics_registry_->GetSize());
119120

120121
{
121122
reporter_->ReportPerQuery(&collector);
122-
EXPECT_EQ(7, metrics_registry_->GetSize());
123+
EXPECT_EQ(kDataStorageMetricsCount, metrics_registry_->GetSize());
123124

124125
std::uint64_t v;
125126
GET_METRICS_(&collector, data_storage, create_counter, v);
@@ -135,7 +136,7 @@ TEST_F(LocalMetricsReporterTest, TestReportPerQuery01) {
135136
g = 6.0;
136137

137138
reporter_->ReportPerQuery(&collector);
138-
EXPECT_EQ(7, metrics_registry_->GetSize());
139+
EXPECT_EQ(kDataStorageMetricsCount, metrics_registry_->GetSize());
139140

140141
std::uint64_t v;
141142
GET_METRICS_(&collector, data_storage, create_counter, v);
@@ -151,7 +152,7 @@ TEST_F(LocalMetricsReporterTest, TestReportPerQuery01) {
151152
g = 2.0;
152153

153154
reporter_->ReportPerQuery(&collector);
154-
EXPECT_EQ(7, metrics_registry_->GetSize());
155+
EXPECT_EQ(kDataStorageMetricsCount, metrics_registry_->GetSize());
155156

156157
std::uint64_t v;
157158
GET_METRICS_(&collector, data_storage, create_counter, v);

0 commit comments

Comments
 (0)