add checkstyle

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

Author: zeitlinger

examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/GreetingServlet.java

@@ -1,16 +1,15 @@
 package io.prometheus.metrics.examples.otel.exemplars.greeting;
 
+import static io.prometheus.metrics.model.snapshots.Unit.nanosToSeconds;
+
 import io.prometheus.metrics.core.metrics.Histogram;
 import io.prometheus.metrics.model.snapshots.Unit;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.util.Random;
 
-import static io.prometheus.metrics.model.snapshots.Unit.nanosToSeconds;
-
 /** Hello World REST servlet, with an example counter and an example histogram. */
 public class GreetingServlet extends HttpServlet {
 

integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java

@@ -7,14 +7,13 @@
 import io.prometheus.metrics.model.registry.Collector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.snapshots.Unit;
-import org.apache.catalina.Context;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.startup.Tomcat;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.Tomcat;
 
 /** Sample application using the {@link PrometheusMetricsServlet} in Tomcat. */
 public class ExporterServletTomcatSample {

prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java

@@ -196,8 +196,7 @@ MetricSnapshot fromMeter(String dropwizardName, Meter meter) {
   @Override
   public MetricSnapshots collect() {
     MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
-    for (@SuppressWarnings("rawtypes")
-    Map.Entry<MetricName, Gauge> entry : registry.getGauges(metricFilter).entrySet()) {
+    for (Map.Entry<MetricName, Gauge> entry : registry.getGauges(metricFilter).entrySet()) {
       Optional.ofNullable(fromGauge(entry.getKey().getKey(), entry.getValue()))
           .ifPresent(metricSnapshots::metricSnapshot);
     }

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

@@ -34,8 +34,12 @@ public String toString() {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
     Label label = (Label) o;
     return Objects.equals(name, label.name) && Objects.equals(value, label.value);
   }

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

@@ -70,19 +70,6 @@ public static Labels of(String... keyValuePairs) {
   }
 
   // package private for testing
-  static String[] makePrometheusNames(String[] names) {
-    String[] prometheusNames = names;
-    for (int i = 0; i < names.length; i++) {
-      if (names[i].contains(".")) {
-        if (prometheusNames == names) {
-          prometheusNames = Arrays.copyOf(names, names.length);
-        }
-        prometheusNames[i] = PrometheusNaming.prometheusName(names[i]);
-      }
-    }
-    return prometheusNames;
-  }
-
   /**
    * Create a new Labels instance. You can either create Labels with one of the static {@code
    * Labels.of(...)} methods, or you can use the {@link Labels#builder()}.
@@ -129,6 +116,19 @@ public static Labels of(String[] names, String[] values) {
     return new Labels(namesCopy, prometheusNames, valuesCopy);
   }
 
+  static String[] makePrometheusNames(String[] names) {
+    String[] prometheusNames = names;
+    for (int i = 0; i < names.length; i++) {
+      if (names[i].contains(".")) {
+        if (prometheusNames == names) {
+          prometheusNames = Arrays.copyOf(names, names.length);
+        }
+        prometheusNames[i] = PrometheusNaming.prometheusName(names[i]);
+      }
+    }
+    return prometheusNames;
+  }
+
   /**
    * Test if these labels contain a specific label name.
    *
@@ -286,14 +286,6 @@ public Labels merge(Labels other) {
     return new Labels(names, prometheusNames, values);
   }
 
-  /**
-   * Create a new Labels instance containing the labels of this and the label passed as name and
-   * value. The label name must not already be contained in this Labels instance.
-   */
-  public Labels add(String name, String value) {
-    return merge(Labels.of(name, value));
-  }
-
   /**
    * Create a new Labels instance containing the labels of this and the labels passed as names and
    * values. The new label names must not already be contained in this Labels instance.
@@ -313,6 +305,14 @@ public Labels merge(String[] names, String[] values) {
     return new Labels(mergedNames, prometheusNames, mergedValues);
   }
 
+  /**
+   * Create a new Labels instance containing the labels of this and the label passed as name and
+   * value. The label name must not already be contained in this Labels instance.
+   */
+  public Labels add(String name, String value) {
+    return merge(Labels.of(name, value));
+  }
+
   public boolean hasSameNames(Labels other) {
     return Arrays.equals(prometheusNames, other.prometheusNames);
   }
@@ -400,8 +400,12 @@ private void appendEscapedLabelValue(StringBuilder b, String value) {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
     Labels labels = (Labels) o;
     return labels.hasSameNames(this) && labels.hasSameValues(this);
   }

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

@@ -108,7 +108,8 @@ private void validate() {
         throw new IllegalArgumentException(
             "'"
                 + name
-                + "': Illegal metric name. If the unit is non-null, the name must end with the unit: _"
+                + "': Illegal metric name. If the unit is non-null, "
+                + "the name must end with the unit: _"
                 + unit
                 + "."
                 + " Call "

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

@@ -1,6 +1,11 @@
 package io.prometheus.metrics.model.snapshots;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
 
 /** Immutable list of quantiles. */
 public class Quantiles implements Iterable<Quantile> {

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

@@ -61,8 +61,12 @@ public static double kiloBytesToBytes(double kilobytes) {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
     Unit unit = (Unit) o;
     return Objects.equals(name, unit.name);
   }

prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/src/main/java/io/prometheus/metrics/tracer/initializer/SpanContextSupplier.java

@@ -1,8 +1,8 @@
 package io.prometheus.metrics.tracer.initializer;
 
+import io.prometheus.metrics.tracer.agent.OpenTelemetryAgentSpanContext;
 import io.prometheus.metrics.tracer.common.SpanContext;
 import io.prometheus.metrics.tracer.otel.OpenTelemetrySpanContext;
-import io.prometheus.metrics.tracer.otel_agent.OpenTelemetryAgentSpanContext;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class SpanContextSupplier {

…agent/OpenTelemetryAgentSpanContext.java …agent/OpenTelemetryAgentSpanContext.javaprometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/src/main/java/io/prometheus/metrics/tracer/otel_agent/OpenTelemetryAgentSpanContext.java renamed to prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/src/main/java/io/prometheus/metrics/tracer/agent/OpenTelemetryAgentSpanContext.java prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/src/main/java/io/prometheus/metrics/tracer/otel_agent/OpenTelemetryAgentSpanContext.java renamed to prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/src/main/java/io/prometheus/metrics/tracer/agent/OpenTelemetryAgentSpanContext.java

@@ -1,4 +1,4 @@
-package io.prometheus.metrics.tracer.otel_agent;
+package io.prometheus.metrics.tracer.agent;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanId;