Add dropwizard based java client for custom metrics and excludes jackson dependency for spring-boot client

DeyanZhelyazkov · DeyanZhelyazkov · commit a69c74f9d93c · 2019-06-20T12:31:42.000+03:00
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/src/main/java/com/sap/cloud/cf/monitoring/client/configuration/CustomMetricsConfiguration.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/src/main/java/com/sap/cloud/cf/monitoring/client/configuration/CustomMetricsConfiguration.java
@@ -11,7 +11,7 @@ public class CustomMetricsConfiguration {
     private long interval = DEFAULT_INTERVAL;
     private boolean enabled = true;
     private List<String> metrics;
-    private boolean metricsAggregation = false;
+    private boolean metricQuantiles = false;
 
     public long getInterval() {
         return interval;
@@ -28,8 +28,8 @@ public List<String> getMetrics() {
         return new ArrayList<>(metrics);
     }
 
-    public boolean isMetricsAggregation() {
-        return metricsAggregation;
+    public boolean metricQuantiles() {
+        return metricQuantiles;
     }
 
     @Override
@@ -41,8 +41,8 @@ public String toString() {
             .append(", metrics=")
             .append(metrics)
             .append("]")
-            .append(", metricsAggregation=")
-            .append(metricsAggregation)
+            .append(", metricQuantiles=")
+            .append(metricQuantiles)
             .toString();
     }
 }
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/src/test/java/com/sap/cloud/cf/monitoring/client/configuration/CustomMetricsConfigurationFactoryTest.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/src/test/java/com/sap/cloud/cf/monitoring/client/configuration/CustomMetricsConfigurationFactoryTest.java
@@ -33,7 +33,7 @@ private void testDefault() {
         assertEquals(CustomMetricsConfiguration.DEFAULT_INTERVAL, config.getInterval());
         assertNotNull(config.getMetrics());
         assertTrue(config.getMetrics().isEmpty());
-        assertFalse(config.isMetricsAggregation());
+        assertFalse(config.metricQuantiles());
     }
 
     @Test
@@ -48,7 +48,7 @@ public void testMatches_WithEnv() throws Exception {
         assertEquals(2, metrics.size());
         assertTrue(metrics.contains("timer"));
         assertTrue(metrics.contains("summary"));
-        assertTrue(config.isMetricsAggregation());
+        assertTrue(config.metricQuantiles());
     }
 
     @Test
@@ -81,7 +81,7 @@ private static String getJson(String interval) {
                 "    \"interval\": \"" + interval + "\",\n" + //
                 "    \"enabled\": \"false\",\n" + //
                 "    \"metrics\": [\"timer\", \"summary\"],\n" + //
-                "    \"metricsAggregation\": \"true\"\n" + //
+                "    \"metricQuantiles\": \"true\"\n" + //
                 "}";
     }
 }
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/CustomMetricsReporter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/CustomMetricsReporter.java
@@ -71,13 +71,13 @@ private List<Metric> convert(SortedMap<String, Gauge> gauges, SortedMap<String,
             SortedMap<String, Histogram> histograms, SortedMap<String, Meter> meters, SortedMap<String, Timer> timers) {
         List<Metric> result = new ArrayList<>();
         long timestamp = System.currentTimeMillis();
-        boolean metricsAggregation = customMetricsConfig.isMetricsAggregation();
+        boolean metricQuantiles = customMetricsConfig.metricQuantiles();
 
         result.addAll(new GaugeConverter().convert(gauges, timestamp));
         result.addAll(new CounterConverter().convert(counters, timestamp));
-        result.addAll(new HistogramConverter(metricsAggregation).convert(histograms, timestamp));
-        result.addAll(new MeterConverter(metricsAggregation).convert(meters, timestamp));
-        result.addAll(new TimerConverter(metricsAggregation).convert(timers, timestamp));
+        result.addAll(new HistogramConverter(metricQuantiles).convert(histograms, timestamp));
+        result.addAll(new MeterConverter(metricQuantiles).convert(meters, timestamp));
+        result.addAll(new TimerConverter(metricQuantiles).convert(timers, timestamp));
 
         return result;
     }
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/HistogramConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/HistogramConverter.java
@@ -10,10 +10,10 @@
 
 public final class HistogramConverter extends MetricConverter<Histogram> {
 
-    private final boolean metricsAggregation;
+    private final boolean metricQuantiles;
 
-    public HistogramConverter(boolean metricsAggregation) {
-        this.metricsAggregation = metricsAggregation;
+    public HistogramConverter(boolean metricQuantiles) {
+        this.metricQuantiles = metricQuantiles;
     }
 
     @Override
@@ -31,7 +31,7 @@ List<Metric> convertMetricEntry(Entry<String, Histogram> metricEntry, long times
         result.add(buildCustomMetric(key + ".p95", snapshot.get95thPercentile(), type, timestamp));
         result.add(buildCustomMetric(key + ".p99", snapshot.get99thPercentile(), type, timestamp));
 
-        if (metricsAggregation) {
+        if (metricQuantiles) {
             result.add(buildCustomMetric(key + ".mean", snapshot.getMean(), type, timestamp));
             result.add(buildCustomMetric(key + ".p75", snapshot.get75thPercentile(), type, timestamp));
             result.add(buildCustomMetric(key + ".p98", snapshot.get98thPercentile(), type, timestamp));
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/MeterConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/MeterConverter.java
@@ -9,10 +9,10 @@
 
 public final class MeterConverter extends MetricConverter<Meter> {
 
-    private final boolean metricsAggregation;
+    private final boolean metricQuantiles;
 
-    public MeterConverter(boolean metricsAggregation) {
-        this.metricsAggregation = metricsAggregation;
+    public MeterConverter(boolean metricQuantiles) {
+        this.metricQuantiles = metricQuantiles;
     }
 
     @Override
@@ -25,7 +25,7 @@ List<Metric> convertMetricEntry(Entry<String, Meter> metricEntry, long timestamp
         result.add(buildCustomMetric(key + ".count", meter.getCount(), type, timestamp));
         result.add(buildCustomMetric(key + ".m1_rate", meter.getOneMinuteRate(), type, timestamp));
 
-        if (metricsAggregation) {
+        if (metricQuantiles) {
             result.add(buildCustomMetric(key + ".mean_rate", meter.getMeanRate(), type, timestamp));
             result.add(buildCustomMetric(key + ".m5_rate", meter.getFiveMinuteRate(), type, timestamp));
             result.add(buildCustomMetric(key + ".m15_rate", meter.getFifteenMinuteRate(), type, timestamp));
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/TimerConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/TimerConverter.java
@@ -10,10 +10,10 @@
 
 public final class TimerConverter extends MetricConverter<Timer> {
 
-    private final boolean metricsAggregation;
+    private final boolean metricQuantiles;
 
-    public TimerConverter(boolean metricsAggregation) {
-        this.metricsAggregation = metricsAggregation;
+    public TimerConverter(boolean metricQuantiles) {
+        this.metricQuantiles = metricQuantiles;
     }
 
     @Override
@@ -32,7 +32,7 @@ List<Metric> convertMetricEntry(Entry<String, Timer> metricEntry, long timestamp
         result.add(buildCustomMetric(key + ".p99", snapshot.get99thPercentile(), type, timestamp));
         result.add(buildCustomMetric(key + ".m1_rate", timer.getOneMinuteRate(), type, timestamp));
 
-        if (metricsAggregation) {
+        if (metricQuantiles) {
             result.add(buildCustomMetric(key + ".mean", snapshot.getMean(), type, timestamp));
             result.add(buildCustomMetric(key + ".p75", snapshot.get75thPercentile(), type, timestamp));
             result.add(buildCustomMetric(key + ".p98", snapshot.get98thPercentile(), type, timestamp));
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/CustomMetricsReporterTest.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/CustomMetricsReporterTest.java
@@ -73,8 +73,8 @@ public Integer getValue() {
     }
 
     @Test
-    public void testReportHistogramWithAggregationSuccessfully() {
-        when(customMetricsConfig.isMetricsAggregation()).thenReturn(true);
+    public void testReportHistogramWithMetricQuantilesSuccessfully() {
+        when(customMetricsConfig.metricQuantiles()).thenReturn(true);
         registry.histogram(METRIC_NAME);
 
         reporter.report();
@@ -83,8 +83,8 @@ public void testReportHistogramWithAggregationSuccessfully() {
     }
 
     @Test
-    public void testReportHistogramWithoutAggregationSuccessfully() {
-        when(customMetricsConfig.isMetricsAggregation()).thenReturn(false);
+    public void testReportHistogramWithoutMetricQuantilesSuccessfully() {
+        when(customMetricsConfig.metricQuantiles()).thenReturn(false);
         registry.histogram(METRIC_NAME);
 
         reporter.report();
@@ -93,8 +93,8 @@ public void testReportHistogramWithoutAggregationSuccessfully() {
     }
 
     @Test
-    public void testReportMeterWithAggregationSuccessfully() {
-        when(customMetricsConfig.isMetricsAggregation()).thenReturn(true);
+    public void testReportMeterWithMetricQuantilesSuccessfully() {
+        when(customMetricsConfig.metricQuantiles()).thenReturn(true);
         registry.meter(METRIC_NAME);
 
         reporter.report();
@@ -103,8 +103,8 @@ public void testReportMeterWithAggregationSuccessfully() {
     }
 
     @Test
-    public void testReportMeterWithoutAggregationSuccessfully() {
-        when(customMetricsConfig.isMetricsAggregation()).thenReturn(false);
+    public void testReportMeterWithoutMetricQuantilesSuccessfully() {
+        when(customMetricsConfig.metricQuantiles()).thenReturn(false);
         registry.meter(METRIC_NAME);
 
         reporter.report();
@@ -121,7 +121,7 @@ public void testReportEmptyMetrics() {
 
     @Test
     public void testReportMetricWithWhitelist() {
-        when(customMetricsConfig.isMetricsAggregation()).thenReturn(true);
+        when(customMetricsConfig.metricQuantiles()).thenReturn(true);
         when(customMetricsConfig.getMetrics()).thenReturn(Arrays.asList(METRIC_NAME));
 
         registry.meter(METRIC_NAME);
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/HistogramConverterTest.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/HistogramConverterTest.java
@@ -64,7 +64,7 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testTimerMetricWithAggregation() {
+    public void testTimerMetricWithMetricQuantiles() {
         List<Metric> metrics = new HistogramConverter(true).convert(histograms, currentTimeMillis);
 
         ConverterTestUtil util = new ConverterTestUtil(metrics, HISTOGRAM_METRIC,
@@ -84,7 +84,7 @@ public void testTimerMetricWithAggregation() {
     }
 
     @Test
-    public void testTimerMetricWithoutAggregation() {
+    public void testTimerMetricWithoutMetricQuantiles() {
         List<Metric> metrics = new HistogramConverter(false).convert(histograms, currentTimeMillis);
 
         ConverterTestUtil util = new ConverterTestUtil(metrics, HISTOGRAM_METRIC,
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/MeterConverterTest.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/MeterConverterTest.java
@@ -33,7 +33,7 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testMeterMetricsWithAggregation() {
+    public void testMeterMetricsWithMetricQuantiles() {
         List<Metric> metrics = new MeterConverter(true).convert(meters, currentTimeMillis);
 
         ConverterTestUtil util =
@@ -47,7 +47,7 @@ public void testMeterMetricsWithAggregation() {
     }
 
     @Test
-    public void testMeterMetricsWithoutAggregation() {
+    public void testMeterMetricsWithoutMetricQuantiles() {
         List<Metric> metrics = new MeterConverter(false).convert(meters, currentTimeMillis);
 
         ConverterTestUtil util =
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/TimerConverterTest.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/test/java/com/sap/cloud/cf/monitoring/java/converter/TimerConverterTest.java
@@ -54,7 +54,7 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testTimerMetricWithAggregation() {
+    public void testTimerMetricWithMetricQuantiles() {
         List<Metric> metrics = new TimerConverter(true).convert(timers, currentTimeMillis);
         ConverterTestUtil util =
             new ConverterTestUtil(metrics, TIMER_METRIC, MetricType.TIMER.getMetricTypeName(), currentTimeMillis);
@@ -77,7 +77,7 @@ public void testTimerMetricWithAggregation() {
     }
 
     @Test
-    public void testTimerMetricWithoutAggregation() {
+    public void testTimerMetricWithoutMetricQuantiles() {
         List<Metric> metrics = new TimerConverter(false).convert(timers, currentTimeMillis);
 
         ConverterTestUtil util =
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-spring-boot/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-spring-boot/pom.xml
@@ -52,6 +52,20 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
             <version>${spring.boot.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Test dependencies -->
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private void testDefault() {`
`33`	`33`	`assertEquals(CustomMetricsConfiguration.DEFAULT_INTERVAL, config.getInterval());`
`34`	`34`	`assertNotNull(config.getMetrics());`
`35`	`35`	`assertTrue(config.getMetrics().isEmpty());`
`36`		`- assertFalse(config.isMetricsAggregation());`
	`36`	`+ assertFalse(config.metricQuantiles());`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Test`
`@@ -48,7 +48,7 @@ public void testMatches_WithEnv() throws Exception {`
`48`	`48`	`assertEquals(2, metrics.size());`
`49`	`49`	`assertTrue(metrics.contains("timer"));`
`50`	`50`	`assertTrue(metrics.contains("summary"));`
`51`		`- assertTrue(config.isMetricsAggregation());`
	`51`	`+ assertTrue(config.metricQuantiles());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Test`
`@@ -81,7 +81,7 @@ private static String getJson(String interval) {`
`81`	`81`	`" \"interval\": \"" + interval + "\",\n" + //`
`82`	`82`	`" \"enabled\": \"false\",\n" + //`
`83`	`83`	`" \"metrics\": [\"timer\", \"summary\"],\n" + //`
`84`		`- " \"metricsAggregation\": \"true\"\n" + //`
	`84`	`+ " \"metricQuantiles\": \"true\"\n" + //`
`85`	`85`	`"}";`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void setUp() throws Exception {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Test`
`67`		`- public void testTimerMetricWithAggregation() {`
	`67`	`+ public void testTimerMetricWithMetricQuantiles() {`
`68`	`68`	`List<Metric> metrics = new HistogramConverter(true).convert(histograms, currentTimeMillis);`
`69`	`69`
`70`	`70`	`ConverterTestUtil util = new ConverterTestUtil(metrics, HISTOGRAM_METRIC,`
`@@ -84,7 +84,7 @@ public void testTimerMetricWithAggregation() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Test`
`87`		`- public void testTimerMetricWithoutAggregation() {`
	`87`	`+ public void testTimerMetricWithoutMetricQuantiles() {`
`88`	`88`	`List<Metric> metrics = new HistogramConverter(false).convert(histograms, currentTimeMillis);`
`89`	`89`
`90`	`90`	`ConverterTestUtil util = new ConverterTestUtil(metrics, HISTOGRAM_METRIC,`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void setUp() throws Exception {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Test`
`36`		`- public void testMeterMetricsWithAggregation() {`
	`36`	`+ public void testMeterMetricsWithMetricQuantiles() {`
`37`	`37`	`List<Metric> metrics = new MeterConverter(true).convert(meters, currentTimeMillis);`
`38`	`38`
`39`	`39`	`ConverterTestUtil util =`
`@@ -47,7 +47,7 @@ public void testMeterMetricsWithAggregation() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Test`
`50`		`- public void testMeterMetricsWithoutAggregation() {`
	`50`	`+ public void testMeterMetricsWithoutMetricQuantiles() {`
`51`	`51`	`List<Metric> metrics = new MeterConverter(false).convert(meters, currentTimeMillis);`
`52`	`52`
`53`	`53`	`ConverterTestUtil util =`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void setUp() throws Exception {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Test`
`57`		`- public void testTimerMetricWithAggregation() {`
	`57`	`+ public void testTimerMetricWithMetricQuantiles() {`
`58`	`58`	`List<Metric> metrics = new TimerConverter(true).convert(timers, currentTimeMillis);`
`59`	`59`	`ConverterTestUtil util =`
`60`	`60`	`new ConverterTestUtil(metrics, TIMER_METRIC, MetricType.TIMER.getMetricTypeName(), currentTimeMillis);`
`@@ -77,7 +77,7 @@ public void testTimerMetricWithAggregation() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Test`
`80`		`- public void testTimerMetricWithoutAggregation() {`
	`80`	`+ public void testTimerMetricWithoutMetricQuantiles() {`
`81`	`81`	`List<Metric> metrics = new TimerConverter(false).convert(timers, currentTimeMillis);`
`82`	`82`
`83`	`83`	`ConverterTestUtil util =`