@@ -212,16 +212,16 @@ TEST_F(LocalMetricsReporterTest, TestReportPerQueryEventReport) {
212212
213213 reporter_->ReportPerQuery (&collector);
214214 std::uint64_t value = 0 ;
215- GET_METRICS_ (&collector, event_report, request_counter , value);
215+ GET_METRICS_ (&collector, service, query_counter , value);
216216 EXPECT_EQ (1 , value);
217- GET_METRICS_ (&collector, event_report , error_counter, value);
217+ GET_METRICS_ (&collector, service , error_counter, value);
218218 EXPECT_EQ (0 , value);
219219
220- SET_METRICS_ (&collector, event_report , error_code, 10 .);
220+ SET_METRICS_ (&collector, service , error_code, 10 .);
221221 reporter_->ReportPerQuery (&collector);
222- GET_METRICS_ (&collector, event_report, request_counter , value);
222+ GET_METRICS_ (&collector, service, query_counter , value);
223223 EXPECT_EQ (2 , value);
224- GET_METRICS_ (&collector, event_report , error_counter, value);
224+ GET_METRICS_ (&collector, service , error_counter, value);
225225 EXPECT_EQ (1 , value);
226226}
227227
@@ -236,14 +236,14 @@ TEST_F(LocalMetricsReporterTest, ConcurrentEventCollectorsDoNotShareErrorSamples
236236 failure.SetRequestSample (20.0 , 1.0 );
237237 // Both objects point at the same tagged registry gauge. Deliberately leave
238238 // that shared gauge in the failed state before reporting the success.
239- SET_METRICS_ (&success, event_report , error_code, 0.0 );
240- SET_METRICS_ (&failure, event_report , error_code, 1.0 );
239+ SET_METRICS_ (&success, service , error_code, 0.0 );
240+ SET_METRICS_ (&failure, service , error_code, 1.0 );
241241
242242 reporter_->ReportPerQuery (&success);
243243 reporter_->ReportPerQuery (&failure);
244244
245- EXPECT_EQ (2u , success.get_event_report_request_counter_metrics ());
246- EXPECT_EQ (1u , success.get_event_report_error_counter_metrics ());
245+ EXPECT_EQ (2u , success.get_service_query_counter_metrics ());
246+ EXPECT_EQ (1u , success.get_service_error_counter_metrics ());
247247}
248248
249249TEST_F (LocalMetricsReporterTest, ServiceCallGuardCopiesRequestOutcomeToEventReportMetrics) {
@@ -262,10 +262,10 @@ TEST_F(LocalMetricsReporterTest, ServiceCallGuardCopiesRequestOutcomeToEventRepo
262262 std::this_thread::sleep_for (std::chrono::milliseconds (1 ));
263263 }
264264
265- EXPECT_GT (snapshot_collector->get_event_report_request_rt_us_metrics (), 0 .);
266- EXPECT_DOUBLE_EQ (1 ., snapshot_collector->get_event_report_error_code_metrics ());
267- EXPECT_EQ (1 , snapshot_collector->get_event_report_request_counter_metrics ());
268- EXPECT_EQ (1 , snapshot_collector->get_event_report_error_counter_metrics ());
265+ EXPECT_GT (snapshot_collector->get_service_query_rt_us_metrics (), 0 .);
266+ EXPECT_DOUBLE_EQ (1 ., snapshot_collector->get_service_error_code_metrics ());
267+ EXPECT_EQ (1 , snapshot_collector->get_service_query_counter_metrics ());
268+ EXPECT_EQ (1 , snapshot_collector->get_service_error_counter_metrics ());
269269}
270270
271271TEST_F (LocalMetricsReporterTest, EventReportMetricsUseRequestLocalStatusInsteadOfSharedServiceGauge) {
@@ -283,9 +283,9 @@ TEST_F(LocalMetricsReporterTest, EventReportMetricsUseRequestLocalStatusInsteadO
283283 request_context.GetMetricsCollectorsVehicle ().AddMetricsCollector (heartbeat_collector);
284284 { ServiceCallGuard guard (cache_manager_.get (), &request_context, reporter_.get ()); }
285285
286- EXPECT_DOUBLE_EQ (0 ., heartbeat_collector->get_event_report_error_code_metrics ());
287- EXPECT_EQ (1 , heartbeat_collector->get_event_report_request_counter_metrics ());
288- EXPECT_EQ (0 , heartbeat_collector->get_event_report_error_counter_metrics ());
286+ EXPECT_DOUBLE_EQ (0 ., heartbeat_collector->get_service_error_code_metrics ());
287+ EXPECT_EQ (1 , heartbeat_collector->get_service_query_counter_metrics ());
288+ EXPECT_EQ (0 , heartbeat_collector->get_service_error_counter_metrics ());
289289}
290290
291291TEST_F (LocalMetricsReporterTest, TestReportInterval00) {
0 commit comments