remove unneeded code since moved validation

jaydeluca · jaydeluca · commit ae3c7df8a381 · 2025-12-10T15:36:29.000-05:00
Signed-off-by: Jay DeLuca &lt;jaydeluca4@gmail.com&gt;
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java
@@ -5,7 +5,6 @@
 import io.prometheus.metrics.core.datapoints.CounterDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -93,11 +92,6 @@ protected CounterSnapshot collect(List<Labels> labels, List<DataPoint> metricDat
     return new CounterSnapshot(getMetadata(), data);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.COUNTER;
-  }
-
   @Override
   protected DataPoint newDataPoint() {
     if (exemplarSamplerConfig != null) {
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java
@@ -5,7 +5,6 @@
 import io.prometheus.metrics.core.datapoints.GaugeDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -95,11 +94,6 @@ protected GaugeSnapshot collect(List<Labels> labels, List<DataPoint> metricData)
     return new GaugeSnapshot(getMetadata(), dataPointSnapshots);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.GAUGE;
-  }
-
   @Override
   protected DataPoint newDataPoint() {
     if (exemplarSamplerConfig != null) {
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java
@@ -7,7 +7,6 @@
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
 import io.prometheus.metrics.core.util.Scheduler;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
@@ -650,11 +649,6 @@ protected HistogramSnapshot collect(List<Labels> labels, List<DataPoint> metricD
     return new HistogramSnapshot(getMetadata(), data);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.HISTOGRAM;
-  }
-
   @Override
   protected DataPoint newDataPoint() {
     return new DataPoint();
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java
@@ -1,7 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
 import io.prometheus.metrics.config.PrometheusProperties;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.InfoSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
@@ -106,11 +105,6 @@ public InfoSnapshot collect() {
     return new InfoSnapshot(getMetadata(), data);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.INFO;
-  }
-
   public static Builder builder() {
     return new Builder(PrometheusProperties.get());
   }
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java
@@ -4,7 +4,6 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.StateSetDataPoint;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
 import java.util.ArrayList;
@@ -85,11 +84,6 @@ protected StateSetSnapshot collect(List<Labels> labels, List<DataPoint> metricDa
     return new StateSetSnapshot(getMetadata(), data);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.STATESET;
-  }
-
   @Override
   public void setTrue(String state) {
     getNoLabels().setTrue(state);
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java
@@ -7,7 +7,6 @@
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
-import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Quantile;
@@ -119,11 +118,6 @@ protected SummarySnapshot collect(List<Labels> labels, List<DataPoint> metricDat
     return new SummarySnapshot(getMetadata(), data);
   }
 
-  @Override
-  public MetricType getMetricType() {
-    return MetricType.SUMMARY;
-  }
-
   @Override
   protected DataPoint newDataPoint() {
     return new DataPoint();
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java
@@ -78,21 +78,4 @@ default MetricSnapshot collect(
   default String getPrometheusName() {
     return null;
   }
-
-  /**
-   * Returns the type of metric this collector produces.
-   *
-   * <p>This is used during registration to validate that all collectors with the same Prometheus
-   * name have the same metric type. If two collectors return the same non-null Prometheus name but
-   * different metric types, registration will fail with an exception.
-   *
-   * <p>Returning {@code null} means the type is unknown, and type validation will be skipped for
-   * this collector.
-   *
-   * <p>All metrics in {@code prometheus-metrics-core} override this to return their specific type.
-   *
-   * @return the metric type, or {@code null} if unknown
-   */
-  @Nullable
-  MetricType getMetricType();
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricIdentifier.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricIdentifier.java
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nullable;
 
 /** Like {@link Collector}, but collecting multiple Snapshots at once. */
+@FunctionalInterface
 public interface MultiCollector {
 
   /** Called when the Prometheus server scrapes metrics. */
@@ -69,21 +70,4 @@ default MetricSnapshots collect(
   default List<String> getPrometheusNames() {
     return Collections.emptyList();
   }
-
-  /**
-   * Returns the metric type for a given Prometheus name produced by this MultiCollector.
-   *
-   * <p>This is used during registration to validate that all collectors with the same Prometheus
-   * name have the same metric type. If this method returns {@code null} for a given name, type
-   * validation will be skipped for that metric.
-   *
-   * <p>If your collector returns metrics with constant types that do not change at runtime, it is a
-   * good idea to override this method to enable early type validation at registration time instead
-   * of at scrape time.
-   *
-   * @param prometheusName the Prometheus name to get the type for
-   * @return the metric type, or {@code null} if unknown
-   */
-  @Nullable
-  MetricType getMetricType(String prometheusName);
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java
@@ -3,10 +3,8 @@
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 public class PrometheusRegistry {
@@ -15,118 +13,17 @@ public class PrometheusRegistry {
 
   private final List<Collector> collectors = new CopyOnWriteArrayList<>();
   private final List<MultiCollector> multiCollectors = new CopyOnWriteArrayList<>();
-  private final ConcurrentHashMap<String, MetricIdentifier> registeredMetrics =
-      new ConcurrentHashMap<>();
 
   public void register(Collector collector) {
-    validateTypeConsistency(collector);
     collectors.add(collector);
-    cacheMetricIdentifier(collector);
   }
 
   public void register(MultiCollector collector) {
-    validateTypeConsistency(collector);
     multiCollectors.add(collector);
-    cacheMetricIdentifier(collector);
-  }
-
-  /**
-   * Validates that the new collector's type is consistent with any existing collectors that have
-   * the same Prometheus name.
-   */
-  private void validateTypeConsistency(Collector newCollector) {
-    String newName = newCollector.getPrometheusName();
-    MetricType newType = newCollector.getMetricType();
-
-    if (newName == null) {
-      return;
-    }
-
-    // Validate type consistency if type is provided
-    if (newType != null) {
-      MetricIdentifier newIdentifier = new MetricIdentifier(newName, newType);
-      MetricIdentifier existing = registeredMetrics.get(newName);
-      if (existing != null && !newIdentifier.isCompatibleWith(existing)) {
-        throw new IllegalArgumentException(
-            "Collector with Prometheus name '"
-                + newName
-                + "' is already registered with type "
-                + existing.getType()
-                + ", but you are trying to register a new collector with type "
-                + newType
-                + ". All collectors with the same Prometheus name must have the same type.");
-      }
-    }
-  }
-
-  /**
-   * Validates type consistency for MultiCollector.
-   *
-   * <p>Validates each Prometheus name returned by the MultiCollector. If the MultiCollector
-   * provides type information via {@link MultiCollector#getMetricType(String)}, validation happens
-   * at registration time.
-   */
-  private void validateTypeConsistency(MultiCollector newCollector) {
-    List<String> names = newCollector.getPrometheusNames();
-
-    for (String name : names) {
-      MetricType type = newCollector.getMetricType(name);
-
-      if (type == null) {
-        continue;
-      }
-
-      MetricIdentifier newIdentifier = new MetricIdentifier(name, type);
-
-      MetricIdentifier existing = registeredMetrics.get(name);
-      if (existing != null && !newIdentifier.isCompatibleWith(existing)) {
-        throw new IllegalArgumentException(
-            "MultiCollector contains a metric with Prometheus name '"
-                + name
-                + "' and type "
-                + type
-                + ", but a collector with the same name and type "
-                + existing.getType()
-                + " is already registered. All collectors with the same Prometheus name must have"
-                + " the same type.");
-      }
-
-      registeredMetrics.putIfAbsent(name, newIdentifier);
-    }
-  }
-
-
-  /**
-   * Caches the metric identifier for lookup during future registrations.
-   *
-   * <p>Only caches if the collector provides both a Prometheus name and type.
-   */
-  private void cacheMetricIdentifier(Collector collector) {
-    String name = collector.getPrometheusName();
-    MetricType type = collector.getMetricType();
-
-    if (name != null && type != null) {
-      registeredMetrics.putIfAbsent(name, new MetricIdentifier(name, type));
-    }
-  }
-
-  /**
-   * Caches the metric identifier for lookup during future registrations.
-   */
-  private void cacheMetricIdentifier(MultiCollector collector) {
-    for (String name : collector.getPrometheusNames()) {
-      MetricType type = collector.getMetricType(name);
-
-      if (name != null) {
-        registeredMetrics.putIfAbsent(name, new MetricIdentifier(name, type));
-      }
-    }
   }
 
   public void unregister(Collector collector) {
     collectors.remove(collector);
-    // Note: We don't remove from cache because another collector with the same name might exist
-    // The cache will be cleaned up when clear() is called
   }
 
   public void unregister(MultiCollector collector) {
@@ -136,7 +33,6 @@ public void unregister(MultiCollector collector) {
   public void clear() {
     collectors.clear();
     multiCollectors.clear();
-    registeredMetrics.clear();
   }
 
   public MetricSnapshots scrape() {
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java
