Merge pull request aol#279 from aol/configurable-expansions

johnmcclean · web-flow · commit 5214c17f9c94 · 2016-11-06T23:17:49.000Z
Configurable expansions for Datadog metrics
diff --git a/micro-metrics-datadog/readme.md b/micro-metrics-datadog/readme.md
@@ -35,8 +35,11 @@ datadog.apikey = <your api key goes here>
 datadog.tags = "stage:dev", "owner:abc"
 datadog.report.period = 10
 datadog.report.timeunit = SECONDS
+datadog.report.expansions=<comma separated list of expansions>
 ```
 
+Default setting is to report all available expansions. List is available here [Datadog expansions](http://static.javadoc.io/org.coursera/metrics-datadog/1.1.6/org/coursera/metrics/datadog/DatadogReporter.Expansion.html).
+
 This will report the metrics to datadog with tags as "stage:dev" and "owner:abc" and for every 10 seconds
 
 
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
@@ -5,17 +5,22 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.coursera.metrics.datadog.DatadogReporter;
 import org.coursera.metrics.datadog.transport.HttpTransport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
+import com.aol.cyclops.control.Maybe;
 import com.codahale.metrics.MetricRegistry;
 import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
 import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
 
+import lombok.Getter;
+
 @Configuration
 @EnableMetrics
 public class DatadogMetricsConfigurer extends MetricsConfigurerAdapter {
@@ -24,17 +29,33 @@ public class DatadogMetricsConfigurer extends MetricsConfigurerAdapter {
     private List<String> tags;
     private int period;
     private TimeUnit timeUnit;
+    @Getter
+    private EnumSet<DatadogReporter.Expansion> expansions;
 
     @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.timeunit:SECONDS}") TimeUnit timeUnit,
+            @Value("${datadog.report.expansions:#{null}}") String expStr) {
         this.apiKey = apiKey;
         this.tags = Arrays.asList(Optional.ofNullable(tags)
                                           .orElse("")
                                           .split(","));
         this.period = period;
         this.timeUnit = timeUnit;
+        this.expansions = expansions(expStr);
+    }
+
+    private EnumSet<DatadogReporter.Expansion> expansions(String expStr) {
+        return Maybe.just(Maybe.ofNullable(expStr)
+                               .map(s -> s.split(","))
+                               .stream()
+                               .flatMap(Stream::of)
+                               .map(String::trim)
+                               .map(DatadogReporter.Expansion::valueOf)
+                               .collect(Collectors.toCollection(() -> EnumSet.noneOf(DatadogReporter.Expansion.class))))
+                    .filter(s -> !s.isEmpty())
+                    .orElse(DatadogReporter.Expansion.ALL);
     }
 
     @Override
diff --git a/micro-metrics-datadog/src/test/java/com/aol/micro/server/datadog/metrics/DatadogMetricsConfigurerTest.java b/micro-metrics-datadog/src/test/java/com/aol/micro/server/datadog/metrics/DatadogMetricsConfigurerTest.java
@@ -0,0 +1,54 @@
+package com.aol.micro.server.datadog.metrics;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.util.EnumSet;
+import java.util.concurrent.TimeUnit;
+
+import org.coursera.metrics.datadog.DatadogReporter;
+import org.junit.Test;
+
+public class DatadogMetricsConfigurerTest {
+
+    private String apiKey = "api";
+    private String tags = "tags";
+    private int period = 10;
+    private TimeUnit timeUnit = TimeUnit.DAYS;
+
+    @Test
+    public void expansionsDefault() {
+        String expStr = null;
+        DatadogMetricsConfigurer c = new DatadogMetricsConfigurer(
+                                                                  apiKey, tags, period, timeUnit, expStr);
+        assertThat(c.getExpansions(), equalTo(DatadogReporter.Expansion.ALL));
+    }
+
+    @Test
+    public void expansionsSingle() {
+        String expStr = DatadogReporter.Expansion.MEDIAN.name();
+        DatadogMetricsConfigurer c = new DatadogMetricsConfigurer(
+                                                                  apiKey, tags, period, timeUnit, expStr);
+        assertThat(c.getExpansions(), equalTo(EnumSet.of(DatadogReporter.Expansion.MEDIAN)));
+    }
+
+    @Test
+    public void expansionsTwo() {
+        String expStr = DatadogReporter.Expansion.MEDIAN.name() + "," + DatadogReporter.Expansion.RATE_15_MINUTE.name();
+        DatadogMetricsConfigurer c = new DatadogMetricsConfigurer(
+                                                                  apiKey, tags, period, timeUnit, expStr);
+        assertThat(c.getExpansions(),
+                   equalTo(EnumSet.of(DatadogReporter.Expansion.MEDIAN, DatadogReporter.Expansion.RATE_15_MINUTE)));
+    }
+
+    @Test
+    public void expansionsTwoSpace() {
+        String expStr = DatadogReporter.Expansion.MEDIAN.name() + " , "
+                + DatadogReporter.Expansion.RATE_15_MINUTE.name();
+        DatadogMetricsConfigurer c = new DatadogMetricsConfigurer(
+                                                                  apiKey, tags, period, timeUnit, expStr);
+        assertThat(c.getExpansions(),
+                   equalTo(EnumSet.of(DatadogReporter.Expansion.MEDIAN, DatadogReporter.Expansion.RATE_15_MINUTE)));
+    }
+
+}
