SOLR-17587: Prometheus Writer duplicate TYPE information in exposition format

solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java

@@ -26,6 +26,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -186,10 +187,22 @@ private NamedList<Object> handlePrometheusExport(SolrParams params) {
     List<MetricType> metricTypes = parseMetricTypes(params);
     List<MetricFilter> metricFilters =
         metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
+
     Set<String> requestedRegistries = parseRegistries(params);
+    MetricRegistry mergedCoreRegistries = new MetricRegistry();
 
     for (String registryName : requestedRegistries) {
       MetricRegistry dropwizardRegistry = metricManager.registry(registryName);
+
+      // Merge all core registries into a single registry and
+      // append the core name to the metric to avoid duplicate metrics name
+      if (registryName.startsWith("solr.core")) {
+        mergedCoreRegistries.registerAll(
+            Arrays.stream(registryName.split("\\.")).skip(1).collect(Collectors.joining("_")),
+            dropwizardRegistry);
+        continue;
+      }
+
       PrometheusResponseWriter.toPrometheus(
           dropwizardRegistry,
           registryName,
@@ -203,6 +216,22 @@ private NamedList<Object> handlePrometheusExport(SolrParams params) {
             response.add(registryName, registry);
           });
     }
+
+    if (!mergedCoreRegistries.getMetrics().isEmpty()) {
+      PrometheusResponseWriter.toPrometheus(
+          mergedCoreRegistries,
+          "solr.core",
+          metricFilters,
+          mustMatchFilter,
+          propertyFilter,
+          false,
+          false,
+          true,
+          (registry) -> {
+            response.add("solr.core", registry);
+          });
+    }
+
     return response;
   }
 

solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java

@@ -33,5 +33,7 @@ enum CoreCategory {
     CORE
   }
 
-  Pattern CLOUD_CORE_PATTERN = Pattern.compile("^core_(.*)_(shard[0-9]+)_(replica_.[0-9]+)$");
+  Pattern CLOUD_CORE_PATTERN =
+      Pattern.compile("(^core_(.*)_(shard[0-9]+)_(replica_.[0-9]+)).(.*)$");
+  Pattern STANDALONE_CORE_PATTERN = Pattern.compile("^core_(.*?)\\.(.*)$");
 }

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java

@@ -24,9 +24,8 @@
 public class SolrCoreCacheMetric extends SolrCoreMetric {
   public static final String CORE_CACHE_SEARCHER_METRICS = "solr_metrics_core_cache";
 
-  public SolrCoreCacheMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreCacheMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
@@ -38,7 +37,7 @@ public SolrCoreCacheMetric(
   public SolrCoreMetric parseLabels() {
     String[] parsedMetric = metricName.split("\\.");
     if (dropwizardMetric instanceof Gauge) {
-      labels.put("cacheType", parsedMetric[2]);
+      labels.put("cacheType", parsedMetric[3]);
     }
     return this;
   }

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java

@@ -30,9 +30,8 @@ public class SolrCoreHandlerMetric extends SolrCoreMetric {
   public static final String CORE_REQUESTS_TOTAL_TIME = "solr_metrics_core_requests_time";
   public static final String CORE_REQUEST_TIMES = "solr_metrics_core_average_request_time";
 
-  public SolrCoreHandlerMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreHandlerMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
@@ -46,9 +45,9 @@ public SolrCoreHandlerMetric(
   @Override
   public SolrCoreMetric parseLabels() {
     String[] parsedMetric = metricName.split("\\.");
-    labels.put("category", parsedMetric[0]);
-    labels.put("handler", parsedMetric[1]);
-    labels.put("type", parsedMetric[2]);
+    labels.put("category", parsedMetric[1]);
+    labels.put("handler", parsedMetric[2]);
+    labels.put("type", parsedMetric[3]);
     return this;
   }
 

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java

@@ -24,9 +24,8 @@
 public class SolrCoreHighlighterMetric extends SolrCoreMetric {
   public static final String CORE_HIGHLIGHER_METRICS = "solr_metrics_core_highlighter_requests";
 
-  public SolrCoreHighlighterMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreHighlighterMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
@@ -38,8 +37,8 @@ public SolrCoreHighlighterMetric(
   @Override
   public SolrCoreMetric parseLabels() {
     String[] parsedMetric = metricName.split("\\.");
-    labels.put("type", parsedMetric[1]);
-    labels.put("item", parsedMetric[2]);
+    labels.put("type", parsedMetric[2]);
+    labels.put("item", parsedMetric[3]);
     return this;
   }
 

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java

@@ -24,9 +24,8 @@
 public class SolrCoreIndexMetric extends SolrCoreMetric {
   public static final String CORE_INDEX_METRICS = "solr_metrics_core_index_size_bytes";
 
-  public SolrCoreIndexMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreIndexMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java

@@ -17,6 +17,7 @@
 package org.apache.solr.metrics.prometheus.core;
 
 import static org.apache.solr.metrics.prometheus.core.PrometheusCoreFormatterInfo.CLOUD_CORE_PATTERN;
+import static org.apache.solr.metrics.prometheus.core.PrometheusCoreFormatterInfo.STANDALONE_CORE_PATTERN;
 
 import com.codahale.metrics.Metric;
 import java.util.regex.Matcher;
@@ -25,28 +26,26 @@
 
 /** Base class is a wrapper to export a solr.core {@link com.codahale.metrics.Metric} */
 public abstract class SolrCoreMetric extends SolrMetric {
+
   public String coreName;
 
-  public SolrCoreMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
+  public SolrCoreMetric(Metric dropwizardMetric, String metricName) {
     super(dropwizardMetric, metricName);
-    this.coreName = coreName;
-    labels.put("core", coreName);
-    if (cloudMode) {
-      appendCloudModeLabels();
-    }
-  }
-
-  private void appendCloudModeLabels() {
-    Matcher m = CLOUD_CORE_PATTERN.matcher(coreName);
-    if (m.find()) {
-      labels.put("collection", m.group(1));
-      labels.put("shard", m.group(2));
-      labels.put("replica", m.group(3));
+    Matcher cloudPattern = CLOUD_CORE_PATTERN.matcher(metricName);
+    Matcher standalonePattern = STANDALONE_CORE_PATTERN.matcher(metricName);
+    if (cloudPattern.find()) {
+      coreName = cloudPattern.group(1);
+      labels.put("core", cloudPattern.group(1));
+      labels.put("collection", cloudPattern.group(2));
+      labels.put("shard", cloudPattern.group(3));
+      labels.put("replica", cloudPattern.group(4));
+    } else if (standalonePattern.find()) {
+      coreName = standalonePattern.group(1);
+      labels.put("core", standalonePattern.group(1));
     } else {
       throw new SolrException(
           SolrException.ErrorCode.SERVER_ERROR,
-          "Core name does not match pattern for parsing " + coreName);
+          "Core name does not match pattern for parsing in metric " + metricName);
     }
   }
 }

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java

@@ -29,9 +29,8 @@ public class SolrCoreSearcherMetric extends SolrCoreMetric {
   public static final String CORE_SEARCHER_METRICS = "solr_metrics_core_searcher_documents";
   public static final String CORE_SEARCHER_TIMES = "solr_metrics_core_average_searcher_warmup_time";
 
-  public SolrCoreSearcherMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreSearcherMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
@@ -44,7 +43,7 @@ public SolrCoreSearcherMetric(
   public SolrCoreMetric parseLabels() {
     String[] parsedMetric = metricName.split("\\.");
     if (!(dropwizardMetric instanceof Counter)) {
-      labels.put("type", parsedMetric[2]);
+      labels.put("type", parsedMetric[3]);
     }
     return this;
   }

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java

@@ -24,9 +24,8 @@
 public class SolrCoreTlogMetric extends SolrCoreMetric {
   public static final String CORE_TLOG_METRICS = "solr_metrics_core_tlog";
 
-  public SolrCoreTlogMetric(
-      Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-    super(dropwizardMetric, coreName, metricName, cloudMode);
+  public SolrCoreTlogMetric(Metric dropwizardMetric, String metricName) {
+    super(dropwizardMetric, metricName);
   }
 
   /*
@@ -38,7 +37,7 @@ public SolrCoreTlogMetric(
   public SolrCoreMetric parseLabels() {
     String[] parsedMetric = metricName.split("\\.");
     if (dropwizardMetric instanceof Meter) {
-      labels.put("item", parsedMetric[1]);
+      labels.put("item", parsedMetric[2]);
     }
     return this;
   }

solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java

@@ -28,13 +28,9 @@
  */
 public class SolrPrometheusCoreFormatter extends SolrPrometheusFormatter
     implements PrometheusCoreFormatterInfo {
-  public final String coreName;
-  public final boolean cloudMode;
 
-  public SolrPrometheusCoreFormatter(String coreName, boolean cloudMode) {
+  public SolrPrometheusCoreFormatter() {
     super();
-    this.coreName = coreName;
-    this.cloudMode = cloudMode;
   }
 
   @Override
@@ -45,7 +41,7 @@ public void exportDropwizardMetric(Metric dropwizardMetric, String metricName) {
 
   @Override
   public SolrMetric categorizeMetric(Metric dropwizardMetric, String metricName) {
-    String metricCategory = metricName.split("\\.", 2)[0];
+    String metricCategory = metricName.split("\\.", 3)[1];
     if (!Enums.getIfPresent(PrometheusCoreFormatterInfo.CoreCategory.class, metricCategory)
         .isPresent()) {
       return new SolrNoOpMetric();
@@ -55,17 +51,17 @@ public SolrMetric categorizeMetric(Metric dropwizardMetric, String metricName) {
       case QUERY:
       case UPDATE:
       case REPLICATION:
-        return new SolrCoreHandlerMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreHandlerMetric(dropwizardMetric, metricName);
       case TLOG:
-        return new SolrCoreTlogMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreTlogMetric(dropwizardMetric, metricName);
       case CACHE:
-        return new SolrCoreCacheMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreCacheMetric(dropwizardMetric, metricName);
       case SEARCHER:
-        return new SolrCoreSearcherMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreSearcherMetric(dropwizardMetric, metricName);
       case HIGHLIGHTER:
-        return new SolrCoreHighlighterMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreHighlighterMetric(dropwizardMetric, metricName);
       case INDEX:
-        return new SolrCoreIndexMetric(dropwizardMetric, coreName, metricName, cloudMode);
+        return new SolrCoreIndexMetric(dropwizardMetric, metricName);
       case CORE:
       default:
         return new SolrNoOpMetric();

solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java

@@ -25,12 +25,10 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.metrics.AggregateMetric;
 import org.apache.solr.metrics.prometheus.SolrPrometheusFormatter;
@@ -124,21 +122,11 @@ public static void toPrometheus(
   }
 
   public static SolrPrometheusFormatter getFormatterType(String registryName) {
-    String coreName;
-    boolean cloudMode = false;
     String[] parsedRegistry = registryName.split("\\.");
 
     switch (parsedRegistry[1]) {
       case "core":
-        if (parsedRegistry.length == 3) {
-          coreName = parsedRegistry[2];
-        } else if (parsedRegistry.length == 5) {
-          coreName = Arrays.stream(parsedRegistry).skip(1).collect(Collectors.joining("_"));
-          cloudMode = true;
-        } else {
-          coreName = registryName;
-        }
-        return new SolrPrometheusCoreFormatter(coreName, cloudMode);
+        return new SolrPrometheusCoreFormatter();
       case "jvm":
         return new SolrPrometheusJvmFormatter();
       case "jetty":

solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java

@@ -725,8 +725,7 @@ public void testPrometheusMetricsCore() throws Exception {
     NamedList<?> values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList<?>) values.get("metrics");
-    SolrPrometheusFormatter formatter =
-        (SolrPrometheusFormatter) values.get("solr.core.collection1");
+    SolrPrometheusFormatter formatter = (SolrPrometheusFormatter) values.get("solr.core");
     assertNotNull(formatter);
     MetricSnapshots actualSnapshots = formatter.collect();
     assertNotNull(actualSnapshots);
@@ -1009,8 +1008,7 @@ public void testPrometheusMetricsFilter() throws Exception {
     NamedList<?> values = resp.getValues();
     assertNotNull(values.get("metrics"));
     values = (NamedList<?>) values.get("metrics");
-    SolrPrometheusFormatter formatter =
-        (SolrPrometheusFormatter) values.get("solr.core.collection1");
+    SolrPrometheusFormatter formatter = (SolrPrometheusFormatter) values.get("solr.core");
     assertNotNull(formatter);
     MetricSnapshots actualSnapshots = formatter.collect();
     assertNotNull(actualSnapshots);

solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java

@@ -27,11 +27,10 @@ public class SolrCoreMetricTest extends SolrTestCaseJ4 {
 
   @Test
   public void testStandaloneDefaultLabels() throws InterruptedException {
-    String expectedCoreName = "test_core";
-    String expectedMetricName = "test_core_metric";
+    String expectedCoreName = "test";
+    String expectedMetricName = "core_test.test_core_metric";
     Labels expectedLabels = Labels.of("core", expectedCoreName);
-    TestSolrCoreMetric testSolrCoreMetric =
-        new TestSolrCoreMetric(null, expectedCoreName, expectedMetricName, false);
+    TestSolrCoreMetric testSolrCoreMetric = new TestSolrCoreMetric(null, expectedMetricName);
 
     assertEquals(expectedCoreName, testSolrCoreMetric.coreName);
     assertEquals(expectedMetricName, testSolrCoreMetric.metricName);
@@ -41,7 +40,7 @@ public void testStandaloneDefaultLabels() throws InterruptedException {
   @Test
   public void testCloudDefaultLabels() throws InterruptedException {
     String expectedCoreName = "core_test_core_shard1_replica_n1";
-    String expectedMetricName = "test_core_metric";
+    String expectedMetricName = "core_test_core_shard1_replica_n1.test_core_metric";
     String expectedCollectionName = "test_core";
     String expectedShardName = "shard1";
     String expectedReplicaName = "replica_n1";
@@ -56,18 +55,16 @@ public void testCloudDefaultLabels() throws InterruptedException {
             expectedShardName,
             "replica",
             expectedReplicaName);
-    TestSolrCoreMetric testSolrCoreMetric =
-        new TestSolrCoreMetric(null, expectedCoreName, expectedMetricName, true);
+    TestSolrCoreMetric testSolrCoreMetric = new TestSolrCoreMetric(null, expectedMetricName);
 
     assertEquals(expectedCoreName, testSolrCoreMetric.coreName);
     assertEquals(expectedMetricName, testSolrCoreMetric.metricName);
     assertEquals(expectedLabels, testSolrCoreMetric.getLabels());
   }
 
   static class TestSolrCoreMetric extends SolrCoreMetric {
-    public TestSolrCoreMetric(
-        Metric dropwizardMetric, String coreName, String metricName, boolean cloudMode) {
-      super(dropwizardMetric, coreName, metricName, cloudMode);
+    public TestSolrCoreMetric(Metric dropwizardMetric, String metricName) {
+      super(dropwizardMetric, metricName);
     }
 
     @Override