fix test

Author: jaydeluca

integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml

@@ -56,3 +56,4 @@
   </build>
 </project>
 
+

integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/src/main/java/io/prometheus/metrics/it/exporter/duplicatemetrics/DuplicateMetricsSample.java

@@ -91,4 +91,3 @@ private static int parsePortOrExit(String port) {
     return 0; // this won't happen
   }
 }
-

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/DuplicateMetricsIT.java

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.Metrics;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
@@ -98,7 +98,7 @@ void testDuplicateMetricsInOpenMetricsTextFormat() throws IOException {
 
   @Test
   void testDuplicateMetricsInPrometheusProtobufFormat() throws IOException {
-    start();2
+    start();
     Response response =
         scrape(
             "GET",
@@ -196,4 +196,3 @@ private String nameParam() {
     return "name[]=" + "http_requests_total";
   }
 }
-

prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java

@@ -6,6 +6,7 @@
 import com.google.protobuf.TextFormat;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
+import io.prometheus.metrics.expositionformats.TextFormatUtil;
 import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.Metrics;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesProtobufTest.java

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.metrics.config.EscapingScheme;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_2.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.model.registry.Collector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java

@@ -1,28 +1,22 @@
 package io.prometheus.metrics.model.registry;
 
 /**
- * Represents the type of a Prometheus metric.
+ * Represents the type of Prometheus metric.
  *
  * <p>This enum is used for early validation when registering collectors with duplicate Prometheus
  * names. All collectors with the same Prometheus name must have the same metric type.
  */
 public enum MetricType {
-  /** Counter metric type - monotonically increasing value. */
   COUNTER,
 
-  /** Gauge metric type - value that can go up or down. */
   GAUGE,
 
-  /** Histogram metric type - samples observations and counts them in buckets. */
   HISTOGRAM,
 
-  /** Summary metric type - samples observations and calculates quantiles. */
   SUMMARY,
 
-  /** Info metric type - key-value pairs providing information about the entity. */
   INFO,
 
-  /** StateSet metric type - represents a set of boolean states. */
   STATESET,
 
   /** Unknown metric type - for custom or legacy collectors. */

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java

@@ -76,14 +76,21 @@ default List<String> getPrometheusNames() {
    *
    * <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.
+   * validation at registration time will be skipped for that metric. Note that type validation will
+   * still occur at scrape time when metrics are collected, but returning {@code null} means errors
+   * won't be detected until then.
    *
-   * <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.
+   * <p>The default implementation returns {@code null}, which defers all type validation to scrape
+   * time.
+   *
+   * <p>If your collector returns metrics with constant types that do not change at runtime, it is
+   * recommended to override this method to enable early type validation at registration time
+   * instead of at scrape time. This provides faster feedback when incompatible metrics are
+   * registered.
    *
    * @param prometheusName the Prometheus name to get the type for
-   * @return the metric type, or {@code null} if unknown
+   * @return the metric type, or {@code null} if unknown or if validation should be deferred to
+   *     scrape time
    */
   @Nullable
   default MetricType getMetricType(String prometheusName) {

prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java

@@ -307,7 +307,7 @@ public MetricSnapshot collect() {
                 .dataPoint(
                     CounterSnapshot.CounterDataPointSnapshot.builder()
                         .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
-                        .value(50) // Different value!
+                        .value(50) // different value
                         .build())
                 .build();
           }