Skip to content

SOLR-17530: Prometheus regex cloud pattern fix for core names #2795

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

Merged
dsmiley merged 4 commits into from
Nov 2, 2024
Merged

SOLR-17530: Prometheus regex cloud pattern fix for core names #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d87943a
Fix cloud pattern bug
mlbiscoc Oct 25, 2024
75301e5
Change to matches()
mlbiscoc Oct 25, 2024
f50a951
Merge branch 'main' into fork/mlbiscoc/SOLR-10654-bad-cloud-pattern
dsmiley Oct 30, 2024
e03979f
CHANGES.txt (9.7.1)
dsmiley Oct 30, 2024
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
6 changes: 6 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ led to the suppression of exceptions. (Andrey Bozhko)

* SOLR-11318: Introduce unit testing for AssertTool. (Eric Pugh, Jason Gerlowski)

================== 9.7.1 ==================
Bug Fixes
---------------------
* SOLR-17530: Metrics: Thew new Prometheus response writer wasn't detecting TLOG or PULL replicas properly.
(Matthew Biscocho)

================== 9.7.0 ==================
New Features
---------------------
Expand Down
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ enum CoreCategory {
CORE
}

Pattern CLOUD_CORE_PATTERN = Pattern.compile("^core_(.*)_(shard[0-9]+)_(replica_n[0-9]+)$");
Pattern CLOUD_CORE_PATTERN = Pattern.compile("^core_(.*)_(shard[0-9]+)_(replica_.[0-9]+)$");
}
31 changes: 31 additions & 0 deletions solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.solr.metrics;

import static org.apache.solr.metrics.prometheus.core.PrometheusCoreFormatterInfo.CLOUD_CORE_PATTERN;

import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Meter;
Expand All @@ -29,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.metrics.prometheus.SolrMetric;
import org.apache.solr.metrics.prometheus.SolrPrometheusFormatter;
Expand Down Expand Up @@ -141,6 +144,34 @@ public Map<String, Number> getValue() {
assertEquals(expectedLabels, actual.getLabels());
}

@Test
public void testCloudCorePattern() {
String coreName = "core_test-core_shard2_replica_t123";
Matcher m = CLOUD_CORE_PATTERN.matcher(coreName);
assertTrue(m.find());
assertEquals("test-core", m.group(1));
assertEquals("shard2", m.group(2));
assertEquals("replica_t123", m.group(3));

coreName = "core_foo_bar_shard24_replica_p8";
m = CLOUD_CORE_PATTERN.matcher(coreName);
assertTrue(m.matches());
assertEquals("foo_bar", m.group(1));
assertEquals("shard24", m.group(2));
assertEquals("replica_p8", m.group(3));
}

@Test
public void testBadCloudCorePattern() {
String badCoreName = "core_solrtest_shard100_replica_xyz23";
Matcher m = CLOUD_CORE_PATTERN.matcher(badCoreName);
assertFalse(m.matches());

badCoreName = "core_solrtest_shards100_replica_x23";
m = CLOUD_CORE_PATTERN.matcher(badCoreName);
assertFalse(m.matches());
}

static class TestSolrPrometheusFormatter extends SolrPrometheusFormatter {
@Override
public void exportDropwizardMetric(Metric dropwizardMetric, String metricName) {}
Expand Down