Replace category-based filtering with regex-based metric filtering

Replace the fixed category enum approach with a flexible regex-based
metric filter. Users can now specify include/exclude patterns via
metric-filter.includes and metric-filter.excludes properties to
freely configure which metrics are exported.

Signed-off-by: Jiwon Park <jpark92@outlook.kr>

Author: j1wonpark

amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricCategory.java

@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.amoro.metrics.promethues;
+
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/** Regex-based metric filter for Prometheus exporter. */
+public class MetricFilter {
+
+  public static final String INCLUDES_KEY = "metric-filter.includes";
+  public static final String EXCLUDES_KEY = "metric-filter.excludes";
+
+  public static final MetricFilter ACCEPT_ALL = new MetricFilter(null, null);
+
+  private final Pattern includePattern;
+  private final Pattern excludePattern;
+
+  public MetricFilter(Pattern includePattern, Pattern excludePattern) {
+    this.includePattern = includePattern;
+    this.excludePattern = excludePattern;
+  }
+
+  /** Parse metric filter from reporter properties. */
+  public static MetricFilter fromProperties(Map<String, String> properties) {
+    String includes = properties.get(INCLUDES_KEY);
+    String excludes = properties.get(EXCLUDES_KEY);
+
+    if (includes == null && excludes == null) {
+      return ACCEPT_ALL;
+    }
+
+    Pattern includePattern = includes != null ? Pattern.compile(includes) : null;
+    Pattern excludePattern = excludes != null ? Pattern.compile(excludes) : null;
+    return new MetricFilter(includePattern, excludePattern);
+  }
+
+  /** Check if a metric name passes the filter. */
+  public boolean matches(String metricName) {
+    if (includePattern != null && !includePattern.matcher(metricName).matches()) {
+      return false;
+    }
+    if (excludePattern != null && excludePattern.matcher(metricName).matches()) {
+      return false;
+    }
+    return true;
+  }
+}

amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricFilter.java

@@ -30,10 +30,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -45,16 +43,15 @@ public class MetricsCollector extends Collector {
   private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z_:][a-zA-Z0-9_:]*");
   private static final Pattern LABEL_PATTERN = Pattern.compile("[a-zA-Z_][a-zA-Z0-9_]*");
   MetricSet metrics;
-  private final Set<MetricCategory> disabledCategories;
+  private final MetricFilter metricFilter;
 
   public MetricsCollector(MetricSet metrics) {
-    this(metrics, Collections.emptySet());
+    this(metrics, MetricFilter.ACCEPT_ALL);
   }
 
-  public MetricsCollector(MetricSet metrics, Set<MetricCategory> disabledCategories) {
+  public MetricsCollector(MetricSet metrics, MetricFilter metricFilter) {
     this.metrics = metrics;
-    this.disabledCategories =
-        disabledCategories != null ? disabledCategories : Collections.emptySet();
+    this.metricFilter = metricFilter != null ? metricFilter : MetricFilter.ACCEPT_ALL;
   }
 
   @Override
@@ -88,11 +85,8 @@ private boolean isValidMetric(MetricDefine define) {
       return false;
     }
 
-    if (!disabledCategories.isEmpty()) {
-      MetricCategory category = MetricCategory.findCategory(define.getName());
-      if (category != null && disabledCategories.contains(category)) {
-        return false;
-      }
+    if (!metricFilter.matches(define.getName())) {
+      return false;
     }
 
     return true;

amoro-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java

@@ -23,18 +23,16 @@
 import org.apache.amoro.metrics.MetricSet;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 /** Prometheus exporter */
 public class PrometheusMetricsReporter implements MetricReporter {
 
   public static final String PORT = "port";
 
   private HTTPServer server;
-  private Set<MetricCategory> disabledCategories = Collections.emptySet();
+  private MetricFilter metricFilter = MetricFilter.ACCEPT_ALL;
 
   @Override
   public void open(Map<String, String> properties) {
@@ -43,7 +41,7 @@ public void open(Map<String, String> properties) {
             .map(Integer::valueOf)
             .orElseThrow(() -> new IllegalArgumentException("Lack required property: " + PORT));
 
-    this.disabledCategories = MetricCategory.parseDisabledCategories(properties);
+    this.metricFilter = MetricFilter.fromProperties(properties);
 
     try {
       this.server = new HTTPServer(port);
@@ -64,7 +62,7 @@ public String name() {
 
   @Override
   public void setGlobalMetricSet(MetricSet globalMetricSet) {
-    MetricsCollector collector = new MetricsCollector(globalMetricSet, disabledCategories);
+    MetricsCollector collector = new MetricsCollector(globalMetricSet, metricFilter);
     collector.register();
   }
 }