From e52b8c8423c2ddb73771aa493c016028abe673d6 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Wed, 30 Jun 2021 16:49:04 -0500
Subject: [PATCH] Implement DatadogConfig in DatadogConfiguration

---
 .../textsecuregcm/WhisperServerService.java   | 28 +------------------
 .../configuration/DatadogConfiguration.java   | 22 ++++++++++++---
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 1106d9b75..dfae28c7d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -35,7 +35,6 @@ import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.datadog.DatadogConfig;
 import io.micrometer.datadog.DatadogMeterRegistry;
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
@@ -282,32 +281,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     });
 
     {
-      final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(new DatadogConfig() {
-        @Override
-        public String get(final String key) {
-          return null;
-        }
-
-        @Override
-        public String apiKey() {
-          return config.getDatadogConfiguration().getApiKey();
-        }
-
-        @Override
-        public Duration step() {
-          return config.getDatadogConfiguration().getStep();
-        }
-
-        @Override
-        public int batchSize() {
-          return config.getDatadogConfiguration().getBatchSize();
-        }
-
-        @Override
-        public String hostTag() {
-          return "host";
-        }
-      }, Clock.SYSTEM);
+      final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(config.getDatadogConfiguration(), Clock.SYSTEM);
 
       datadogMeterRegistry.config().commonTags(
           Tags.of(
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java
index f8f760beb..bed91c501 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java
@@ -6,12 +6,13 @@
 package org.whispersystems.textsecuregcm.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.micrometer.datadog.DatadogConfig;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.Duration;
 
-public class DatadogConfiguration {
+public class DatadogConfiguration implements DatadogConfig {
 
   @JsonProperty
   @NotBlank
@@ -29,11 +30,13 @@ public class DatadogConfiguration {
   @Min(1)
   private int batchSize = 5_000;
 
-  public String getApiKey() {
+  @Override
+  public String apiKey() {
     return apiKey;
   }
 
-  public Duration getStep() {
+  @Override
+  public Duration step() {
     return step;
   }
 
@@ -41,7 +44,18 @@ public class DatadogConfiguration {
     return environment;
   }
 
-  public int getBatchSize() {
+  @Override
+  public int batchSize() {
     return batchSize;
   }
+
+  @Override
+  public String hostTag() {
+    return "host";
+  }
+
+  @Override
+  public String get(final String key) {
+    return null;
+  }
 }