Submit Micrometer metrics via dogstatsd instead of the Datadog API

service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java

@@ -1,62 +0,0 @@
-/*
- * Copyright 2013 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.configuration;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.micrometer.datadog.DatadogConfig;
-import java.time.Duration;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import org.whispersystems.textsecuregcm.configuration.secrets.SecretString;
-
-public class DatadogConfiguration implements DatadogConfig {
-
-  @JsonProperty
-  @NotNull
-  private SecretString apiKey;
-
-  @JsonProperty
-  @NotNull
-  private Duration step = Duration.ofSeconds(10);
-
-  @JsonProperty
-  @NotBlank
-  private String environment;
-
-  @JsonProperty
-  @Min(1)
-  private int batchSize = 5_000;
-
-  @Override
-  public String apiKey() {
-    return apiKey.value();
-  }
-
-  @Override
-  public Duration step() {
-    return step;
-  }
-
-  public String getEnvironment() {
-    return environment;
-  }
-
-  @Override
-  public int batchSize() {
-    return batchSize;
-  }
-
-  @Override
-  public String hostTag() {
-    return "host";
-  }
-
-  @Override
-  public String get(final String key) {
-    return null;
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/configuration/DogstatsdConfiguration.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.configuration;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.micrometer.statsd.StatsdConfig;
+import io.micrometer.statsd.StatsdFlavor;
+import java.time.Duration;
+import javax.validation.constraints.NotNull;
+
+public class DogstatsdConfiguration implements StatsdConfig {
+
+  @JsonProperty
+  @NotNull
+  private Duration step = Duration.ofSeconds(10);
+
+  @Override
+  public Duration step() {
+    return step;
+  }
+
+  @Override
+  public StatsdFlavor flavor() {
+    return StatsdFlavor.DATADOG;
+  }
+
+  @Override
+  public String get(final String key) {
+    // We have no Micrometer key/value pairs to report, so always return `null`
+    return null;
+  }
+}