format

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java

@@ -100,7 +100,6 @@ public ExporterOpenTelemetryProperties getExporterOpenTelemetryProperties() {
     return exporterOpenTelemetryProperties;
   }
 
-
   public static class Builder {
     private MetricsProperties defaultMetricsProperties;
     private Map<String, MetricsProperties> metricProperties = new HashMap<>();
@@ -161,7 +160,6 @@ public Builder exporterOpenTelemetryProperties(
       return this;
     }
 
-
     public PrometheusProperties build() {
       return new PrometheusProperties(
           defaultMetricsProperties,

prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/PushGatewayTest.java

@@ -8,15 +8,13 @@
 import io.prometheus.metrics.core.metrics.Gauge;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.snapshots.EscapingScheme;
-import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.InetAddress;
 import java.net.URL;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.SetSystemProperty;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.integration.ClientAndServer;
 

prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java

@@ -28,7 +28,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -476,8 +475,8 @@ public void testGaugeUTF8() throws IOException {
         """
         # HELP "gauge.name" gauge\\ndoc\\nstr"ing
         # TYPE "gauge.name" gauge
-        {"gauge.name","name*2"="val with \\\\backslash and \\"quotes\\"","name.1"="val with\\nnew line"} +Inf
-        {"gauge.name","name*2"="佖佥","name.1"="Björn"} 3.14E42
+        {"gauge.name","name.1"="Björn","name*2"="佖佥"} 3.14E42
+        {"gauge.name","name.1"="val with\\nnew line","name*2"="val with \\\\backslash and \\"quotes\\""} +Inf
         """;
     GaugeSnapshot gauge =
         GaugeSnapshot.builder()

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/CounterSnapshot.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /** Immutable snapshot of a Counter. */
 public class CounterSnapshot extends MetricSnapshot {
@@ -97,7 +98,7 @@ public Builder value(double value) {
         return this;
       }
 
-      public Builder exemplar(Exemplar exemplar) {
+      public Builder exemplar(@Nullable Exemplar exemplar) {
         this.exemplar = exemplar;
         return this;
       }

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java

@@ -1,7 +1,5 @@
 package io.prometheus.metrics.model.snapshots;
 
-import javax.annotation.Nullable;
-
 import static java.lang.Character.MAX_CODE_POINT;
 import static java.lang.Character.MAX_LOW_SURROGATE;
 import static java.lang.Character.MIN_HIGH_SURROGATE;
@@ -11,6 +9,7 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 
 /**
  * Utility for Prometheus Metric and Label naming.
@@ -449,13 +448,15 @@ private static DataPointSnapshot createEscapedDataPointSnapshot(
   private static Exemplars escapeExemplars(Exemplars exemplars, EscapingScheme scheme) {
     List<Exemplar> escapedExemplars = new ArrayList<>(exemplars.size());
     for (Exemplar exemplar : exemplars) {
-      Exemplar escaped = escapeExemplar(exemplar, scheme);
-      escapedExemplars.add(escaped);
+      escapedExemplars.add(escapeExemplar(exemplar, scheme));
     }
     return Exemplars.of(escapedExemplars);
   }
 
-  private static Exemplar escapeExemplar(Exemplar exemplar, EscapingScheme scheme) {
+  private static Exemplar escapeExemplar(@Nullable Exemplar exemplar, EscapingScheme scheme) {
+    if (exemplar == null) {
+      return null;
+    }
     return Exemplar.builder()
         .labels(escapeLabels(exemplar.getLabels(), scheme))
         .timestampMillis(exemplar.getTimestampMillis())

prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java

@@ -14,7 +14,6 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.util.stream.Stream;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;