Simplified construction of quantiles, fix license header

micrometer-metrics · Jun 7, 2017 · c3e6ca7 · c3e6ca7
1 parent f9c8ca8
commit c3e6ca7
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 44 deletions.
diff --git a/...uantiles/src/main/java/org/springframework/metrics/samples/PrometheusHistogramSample.java b/...uantiles/src/main/java/org/springframework/metrics/samples/PrometheusHistogramSample.java
@@ -43,7 +43,7 @@ public static void main(String[] args) throws UnknownHostException, LifecycleExc
 
         DistributionSummary hist = meterRegistry.distributionSummaryBuilder("hist")
                 .histogram(CumulativeHistogram.buckets(linear(0, 10, 20)))
-                .quantiles(CKMSQuantiles.build()
+                .quantiles(CKMSQuantiles
                         .quantile(0.95, 0.01)
                         .quantile(0.5, 0.05)
                         .create())

diff --git a/...uantiles/src/main/java/org/springframework/metrics/samples/PrometheusQuantilesSample.java b/...uantiles/src/main/java/org/springframework/metrics/samples/PrometheusQuantilesSample.java
@@ -44,31 +44,25 @@ public static void main(String[] args) throws UnknownHostException, LifecycleExc
         startServer(route);
 
         Timer ckmsTimer = meterRegistry.timerBuilder("random_ckms")
-                .quantiles(CKMSQuantiles.build()
+                .quantiles(CKMSQuantiles
                         .quantile(0.5, 0.05)
                         .quantile(0.95, 0.01)
                         .create())
                 .create();
 
         Timer frugalTimer = meterRegistry.timerBuilder("random_frugal")
-                .quantiles(Frugal2UQuantiles.build()
+                .quantiles(Frugal2UQuantiles
                         .quantile(0.5, 10)
                         .quantile(0.95, 10)
                         .create())
                 .create();
 
         Timer gkTimer = meterRegistry.timerBuilder("random_gk")
-                .quantiles(GKQuantiles.build()
-                        .quantile(0.5)
-                        .quantile(0.95)
-                        .create())
+                .quantiles(GKQuantiles.quantiles(0.5, 0.95).create())
                 .create();
 
         Timer windowTimer = meterRegistry.timerBuilder("random_window")
-                .quantiles(WindowSketchQuantiles.build()
-                        .quantile(0.5)
-                        .quantile(0.95)
-                        .create())
+                .quantiles(WindowSketchQuantiles.quantiles(0.5, 0.95).create())
                 .create();
 
         //noinspection InfiniteLoopStatement

diff --git a/src/jmh/java/org.springframework.metrics.benchmark/QuantilesBenchmark.java b/src/jmh/java/org.springframework.metrics.benchmark/QuantilesBenchmark.java
@@ -41,24 +41,20 @@ public class QuantilesBenchmark {
 
     @Setup
     public void setup() {
-        ckms = CKMSQuantiles.build()
+        ckms = CKMSQuantiles
                 .quantile(0.5, 0.05)
                 .quantile(0.99, 0.01)
                 .create();
 
-        frugal2u = Frugal2UQuantiles.build()
+        frugal2u = Frugal2UQuantiles
                 .quantile( 0.99, 100)
                 .quantile( 0.99, 100)
                 .create();
 
-        gk = GKQuantiles.build()
-                .quantile(0.5)
-                .quantile(0.99)
+        gk = GKQuantiles.quantiles(0.5, 0.99)
                 .create();
 
-        window = WindowSketchQuantiles.build()
-                .quantile(0.5)
-                .quantile(0.99)
+        window = WindowSketchQuantiles.quantiles(0.5, 0.99)
                 .create();
     }
 

diff --git a/src/main/java/org/springframework/metrics/instrument/binder/CacheMetrics.java b/src/main/java/org/springframework/metrics/instrument/binder/CacheMetrics.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2017 Pivotal Software, Inc.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/main/java/org/springframework/metrics/instrument/scheduling/MetricsSchedulingAspect.java b/src/main/java/org/springframework/metrics/instrument/scheduling/MetricsSchedulingAspect.java
@@ -66,7 +66,7 @@ public Object timeScheduledOperation(ProceedingJoinPoint pjp) throws Throwable {
                 Timer.Builder timerBuilder = registry.timerBuilder(timed.value())
                         .tags(timed.extraTags());
                 if(timed.quantiles().length > 0) {
-                    timerBuilder = timerBuilder.quantiles(WindowSketchQuantiles.build().quantile(timed.quantiles()).create());
+                    timerBuilder = timerBuilder.quantiles(WindowSketchQuantiles.quantiles(timed.quantiles()).create());
                 }
                 shortTaskTimer = timerBuilder.create();
             }

diff --git a/src/main/java/org/springframework/metrics/instrument/stats/quantile/CKMSQuantiles.java b/src/main/java/org/springframework/metrics/instrument/stats/quantile/CKMSQuantiles.java
@@ -293,8 +293,8 @@ public Quantile[] getQuantiles() {
         return quantiles;
     }
 
-    public static Builder build() {
-        return new Builder();
+    public static Builder quantile(double quantile, double error) {
+        return new Builder().quantile(quantile, error);
     }
 
     public static class Builder {

diff --git a/src/main/java/org/springframework/metrics/instrument/stats/quantile/Frugal2UQuantiles.java b/src/main/java/org/springframework/metrics/instrument/stats/quantile/Frugal2UQuantiles.java
@@ -142,8 +142,8 @@ public Quantile[] getQuantiles() {
         return quantiles;
     }
 
-    public static Builder build() {
-        return new Builder();
+    public static Builder quantile(double quantile, double estimate) {
+        return new Builder().quantile(quantile, estimate);
     }
 
     public static class Builder {

diff --git a/src/main/java/org/springframework/metrics/instrument/stats/quantile/GKQuantiles.java b/src/main/java/org/springframework/metrics/instrument/stats/quantile/GKQuantiles.java
@@ -16,10 +16,7 @@
 package org.springframework.metrics.instrument.stats.quantile;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
@@ -667,16 +664,18 @@ public String toString() {
         }
     }
 
-    public static Builder build() {
-        return new Builder();
+    public static Builder quantiles(double... quantiles) {
+        return new Builder().quantiles(quantiles);
     }
 
     public static class Builder {
         private Collection<Double> monitored = new ArrayList<>();
         private double error = 0.05;
 
-        public Builder quantile(double quantile) {
-            monitored.add(quantile);
+        public Builder quantiles(double... quantiles) {
+            for (double quantile : quantiles) {
+                monitored.add(quantile);
+            }
             return this;
         }
 

diff --git a/...ain/java/org/springframework/metrics/instrument/stats/quantile/WindowSketchQuantiles.java b/...ain/java/org/springframework/metrics/instrument/stats/quantile/WindowSketchQuantiles.java
@@ -406,15 +406,15 @@ Float getEpsilon() {
         }
     }
 
-    public static Builder build() {
-        return new Builder();
+    public static Builder quantiles(double... quantiles) {
+        return new Builder().quantiles(quantiles);
     }
 
     public static class Builder {
         private Collection<Double> monitored = new ArrayList<>();
         private double error = 0.05;
 
-        public Builder quantile(double... quantiles) {
+        public Builder quantiles(double... quantiles) {
             for (double quantile : quantiles) {
                 monitored.add(quantile);
             }

diff --git a/src/main/java/org/springframework/metrics/instrument/web/MetricsHandlerInterceptor.java b/src/main/java/org/springframework/metrics/instrument/web/MetricsHandlerInterceptor.java
@@ -132,7 +132,7 @@ private void recordMetric(HttpServletRequest request, HttpServletResponse respon
             }
 
             if(t.quantiles().length > 0) {
-                timerBuilder = timerBuilder.quantiles(WindowSketchQuantiles.build().quantile(t.quantiles()).create());
+                timerBuilder = timerBuilder.quantiles(WindowSketchQuantiles.quantiles(t.quantiles()).create());
             }
 
             timerBuilder.create().record(endTime - startTime, TimeUnit.NANOSECONDS);

diff --git a/...t/java/org/springframework/metrics/instrument/prometheus/PrometheusMeterRegistryTest.java b/...t/java/org/springframework/metrics/instrument/prometheus/PrometheusMeterRegistryTest.java
@@ -63,11 +63,11 @@ void before() {
     @Test
     void quantiles() {
         registry.timerBuilder("timer")
-                .quantiles(GKQuantiles.build().quantile(0.5).create())
+                .quantiles(GKQuantiles.quantiles(0.5).create())
                 .create();
 
         registry.distributionSummaryBuilder("ds")
-                .quantiles(GKQuantiles.build().quantile(0.5).create())
+                .quantiles(GKQuantiles.quantiles(0.5).create())
                 .create();
 
         assertThat(prometheusRegistry.metricFamilySamples()).has(withNameAndTagKey("timer", "quantile"));

diff --git a/...est/java/org/springframework/metrics/instrument/spectator/SpectatorMeterRegistryTest.java b/...est/java/org/springframework/metrics/instrument/spectator/SpectatorMeterRegistryTest.java
@@ -40,11 +40,11 @@ void quantiles() {
         Registry spectatorRegistry = registry.getSpectatorRegistry();
 
         registry.timerBuilder("timer")
-                .quantiles(GKQuantiles.build().quantile(0.5).create())
+                .quantiles(GKQuantiles.quantiles(0.5).create())
                 .create();
 
         registry.distributionSummaryBuilder("ds")
-                .quantiles(GKQuantiles.build().quantile(0.5).create())
+                .quantiles(GKQuantiles.quantiles(0.5).create())
                 .create();
 
         assertThat(spectatorRegistry).haveAtLeastOne(withNameAndTagKey("timer", "quantile"));