Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAI-4441: Rename several select/get metrics to better describe them #147

Merged
merged 1 commit into from
Sep 25, 2023
Merged

SAI-4441: Rename several select/get metrics to better describe them #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions solr/core/src/java/org/apache/solr/servlet/PrometheusMetricsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,25 +551,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));
Expand Down
48 changes: 24 additions & 24 deletions solr/core/src/test/org/apache/solr/servlet/PrometheusMetricsServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading