From 33a0c4a9aed00da9d903f5fe570ec8ccfb756fb1 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 24 Jul 2020 17:02:01 -0400
Subject: [PATCH] Use first party metric aggregator libraries where possible.

---
 service/pom.xml                                    |  4 ++--
 .../textsecuregcm/WhisperServerService.java        | 14 ++++----------
 .../configuration/MicrometerConfiguration.java     |  7 -------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/service/pom.xml b/service/pom.xml
index e83ec0cb3..b27ac8c71 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -81,9 +81,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.micrometer</groupId>
+            <groupId>com.newrelic.telemetry</groupId>
             <artifactId>micrometer-registry-new-relic</artifactId>
-            <version>1.5.2</version>
+            <version>0.5.0</version>
         </dependency>
 
         <dependency>
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 606678859..29f877b9e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -43,10 +43,9 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.RedisClusterClient;
-import io.micrometer.core.instrument.Clock;
+import io.micrometer.NewRelicRegistryConfig;
 import io.micrometer.core.instrument.Metrics;
-import io.micrometer.newrelic.NewRelicConfig;
-import io.micrometer.newrelic.NewRelicMeterRegistry;
+import io.micrometer.newrelic.NewRelicRegistry;
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -252,22 +251,17 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     {
       final MicrometerConfiguration micrometerNewRelicConfig = micrometerConfigurationByName.get("newrelic");
 
-      Metrics.addRegistry(new NewRelicMeterRegistry(new NewRelicConfig() {
+      Metrics.addRegistry(NewRelicRegistry.builder(new NewRelicRegistryConfig() {
         @Override
         public String get(final String key) {
           return null;
         }
 
-        @Override
-        public String accountId() {
-          return micrometerNewRelicConfig.getAccountId();
-        }
-
         @Override
         public String apiKey() {
           return micrometerNewRelicConfig.getApiKey();
         }
-      }, Clock.SYSTEM));
+      }).build());
     }
 
     environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
index e1df62171..58dba6654 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
@@ -18,9 +18,6 @@ public class MicrometerConfiguration {
     @NotEmpty
     private String apiKey;
 
-    @JsonProperty
-    private String accountId;
-
     public String getName() {
         return name;
     }
@@ -32,8 +29,4 @@ public class MicrometerConfiguration {
     public String getApiKey() {
         return apiKey;
     }
-
-    public String getAccountId() {
-        return accountId;
-    }
 }