Refactor Builders to use Spring/Lombok conventions

Signed-off-by: Fabian Stäber <[email protected]>

Author: fstab

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

@@ -21,11 +21,11 @@ public class GreetingServlet extends HttpServlet {
     private final Histogram histogram;
 
     public GreetingServlet() {
-        histogram = Histogram.newBuilder()
-            .withName("request_duration_seconds")
-            .withHelp("request duration in seconds")
-            .withUnit(Unit.SECONDS)
-            .withLabelNames("http_status")
+        histogram = Histogram.builder()
+            .name("request_duration_seconds")
+            .help("request duration in seconds")
+            .unit(Unit.SECONDS)
+            .labelNames("http_status")
             .register();
         histogram.initLabelValues("200");
     }
@@ -41,7 +41,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         } finally {
-            histogram.withLabelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
+            histogram.labelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
         }
     }
 }

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

@@ -15,7 +15,7 @@ public class Main {
 
     public static void main(String[] args) throws LifecycleException {
 
-        JvmMetrics.newBuilder().register();
+        JvmMetrics.builder().register();
 
         Tomcat tomcat = new Tomcat();
         tomcat.setPort(8081);

examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel_exemplars/app/HelloWorldServlet.java

@@ -28,11 +28,11 @@ public class HelloWorldServlet extends HttpServlet {
     private final Histogram histogram;
 
     public HelloWorldServlet() {
-        histogram = Histogram.newBuilder()
-                .withName("request_duration_seconds")
-                .withHelp("request duration in seconds")
-                .withUnit(Unit.SECONDS)
-                .withLabelNames("http_status")
+        histogram = Histogram.builder()
+                .name("request_duration_seconds")
+                .help("request duration in seconds")
+                .unit(Unit.SECONDS)
+                .labelNames("http_status")
                 .register();
         histogram.initLabelValues("200");
     }
@@ -49,7 +49,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         } catch (Exception e) {
             throw new ServletException(e);
         } finally {
-            histogram.withLabelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
+            histogram.labelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
         }
     }
 

examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel_exemplars/app/Main.java

@@ -15,7 +15,7 @@ public class Main {
 
     public static void main(String[] args) throws LifecycleException {
 
-        JvmMetrics.newBuilder().register();
+        JvmMetrics.builder().register();
 
         Tomcat tomcat = new Tomcat();
         tomcat.setPort(8080);

examples/example-exporter-httpserver/src/main/java/io/prometheus/metrics/examples/httpserver/Main.java

@@ -14,22 +14,22 @@ public class Main {
 
     public static void main(String[] args) throws IOException, InterruptedException {
 
-        JvmMetrics.newBuilder().register();
+        JvmMetrics.builder().register();
 
         // Note: uptime_seconds_total is not a great example:
         // The built-in JvmMetrics have an out-of-the-box metric named process_start_time_seconds
         // with the start timestamp in seconds, so if you want to know the uptime you can simply
         // run the Prometheus query
         //     time() - process_start_time_seconds
         // rather than creating a custom uptime metric.
-        Counter counter = Counter.newBuilder()
-                .withName("uptime_seconds_total")
-                .withHelp("total number of seconds since this application was started")
-                .withUnit(Unit.SECONDS)
+        Counter counter = Counter.builder()
+                .name("uptime_seconds_total")
+                .help("total number of seconds since this application was started")
+                .unit(Unit.SECONDS)
                 .register();
 
-        HTTPServer server = HTTPServer.newBuilder()
-                .withPort(9400)
+        HTTPServer server = HTTPServer.builder()
+                .port(9400)
                 .buildAndStart();
 
         System.out.println("HTTPServer listening on port http://localhost:" + server.getPort() + "/metrics");

examples/example-exporter-opentelemetry/src/main/java/io/prometheus/metrics/examples/opentelemetry/Main.java

@@ -15,22 +15,22 @@ public static void main(String[] args) throws Exception {
         // Note: Some JVM metrics are also defined as OpenTelemetry's semantic conventions.
         // We have plans to implement a configuration option for JvmMetrics to use OpenTelemetry
         // naming conventions rather than the Prometheus names.
-        JvmMetrics.newBuilder().register();
+        JvmMetrics.builder().register();
 
         // Note: uptime_seconds_total is not a great example:
         // The built-in JvmMetrics have an out-of-the-box metric named process_start_time_seconds
         // with the start timestamp in seconds, so if you want to know the uptime you can simply
         // run the Prometheus query
         //     time() - process_start_time_seconds
         // rather than creating a custom uptime metric.
-        Counter counter = Counter.newBuilder()
-                .withName("uptime_seconds_total")
-                .withHelp("total number of seconds since this application was started")
-                .withUnit(Unit.SECONDS)
+        Counter counter = Counter.builder()
+                .name("uptime_seconds_total")
+                .help("total number of seconds since this application was started")
+                .unit(Unit.SECONDS)
                 .register();
 
-        OpenTelemetryExporter.newBuilder()
-                .withIntervalSeconds(5)
+        OpenTelemetryExporter.builder()
+                .intervalSeconds(5)
                 .buildAndStart();
 
         while (true) {

examples/example-exporter-opentelemetry/src/main/java/io/prometheus/metrics/examples/opentelemetry/ManualCompleteMetricsTest.java

@@ -42,8 +42,8 @@ public static void main(String[] args) throws Exception {
                 .withLabelNames("location")
                 .register();
 
-        gauge.withLabelValues("inside").set(23.4);
-        gauge.withLabelValues("outside").set(9.3);
+        gauge.labelValues("inside").set(23.4);
+        gauge.labelValues("outside").set(9.3);
 
         // By default, the histogram will be exported as an exponential histogram in OpenTelemetry.
         Histogram histogram = Histogram.newBuilder()
@@ -55,7 +55,7 @@ public static void main(String[] args) throws Exception {
 
         Random random = new Random(0);
         for (int i = 0; i < 1000; i++) {
-            histogram.withLabelValues("200").observe(random.nextGaussian());
+            histogram.labelValues("200").observe(random.nextGaussian());
         }
 
         // Explicitly use a classic-only histogram to have an example of a classic histogram in OpenTelemetry
@@ -69,7 +69,7 @@ public static void main(String[] args) throws Exception {
                 .register();
 
         for (int i = 0; i < 15; i++) {
-            classicHistogram.withLabelValues("200").observe(random.nextInt(3000));
+            classicHistogram.labelValues("200").observe(random.nextInt(3000));
         }
 
         Summary summary = Summary.newBuilder()
@@ -116,8 +116,8 @@ public static void main(String[] args) throws Exception {
                 .withStates("feature1", "feature2")
                 .register();
 
-        stateSet.withLabelValues("dev").setFalse("feature1");
-        stateSet.withLabelValues("dev").setTrue("feature2");
+        stateSet.labelValues("dev").setFalse("feature1");
+        stateSet.labelValues("dev").setTrue("feature2");
 
         PrometheusRegistry.defaultRegistry.register(() -> UnknownSnapshot.newBuilder()
                 .withName("my_unknown_metric")

examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/HelloWorldServlet.java

@@ -21,17 +21,17 @@ public class HelloWorldServlet extends HttpServlet {
 
     // Note: The requests_total counter is not a great example, because the
     // request_duration_seconds histogram below also has a count with the number of requests.
-    private final Counter counter = Counter.newBuilder()
-            .withName("requests_total")
-            .withHelp("total number of requests")
-            .withLabelNames("http_status")
+    private final Counter counter = Counter.builder()
+            .name("requests_total")
+            .help("total number of requests")
+            .labelNames("http_status")
             .register();
 
-    private final Histogram histogram = Histogram.newBuilder()
-            .withName("request_duration_seconds")
-            .withHelp("request duration in seconds")
-            .withUnit(Unit.SECONDS)
-            .withLabelNames("http_status")
+    private final Histogram histogram = Histogram.builder()
+            .name("request_duration_seconds")
+            .help("request duration in seconds")
+            .unit(Unit.SECONDS)
+            .labelNames("http_status")
             .register();
 
     public HelloWorldServlet() {
@@ -50,8 +50,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         } finally {
-            counter.withLabelValues("200").inc();
-            histogram.withLabelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
+            counter.labelValues("200").inc();
+            histogram.labelValues("200").observe(nanosToSeconds(System.nanoTime() - start));
         }
     }
 }

examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java

@@ -18,7 +18,7 @@ public class Main {
 
     public static void main(String[] args) throws LifecycleException, IOException {
 
-        JvmMetrics.newBuilder().register();
+        JvmMetrics.builder().register();
 
         Tomcat tomcat = new Tomcat();
         Path tmpDir = Files.createTempDirectory("prometheus-tomcat-servlet-example-");

examples/example-simpleclient-bridge/src/main/java/io/prometheus/metrics/examples/simpleclient/Main.java

@@ -16,7 +16,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         // The following call will register all metrics from the old CollectorRegistry.defaultRegistry
         // with the new PrometheusRegistry.defaultRegistry.
 
-        SimpleclientCollector.newBuilder().register();
+        SimpleclientCollector.builder().register();
 
         // Register a counter with the old CollectorRegistry.
         // It doesn't matter whether the counter is registered before or after bridging with PrometheusRegistry.
@@ -30,8 +30,8 @@ public static void main(String[] args) throws IOException, InterruptedException
 
         // Expose metrics from the new PrometheusRegistry. This should contain the events_total metric.
 
-        HTTPServer server = HTTPServer.newBuilder()
-                .withPort(9400)
+        HTTPServer server = HTTPServer.builder()
+                .port(9400)
                 .buildAndStart();
 
         System.out.println("HTTPServer listening on port http://localhost:" + server.getPort() + "/metrics");