Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15922 SolrExporterIntegrationTest fails on Java 17 (#547)

Jan Høydahlbe61551b4614
diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
index a390be1f62f..aac2840e305 100644
--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
@@ -33,6 +33,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.apache.solr.common.util.Pair;
import org.apache.solr.prometheus.PrometheusExporterTestBase;
import org.apache.solr.prometheus.utils.Helpers;
import org.junit.After;
@@ -105,11 +106,9 @@ public class SolrExporterTestBase extends PrometheusExporterTestBase {
continue;
}
- String[] parts = currentLine.split(" ");
+ Pair<String, Double> kv = Helpers.parseMetricsLine(currentLine);
- assertEquals("Metric must have name and value: " + currentLine, 2, parts.length);
-
- metrics.put(parts[0], Double.valueOf(parts[1]));
+ metrics.put(kv.first(), kv.second());
}
}
}
diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java
index 6870cb2aacc..cb8d24c30ca 100644
--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java
+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java
@@ -25,6 +25,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
+import org.apache.solr.common.util.Pair;
import org.apache.solr.prometheus.PrometheusExporterTestBase;
import org.apache.solr.prometheus.exporter.MetricsConfiguration;
@@ -44,4 +45,15 @@ public class Helpers {
}
client.commit(PrometheusExporterTestBase.COLLECTION);
}
+
+ // Parses a prometheus line into key and value, e.g.
+ // solr_exporter_duration_seconds_bucket{le="1.0",} 1.0
+ // first="solr_exporter_duration_seconds_bucket{le="1.0",}," second=1.0
+ public static Pair<String, Double> parseMetricsLine(String line) {
+ int spaceIdx = line.lastIndexOf(" ");
+ if (spaceIdx == -1) {
+ throw new IllegalArgumentException("Failed parsing metrics line, must contain a space. Line was: " + line);
+ }
+ return new Pair<>(line.substring(0,spaceIdx), Double.parseDouble(line.substring(spaceIdx)));
+ }
}