Merge pull request aol#378 from jijisv/datadog_report_fix

jijisv · web-flow · commit e8db31babe79 · 2017-10-16T15:46:36.000+01:00
Datadog report fix
diff --git a/micro-core/src/main/resources/logback.xml b/micro-core/src/main/resources/logback.xml
@@ -1,19 +1,11 @@
 <configuration scan="true">
 	
-
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<pattern>%date{MMM dd yyyy h:mm:ss a z,EST} %-5p %c - %msg --
-				[%thread] %n</pattern>
+			<pattern>%date{MMM dd yyyy h:mm:ss a z,EST} %-5p %c - %msg -- [%thread] %n</pattern>
 		</encoder>
 	</appender>
 
-	
-
-	
-
-	
-
 	<root>
 		<level value="INFO" />
 		<appender-ref ref="CONSOLE" />
diff --git a/micro-metrics-datadog/src/main/java/com/aol/micro/server/datadog/metrics/DatadogMetricsConfigurer.java b/micro-metrics-datadog/src/main/java/com/aol/micro/server/datadog/metrics/DatadogMetricsConfigurer.java
@@ -10,6 +10,7 @@
 import java.util.stream.Stream;
 
 import cyclops.control.Maybe;
+import lombok.extern.slf4j.Slf4j;
 import org.coursera.metrics.datadog.DatadogReporter;
 import org.coursera.metrics.datadog.transport.HttpTransport;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@
 
 @Configuration
 @EnableMetrics
+@Slf4j
 public class DatadogMetricsConfigurer extends MetricsConfigurerAdapter {
 
     private String apiKey;
@@ -36,19 +38,20 @@ public class DatadogMetricsConfigurer extends MetricsConfigurerAdapter {
     private final String host;
 
     @Autowired
-    public DatadogMetricsConfigurer(@Value("${datadog.apikey}") String apiKey,
-            @Value("${datadog.tags:{\"stage:dev\"}}") String tags, @Value("${datadog.report.period:1}") int period,
-            @Value("${datadog.report.timeunit:SECONDS}") TimeUnit timeUnit,
-            @Value("${datadog.report.expansions:#{null}}") String expStr,
-	    @Value("${host.address:#{null}}") String host){
+    public DatadogMetricsConfigurer(@Value("${datadog.apikey:#{null}}") String apiKey,
+                                    @Value("${datadog.tags:{\"stage:dev\"}}") String tags,
+                                    @Value("${datadog.report.period:1}") int period,
+                                    @Value("${datadog.report.timeunit:SECONDS}") TimeUnit timeUnit,
+                                    @Value("${datadog.report.expansions:#{null}}") String expStr,
+                                    @Value("${host.address:#{null}}") String host){
         this.apiKey = apiKey;
         this.tags = Arrays.asList(Optional.ofNullable(tags)
                                           .orElse("")
                                           .split(","));
         this.period = period;
         this.timeUnit = timeUnit;
         this.expansions = expansions(expStr);
-	this.host = host;
+        this.host = host;
     }
 
     private EnumSet<DatadogReporter.Expansion> expansions(String expStr) {
@@ -65,10 +68,14 @@ private EnumSet<DatadogReporter.Expansion> expansions(String expStr) {
 
     @Override
     public void configureReporters(MetricRegistry metricRegistry) {
+        if (Objects.isNull(apiKey)) {
+           log.error("The 'datadog.apikey' is null. Datadog reporting will be ignored.");
+           return;
+        }
         HttpTransport httpTransport = new HttpTransport.Builder().withApiKey(apiKey)
                                                                  .build();
         EnumSet<DatadogReporter.Expansion> expansions = DatadogReporter.Expansion.ALL;
-	DatadogReporter.Builder builder = DatadogReporter.forRegistry(metricRegistry)
+        DatadogReporter.Builder builder = DatadogReporter.forRegistry(metricRegistry)
                                                   .withTransport(httpTransport)
                                                   .withExpansions(expansions)
                                                   .withTags(tags);
