Add dropwizard based custom metrics client. Exclude jackson dependecy. Set 3.0.2 version

DeyanZhelyazkov · DeyanZhelyazkov · commit 0d193740b338 · 2019-06-20T12:18:45.000+03:00
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ All in all, you should do the following:
 And
 4. Adjust your logging configuration accordingly.
 
-Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `3.0.0`):
+Let's say you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `3.0.2`):
 
 ```xml
 <properties>
-	<cf-logging-version>3.0.0</cf-logging-version>
+	<cf-logging-version>3.0.2</cf-logging-version>
 </properties>
 ```
 
@@ -245,7 +245,7 @@ In the example above, three custom metrics are defined and used. The metrics are
 </dependency>
 ```
 
-The java client uses [Dropwizard](https://metrics.dropwizard.io) which allows to define all kind of metrics supports by Dropwizar. The following metrics are available: com.codahale.metrics.Gauge, com.codahale.metrics.Counter, com.codahale.metrics.Histogram, com.codahale.metrics.Meter and com.codahale.metrics.Timer. More information about the [metric types and their usage](https://metrics.dropwizard.io/4.0.0/getting-started.html). Define your custom metrics and iterate with them:
+The java client uses [Dropwizard](https://metrics.dropwizard.io) which allows to define all kind of metrics supports by Dropwizard. The following metrics are available: com.codahale.metrics.Gauge, com.codahale.metrics.Counter, com.codahale.metrics.Histogram, com.codahale.metrics.Meter and com.codahale.metrics.Timer. More information about the [metric types and their usage](https://metrics.dropwizard.io/4.0.0/getting-started.html). Define your custom metrics and iterate with them:
 
 ``` java
 import java.io.IOException;
diff --git a/cf-java-logging-support-core/pom.xml b/cf-java-logging-support-core/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>
diff --git a/cf-java-logging-support-jersey/pom.xml b/cf-java-logging-support-jersey/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
     </parent>
 
     <name>cf-java-logging-support-jersey</name>
diff --git a/cf-java-logging-support-log4j2/pom.xml b/cf-java-logging-support-log4j2/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
     </parent>
 
     <dependencies>
diff --git a/cf-java-logging-support-logback/pom.xml b/cf-java-logging-support-logback/pom.xml
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
     </parent>
 
     <dependencies>
diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-core/pom.xml
@@ -5,26 +5,13 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>cf-custom-metrics-clients-core</artifactId>
     <packaging>jar</packaging>
     <name>cf-java-monitoring-custom-metrics-clients-core</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/pom.xml b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.2</version>
 	</parent>
 
 	<artifactId>cf-custom-metrics-clients-java</artifactId>
@@ -17,19 +17,6 @@
 		<dropwizard.version>3.2.6</dropwizard.version>
 	</properties>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.hcp.cf.logging</groupId>
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/CustomMetricRegistry.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/CustomMetricRegistry.java
@@ -37,12 +37,12 @@ protected CustomMetricsReporter getReporter() {
     }
 
     private CustomMetricRegistry() {
-        configProvider = getConfigProvider();
+        configProvider = initConfigProvider();
         customMetricsConfig = CustomMetricsConfigurationFactory.create();
         initializeAndStartReporter();
     }
 
-    private CFConfigurationProvider getConfigProvider() {
+    private static CFConfigurationProvider initConfigProvider() {
         try {
             return new CFConfigurationProvider();
         } catch (IllegalArgumentException e) {
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
@@ -1,9 +1,11 @@
 package com.sap.cloud.cf.monitoring.java;
 
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,17 +73,16 @@ public void report(SortedMap<String, Gauge> gauges, SortedMap<String, Counter> c
     private List<Metric> convert(SortedMap<String, Gauge> gauges, SortedMap<String, Counter> counters,
                                  SortedMap<String, Histogram> histograms, SortedMap<String, Meter> meters,
                                  SortedMap<String, Timer> timers) {
-        List<Metric> result = new ArrayList<>();
         long timestamp = System.currentTimeMillis();
         boolean metricQuantiles = customMetricsConfig.metricQuantiles();
 
-        result.addAll(new GaugeConverter().convert(gauges, timestamp));
-        result.addAll(new CounterConverter().convert(counters, 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;
+        return Stream.of(new GaugeConverter().convert(gauges, timestamp), 
+                  new CounterConverter().convert(counters, timestamp),
+                  new HistogramConverter(metricQuantiles).convert(histograms, timestamp), 
+                  new MeterConverter(metricQuantiles).convert(meters, timestamp),
+                  new TimerConverter(metricQuantiles).convert(timers, timestamp))
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList());
     }
 
     private void sendMetrics(List<Metric> convertedMetrics) {
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/CounterConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/CounterConverter.java
@@ -10,7 +10,7 @@
 public final class CounterConverter extends MetricConverter<Counter> {
 
     @Override
-    List<Metric> convertMetricEntry(Entry<String, Counter> metricEntry, long timestamp) {
+    protected List<Metric> convertMetricEntry(Entry<String, Counter> metricEntry, long timestamp) {
         Counter counter = metricEntry.getValue();
         return Arrays.asList(buildCustomMetric(metricEntry.getKey() + ".count", counter.getCount(), MetricType.COUNTER,
                                                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/GaugeConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/GaugeConverter.java
@@ -10,7 +10,7 @@
 public final class GaugeConverter extends MetricConverter<Gauge> {
 
     @Override
-    List<Metric> convertMetricEntry(Entry<String, Gauge> metricEntry, long timestamp) {
+    protected List<Metric> convertMetricEntry(Entry<String, Gauge> metricEntry, long timestamp) {
         ArrayList<Metric> result = new ArrayList<>();
         Object gaugeValue = metricEntry.getValue().getValue();
         if (gaugeValue instanceof Number) {
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
@@ -17,7 +17,7 @@ public HistogramConverter(boolean metricQuantiles) {
     }
 
     @Override
-    List<Metric> convertMetricEntry(Entry<String, Histogram> metricEntry, long timestamp) {
+    protected List<Metric> convertMetricEntry(Entry<String, Histogram> metricEntry, long timestamp) {
         ArrayList<Metric> result = new ArrayList<>();
         Histogram histogram = metricEntry.getValue();
         Snapshot snapshot = histogram.getSnapshot();
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
@@ -16,7 +16,7 @@ public MeterConverter(boolean metricQuantiles) {
     }
 
     @Override
-    List<Metric> convertMetricEntry(Entry<String, Meter> metricEntry, long timestamp) {
+    protected List<Metric> convertMetricEntry(Entry<String, Meter> metricEntry, long timestamp) {
         ArrayList<Metric> result = new ArrayList<>();
         Meter meter = metricEntry.getValue();
         String key = metricEntry.getKey();
diff --git a/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/MetricConverter.java b/cf-java-monitoring-custom-metrics-clients/cf-custom-metrics-clients-java/src/main/java/com/sap/cloud/cf/monitoring/java/converter/MetricConverter.java
@@ -11,7 +11,7 @@
 public abstract class MetricConverter<T> {
     private static final String KEY_TYPE = "type";
 
-    enum MetricType {
+    public enum MetricType {
                      TIMER("timer"), HISTOGRAM("histogram"), GAUGE("gauge"), METER("meter"), COUNTER("counter");
 
         private final String metricTypeName;
@@ -33,9 +33,9 @@ public List<Metric> convert(Map<String, T> metrics, long timestamp) {
         return result;
     }
 
-    abstract List<Metric> convertMetricEntry(Entry<String, T> metricEntry, long timestamp);
+    protected abstract List<Metric> convertMetricEntry(Entry<String, T> metricEntry, long timestamp);
 
-    Metric buildCustomMetric(String name, double value, MetricType type, long timestamp) {
+    protected Metric buildCustomMetric(String name, double value, MetricType type, long timestamp) {
         Map<String, String> tags = new HashMap<>();
         tags.put(KEY_TYPE, type.getMetricTypeName());
         return new Metric(name, value, timestamp, tags);
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
@@ -17,7 +17,7 @@ public TimerConverter(boolean metricQuantiles) {
     }
 
     @Override
-    List<Metric> convertMetricEntry(Entry<String, Timer> metricEntry, long timestamp) {
+    protected List<Metric> convertMetricEntry(Entry<String, Timer> metricEntry, long timestamp) {
         ArrayList<Metric> result = new ArrayList<>();
         Timer timer = metricEntry.getValue();
         Snapshot snapshot = timer.getSnapshot();
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
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-monitoring-custom-metrics-clients</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>cf-custom-metrics-clients-spring-boot</artifactId>
@@ -15,19 +15,6 @@
         <spring.boot.version>2.0.6.RELEASE</spring.boot.version>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>com.sap.hcp.cf.logging</groupId>
diff --git a/cf-java-monitoring-custom-metrics-clients/pom.xml b/cf-java-monitoring-custom-metrics-clients/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.sap.hcp.cf.logging</groupId>
     <artifactId>cf-java-logging-support-parent</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.2</version>
     <packaging>pom</packaging>
 
     <name>Cloud Foundry Java logging support components</name>
diff --git a/sample/manifest.yml b/sample/manifest.yml
@@ -5,7 +5,7 @@ applications:
 #
 - name: logging-sample-app
   instances: 1
-  path: target/logging-sample-app-3.0.0.war
+  path: target/logging-sample-app-3.0.2.war
   env:
     RANDOM_SLEEP: true
 # Set LOG_*: true to activate logging of respective field
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ protected CustomMetricsReporter getReporter() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private CustomMetricRegistry() {`
`40`		`- configProvider = getConfigProvider();`
	`40`	`+ configProvider = initConfigProvider();`
`41`	`41`	`customMetricsConfig = CustomMetricsConfigurationFactory.create();`
`42`	`42`	`initializeAndStartReporter();`
`43`	`43`	`}`
`44`	`44`
`45`		`- private CFConfigurationProvider getConfigProvider() {`
	`45`	`+ private static CFConfigurationProvider initConfigProvider() {`
`46`	`46`	`try {`
`47`	`47`	`return new CFConfigurationProvider();`
`48`	`48`	`} catch (IllegalArgumentException e) {`