Refactor function placements

mlbiscoc · Apr 16, 2024 · 771d823 · 771d823
1 parent b04bd14
commit 771d823
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 37 deletions.
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
@@ -126,11 +126,9 @@ private void handleRequest(SolrParams params, BiConsumer<String, Object> consume
       consumer.accept("error", "metrics collection is disabled");
       return;
     }
-    boolean compact = params.getBool(COMPACT_PARAM, true);
 
-    Set<String> requestedRegistries = parseRegistries(params);
     if (PROMETHEUS_METRICS_WT.equals(params.get(CommonParams.WT))) {
-      response = handlePrometheusRegistry(params, requestedRegistries);
+      response = handlePrometheusRegistry(params);
       consumer.accept("metrics", response);
       return;
     }
@@ -145,20 +143,19 @@ private void handleRequest(SolrParams params, BiConsumer<String, Object> consume
       return;
     }
 
-    response = handleDropwizardRegistry(params, requestedRegistries);
+    response = handleDropwizardRegistry(params);
 
     consumer.accept("metrics", response);
   }
 
-  private NamedList<Object> handleDropwizardRegistry(
-      SolrParams params, Set<String> requestedRegistries) {
+  private NamedList<Object> handleDropwizardRegistry(SolrParams params) {
     boolean compact = params.getBool(COMPACT_PARAM, true);
     MetricFilter mustMatchFilter = parseMustMatchFilter(params);
     Predicate<CharSequence> propertyFilter = parsePropertyFilter(params);
     List<MetricType> metricTypes = parseMetricTypes(params);
     List<MetricFilter> metricFilters =
         metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
-    metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
+    Set<String> requestedRegistries = parseRegistries(params);
 
     NamedList<Object> response = new SimpleOrderedMap<>();
     for (String registryName : requestedRegistries) {
@@ -182,18 +179,18 @@ private NamedList<Object> handleDropwizardRegistry(
     return response;
   }
 
-  private NamedList<Object> handlePrometheusRegistry(
-      SolrParams params, Set<String> requestedRegistries) {
+  private NamedList<Object> handlePrometheusRegistry(SolrParams params) {
     NamedList<Object> response = new SimpleOrderedMap<>();
     boolean compact = params.getBool(COMPACT_PARAM, true);
     MetricFilter mustMatchFilter = parseMustMatchFilter(params);
     Predicate<CharSequence> propertyFilter = parsePropertyFilter(params);
     List<MetricType> metricTypes = parseMetricTypes(params);
     List<MetricFilter> metricFilters =
         metricTypes.stream().map(MetricType::asMetricFilter).collect(Collectors.toList());
+    Set<String> requestedRegistries = parseRegistries(params);
+
     for (String registryName : requestedRegistries) {
       MetricRegistry dropWizardRegistry = metricManager.registry(registryName);
-
       // Currently only export Solr Core registries
       if (registryName.startsWith("solr.core")) {
         MetricUtils.toPrometheusRegistry(

diff --git a/solr/core/src/java/org/apache/solr/metrics/prometheus/SolrPrometheusRegistry.java b/solr/core/src/java/org/apache/solr/metrics/prometheus/SolrPrometheusRegistry.java
@@ -38,32 +38,6 @@ public Map<String, Gauge> copyOfGauges() {
     return ImmutableMap.copyOf(metricGauges);
   }
 
-  private Counter getMetricCounter(String metricName) {
-    return metricCounters.get(metricName);
-  }
-
-  private Gauge getMetricGauge(String metricName) {
-    return metricGauges.get(metricName);
-  }
-
-  private void registerCounter(String metricName, String... labelNames) {
-    Counter counter =
-        io.prometheus.metrics.core.metrics.Counter.builder()
-            .name(metricName)
-            .labelNames(labelNames)
-            .register(prometheusRegistry);
-    metricCounters.put(metricName, counter);
-  }
-
-  private void registerGauge(String metricName, String... labelNames) {
-    Gauge gauge =
-        io.prometheus.metrics.core.metrics.Gauge.builder()
-            .name(metricName)
-            .labelNames(labelNames)
-            .register(prometheusRegistry);
-    metricGauges.put(metricName, gauge);
-  }
-
   public void exportMeter(
       Meter dropwizardMetric, String prometheusMetricName, Map<String, String> labelsMap) {
     if (!copyOfCounters().containsKey(prometheusMetricName)) {
@@ -76,7 +50,7 @@ public void exportMeter(
         .inc(dropwizardMetric.getCount());
   }
 
-  protected void exportCounter(
+  public void exportCounter(
       com.codahale.metrics.Counter dropwizardMetric,
       String prometheusMetricName,
       Map<String, String> labelsMap) {
@@ -134,4 +108,30 @@ public void exportGauge(
       }
     }
   }
+
+  private Counter getMetricCounter(String metricName) {
+    return metricCounters.get(metricName);
+  }
+
+  private Gauge getMetricGauge(String metricName) {
+    return metricGauges.get(metricName);
+  }
+
+  private void registerCounter(String metricName, String... labelNames) {
+    Counter counter =
+        io.prometheus.metrics.core.metrics.Counter.builder()
+            .name(metricName)
+            .labelNames(labelNames)
+            .register(prometheusRegistry);
+    metricCounters.put(metricName, counter);
+  }
+
+  private void registerGauge(String metricName, String... labelNames) {
+    Gauge gauge =
+        io.prometheus.metrics.core.metrics.Gauge.builder()
+            .name(metricName)
+            .labelNames(labelNames)
+            .register(prometheusRegistry);
+    metricGauges.put(metricName, gauge);
+  }
 }