Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13234: Fix for turkish locales 

WhenSolrExporterIntegrationTest.jvmMetrics ran on a JVM with the Turkish locale, (test seed: 62880F3B9F140C89). The JVM metric for terminated thread-count has a dotless-i e.g. termınated.
This causes the check for matching metrics to fail.

We could normalize the text in this case, however I think it's better to ensure we have the correct total number of JVM thread metrics rather than looking at Prometheus labels which maybe localized.

This closes #605.
This commit is contained in:
Shalin Shekhar Mangar 2019-03-14 11:10:49 +05:30
parent d8f2a02fdb
commit 6d0386c901
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
View File

@ -33,10 +33,10 @@ public class SolrExporterIntegrationTest extends SolrExporterTestBase {
startMetricsExporterWithConfiguration("conf/prometheus-solr-exporter-integration-test-config.xml");
}
private Map<String, Double> metricsWithName(Map<String, Double> allMetrics, String name) {
private Map<String, Double> metricsWithName(Map<String, Double> allMetrics, String desiredMetricName) {
return allMetrics.entrySet()
.stream()
.filter(entry -> entry.getKey().startsWith(name))
.filter(entry -> entry.getKey().startsWith(desiredMetricName))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
@ -64,8 +64,12 @@ public class SolrExporterIntegrationTest extends SolrExporterTestBase {
@Test
public void jvmMetrics() throws Exception {
Map<String, Double> jvmMetrics = metricsWithName(getAllMetrics(), "solr_metrics_jvm_threads{item=\"terminated\"");
assertEquals(NUM_NODES, jvmMetrics.size());
Map<String, Double> jvmMetrics = metricsWithName(
getAllMetrics(), "solr_metrics_jvm_threads");
// Include all thread states + plus overall count + number of daemon threads + number of deadlocked threads
assertEquals(NUM_NODES * (Thread.State.values().length + 3),
jvmMetrics.size());
}
@Test