dsmiley commented on code in PR #3417:
URL: https://github.com/apache/solr/pull/3417#discussion_r2217024315
##########
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java:
##########
@@ -576,43 +576,31 @@ public void testOnlyLeaderIndexes() throws Exception {
{
SolrCore core = getSolrCore(true).getFirst();
- var reader =
- core.getSolrMetricsContext()
- .getMetricManager()
- .getPrometheusMetricReader(
-
getSolrCore(true).getFirst().getCoreMetricManager().getRegistryName());
var actual =
- (GaugeSnapshot.GaugeDataPointSnapshot)
- SolrMetricTestUtils.getDataPointSnapshot(
- reader,
- "solr_metrics_core_update_pending_operations",
- SolrMetricTestUtils.getCloudLabelsBase(core)
- .get()
- .label("category", "UPDATE")
- .label("operation", "docs_pending")
- .build());
+ SolrMetricTestUtils.getGaugeDatapoint(
+ core,
+ "solr_core_update_docs_pending_commit",
+ Labels.builder()
+ .label("category", "UPDATE")
+ .label("operation", "docs_pending")
Review Comment:
that'd be "ops" now?
##########
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java:
##########
@@ -576,43 +576,31 @@ public void testOnlyLeaderIndexes() throws Exception {
{
SolrCore core = getSolrCore(true).getFirst();
- var reader =
- core.getSolrMetricsContext()
- .getMetricManager()
- .getPrometheusMetricReader(
-
getSolrCore(true).getFirst().getCoreMetricManager().getRegistryName());
var actual =
- (GaugeSnapshot.GaugeDataPointSnapshot)
- SolrMetricTestUtils.getDataPointSnapshot(
- reader,
- "solr_metrics_core_update_pending_operations",
- SolrMetricTestUtils.getCloudLabelsBase(core)
- .get()
- .label("category", "UPDATE")
- .label("operation", "docs_pending")
- .build());
+ SolrMetricTestUtils.getGaugeDatapoint(
+ core,
+ "solr_core_update_docs_pending_commit",
+ Labels.builder()
+ .label("category", "UPDATE")
+ .label("operation", "docs_pending")
+ .build(),
+ true);
assertEquals(
"Expected 4 docs are pending in core " +
getSolrCore(true).get(0).getCoreDescriptor(),
4,
(long) actual.getValue());
}
for (SolrCore solrCore : getSolrCore(false)) {
- var reader =
- solrCore
- .getSolrMetricsContext()
- .getMetricManager()
-
.getPrometheusMetricReader(solrCore.getCoreMetricManager().getRegistryName());
var actual =
- (GaugeSnapshot.GaugeDataPointSnapshot)
- SolrMetricTestUtils.getDataPointSnapshot(
- reader,
- "solr_metrics_core_update_pending_operations",
- SolrMetricTestUtils.getCloudLabelsBase(solrCore)
- .get()
- .label("category", "UPDATE")
- .label("operation", "docs_pending")
- .build());
+ SolrMetricTestUtils.getGaugeDatapoint(
+ solrCore,
+ "solr_core_update_docs_pending_commit",
+ Labels.builder()
+ .label("category", "UPDATE")
+ .label("operation", "docs_pending")
+ .build(),
+ true);
Review Comment:
nit: booleans like here are inscrutable when reviewing code. Not a big deal
though
##########
solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java:
##########
@@ -118,33 +115,33 @@ public void testBasics() {
assertQ(req("q", "id:5"), "//*[@numFound='0']");
assertQ(req("q", "id:6"), "//*[@numFound='0']");
- assertEquals(
- "Did not have the expected number of pending adds",
- 2,
- getGaugeOpDatapoint(reader, "solr_core_update_pending_operations",
"adds").getValue(),
- 0.0);
+ // assertEquals(
+ // "Did not have the expected number of pending adds",
+ // 2,
+ // getGaugeOpDatapoint(core, "solr_core_update_pending_operations",
"adds").getValue(),
+ // 0.0);
assertEquals(
"Did not have the expected number of cumulative adds",
2,
- getGaugeOpDatapoint(reader, "solr_core_update_operations_cumulative",
"adds").getValue(),
+ getGaugeOpDatapoint(core, "solr_core_update_cumulative_ops",
"adds").getValue(),
Review Comment:
passing core instead of reader is clearer; thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
