Apache Solr open-source search software
SOLR-15572: Improve the default Prometheus exporter config performance.
Andrzej Bialeckicaf22f1925d6
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ae7c89e3ea3..412ae2143bb 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -514,6 +514,8 @@ Improvementsall queries contending for the same set of locks on the cache. Fixed a bug with ramBytes usage reporting on filterCache.Upgraded Caffeine Cache to 2.9.2 (Mike Drob)+* SOLR-15572: Improve the default Prometheus exporter config performance. (ab)+Optimizations---------------------* SOLR-15433: Replace transient core cache LRU by Caffeine cache. (Bruno Roustant)diff --git a/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml b/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xmlindex d25e0338405..f7638dd0a38 100644--- a/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml+++ b/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml@@ -263,10 +263,23 @@<lst name="query"><str name="path">/admin/metrics</str><lst name="params">- <str name="group">all</str>- <str name="type">all</str>- <str name="prefix"></str>- <str name="property"></str>+ <!--+ trim some of these expressions as needed if you don't care about+ a particular group of metrics.+ -->+ <str name="expr">solr\.jetty:.*DefaultHandler.*</str>+ <str name="expr">solr\.jvm:.*</str>+ <str name="expr">solr\.node:.*</str>+ <str name="expr">solr\.overseer:.*</str>+ <str name="expr">solr\.core\..*:QUERY\..*</str>+ <str name="expr">solr\.core\..*:ADMIN\..*</str>+ <str name="expr">solr\.core\..*:CACHE\..*</str>+ <str name="expr">solr\.core\..*:UPDATE\.updateHandler\..*</str>+ <str name="expr">solr\.core\..*:CORE\.fs\..*</str>+ <str name="expr">solr\.core\..*:HIGHLIGHTER\..*</str>+ <str name="expr">solr\.core\..*:INDEX\..*</str>+ <str name="expr">solr\.core\..*:REPLICATION\.replication\..*</str>+ <str name="expr">solr\.core\..*:SEARCHER\.searcher\..*</str></lst></lst><arr name="jsonQueries">diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.javaindex 23e2d33fe5e..8de9693af97 100644--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java@@ -18,6 +18,7 @@package org.apache.solr.prometheus.exporter;import java.util.ArrayList;+import java.util.Collection;import java.util.List;import java.util.Map;import java.util.Optional;@@ -98,7 +99,7 @@ public class MetricsQuery {for (NamedList<?> request : requests) {NamedList<?> query = (NamedList<?>) request.get("query");@SuppressWarnings("unchecked")- NamedList<String> queryParameters = (NamedList<String>) query.get("params");+ NamedList<Object> queryParameters = (NamedList<Object>) query.get("params");String path = (String) query.get("path");String core = (String) query.get("core");String collection = (String) query.get("collection");@@ -107,8 +108,16 @@ public class MetricsQuery {ModifiableSolrParams params = new ModifiableSolrParams();if (queryParameters != null) {- for (Map.Entry<String, String> entrySet : queryParameters.asShallowMap().entrySet()) {- params.add(entrySet.getKey(), entrySet.getValue());+ for (Map.Entry<String, Object> entrySet : queryParameters.asShallowMap().entrySet()) {+ if (entrySet.getValue() instanceof Collection) {+ @SuppressWarnings("unchecked")+ Collection<Object> values = (Collection<Object>) entrySet.getValue();+ for (Object value : values) {+ params.add(entrySet.getKey(), String.valueOf(value));+ }+ } else {+ params.add(entrySet.getKey(), String.valueOf(entrySet.getValue()));+ }}}diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.javaindex 5efedc36af7..eedb2162ab7 100644--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java@@ -130,7 +130,7 @@ public class SolrCloudScraper extends SolrScraper {}private Set<String> getCollections() throws IOException {- return solrClient.getClusterStateProvider().getClusterState().getCollectionsMap().keySet();+ return solrClient.getClusterStateProvider().getClusterState().getCollectionStates().keySet();}@Overridediff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xmlindex f2f96a088a9..fdd3e3ddd9e 100644--- a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml@@ -92,10 +92,19 @@<lst name="query"><str name="path">/admin/metrics</str><lst name="params">- <str name="group">all</str>- <str name="type">all</str>- <str name="prefix"></str>- <str name="property"></str>+ <str name="expr">solr\.jetty:.*DefaultHandler.*</str>+ <str name="expr">solr\.jvm:.*</str>+ <str name="expr">solr\.node:.*</str>+ <str name="expr">solr\.overseer:.*</str>+ <str name="expr">solr\.core\..*:QUERY\..*</str>+ <str name="expr">solr\.core\..*:ADMIN\..*</str>+ <str name="expr">solr\.core\..*:CACHE\..*</str>+ <str name="expr">solr\.core\..*:UPDATE\.updateHandler\..*</str>+ <str name="expr">solr\.core\..*:CORE\.fs\..*</str>+ <str name="expr">solr\.core\..*:HIGHLIGHTER\..*</str>+ <str name="expr">solr\.core\..*:INDEX\..*</str>+ <str name="expr">solr\.core\..*:REPLICATION\.replication\..*</str>+ <str name="expr">solr\.core\..*:SEARCHER\.searcher\..*</str></lst></lst><arr name="jsonQueries">diff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xmlindex 7da8eff19a7..de10dfe6130 100644--- a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml@@ -94,8 +94,19 @@<lst name="query"><str name="path">/admin/metrics</str><lst name="params">- <str name="group">all</str>- <str name="type">all</str>+ <str name="expr">solr\.jetty:.*DefaultHandler.*</str>+ <str name="expr">solr\.jvm:.*</str>+ <str name="expr">solr\.node:.*</str>+ <str name="expr">solr\.overseer:.*</str>+ <str name="expr">solr\.core\..*:QUERY\..*</str>+ <str name="expr">solr\.core\..*:ADMIN\..*</str>+ <str name="expr">solr\.core\..*:CACHE\..*</str>+ <str name="expr">solr\.core\..*:UPDATE\.updateHandler\..*</str>+ <str name="expr">solr\.core\..*:CORE\.fs\..*</str>+ <str name="expr">solr\.core\..*:HIGHLIGHTER\..*</str>+ <str name="expr">solr\.core\..*:INDEX\..*</str>+ <str name="expr">solr\.core\..*:REPLICATION\.replication\..*</str>+ <str name="expr">solr\.core\..*:SEARCHER\.searcher\..*</str></lst></lst><arr name="jsonQueries">diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.javaindex ceb4a4e0819..fa65ec0dfdd 100644--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java@@ -23,7 +23,7 @@ import org.apache.lucene.util.LuceneTestCase.Slow;import org.junit.Before;import org.junit.Test;[email protected](bugUrl="https://issues.apache.org/jira/browse/SOLR-13786")+//@org.apache.lucene.util.LuceneTestCase.AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13786")@Slowpublic class SolrExporterIntegrationTest extends SolrExporterTestBase {