Rename several select/get metrics to better describe the nature of th…

…em (#147)
cowpaths · Sep 25, 2023 · f1f672c · f1f672c
1 parent 213fd9d
commit f1f672c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/solr/core/src/java/org/apache/solr/servlet/PrometheusMetricsServlet.java b/solr/core/src/java/org/apache/solr/servlet/PrometheusMetricsServlet.java
@@ -552,25 +552,25 @@ protected void handle(List<PrometheusMetric> results, JsonNode metrics) throws I
               mergeMinorDocs));
       results.add(
           new PrometheusMetric(
-              "distributed_requests_get",
+              "top_level_requests_get",
               PrometheusMetricType.COUNTER,
               "cumulative number of top-level gets across cores",
               distribGet));
       results.add(
           new PrometheusMetric(
-              "local_requests_get",
+              "sub_shard_requests_get",
               PrometheusMetricType.COUNTER,
               "cumulative number of sub (spawned by re-distributing a top-level req) gets across cores",
               localGet));
       results.add(
           new PrometheusMetric(
-              "distributed_requests_select",
+              "top_level_requests_select",
               PrometheusMetricType.COUNTER,
               "cumulative number of top-level selects across cores",
               distribSelect));
       results.add(
           new PrometheusMetric(
-              "local_requests_select",
+              "sub_shard_requests_select",
               PrometheusMetricType.COUNTER,
               "cumulative number of sub (spawned by re-distributing a top-level req) selects across cores",
               localSelect));

diff --git a/solr/core/src/test/org/apache/solr/servlet/PrometheusMetricsServletTest.java b/solr/core/src/test/org/apache/solr/servlet/PrometheusMetricsServletTest.java
@@ -342,18 +342,18 @@ public void testCoresMetricsApiCaller() throws Exception {
             + "# HELP merges_minor_current_docs current number of docs in minor merges across cores\n"
             + "# TYPE merges_minor_current_docs gauge\n"
             + "merges_minor_current_docs 32\n"
-            + "# HELP distributed_requests_get cumulative number of top-level gets across cores\n"
-            + "# TYPE distributed_requests_get counter\n"
-            + "distributed_requests_get 73\n"
-            + "# HELP local_requests_get cumulative number of sub (spawned by re-distributing a top-level req) gets across cores\n"
-            + "# TYPE local_requests_get counter\n"
-            + "local_requests_get 36\n"
-            + "# HELP distributed_requests_select cumulative number of top-level selects across cores\n"
-            + "# TYPE distributed_requests_select counter\n"
-            + "distributed_requests_select 75\n"
-            + "# HELP local_requests_select cumulative number of sub (spawned by re-distributing a top-level req) selects across cores\n"
-            + "# TYPE local_requests_select counter\n"
-            + "local_requests_select 38\n"
+            + "# HELP top_level_requests_get cumulative number of top-level gets across cores\n"
+            + "# TYPE top_level_requests_get counter\n"
+            + "top_level_requests_get 73\n"
+            + "# HELP sub_shard_requests_get cumulative number of sub (spawned by re-distributing a top-level req) gets across cores\n"
+            + "# TYPE sub_shard_requests_get counter\n"
+            + "sub_shard_requests_get 36\n"
+            + "# HELP top_level_requests_select cumulative number of top-level selects across cores\n"
+            + "# TYPE top_level_requests_select counter\n"
+            + "top_level_requests_select 75\n"
+            + "# HELP sub_shard_requests_select cumulative number of sub (spawned by re-distributing a top-level req) selects across cores\n"
+            + "# TYPE sub_shard_requests_select counter\n"
+            + "sub_shard_requests_select 38\n"
             + "# HELP distributed_requests_update cumulative number of distributed updates across cores\n"
             + "# TYPE distributed_requests_update counter\n"
             + "distributed_requests_update 77\n"
@@ -443,18 +443,18 @@ public void testCoresMetricsApiCallerMissingIndex() throws Exception {
             + "# HELP merges_minor_current_docs current number of docs in minor merges across cores\n"
             + "# TYPE merges_minor_current_docs gauge\n"
             + "merges_minor_current_docs -4\n"
-            + "# HELP distributed_requests_get cumulative number of top-level gets across cores\n"
-            + "# TYPE distributed_requests_get counter\n"
-            + "distributed_requests_get 134\n"
-            + "# HELP local_requests_get cumulative number of sub (spawned by re-distributing a top-level req) gets across cores\n"
-            + "# TYPE local_requests_get counter\n"
-            + "local_requests_get 46\n"
-            + "# HELP distributed_requests_select cumulative number of top-level selects across cores\n"
-            + "# TYPE distributed_requests_select counter\n"
-            + "distributed_requests_select 138\n"
-            + "# HELP local_requests_select cumulative number of sub (spawned by re-distributing a top-level req) selects across cores\n"
-            + "# TYPE local_requests_select counter\n"
-            + "local_requests_select 50\n"
+            + "# HELP top_level_requests_get cumulative number of top-level gets across cores\n"
+            + "# TYPE top_level_requests_get counter\n"
+            + "top_level_requests_get 134\n"
+            + "# HELP sub_shard_requests_get cumulative number of sub (spawned by re-distributing a top-level req) gets across cores\n"
+            + "# TYPE sub_shard_requests_get counter\n"
+            + "sub_shard_requests_get 46\n"
+            + "# HELP top_level_requests_select cumulative number of top-level selects across cores\n"
+            + "# TYPE top_level_requests_select counter\n"
+            + "top_level_requests_select 138\n"
+            + "# HELP sub_shard_requests_select cumulative number of sub (spawned by re-distributing a top-level req) selects across cores\n"
+            + "# TYPE sub_shard_requests_select counter\n"
+            + "sub_shard_requests_select 50\n"
             + "# HELP distributed_requests_update cumulative number of distributed updates across cores\n"
             + "# TYPE distributed_requests_update counter\n"
             + "distributed_requests_update 142\n"