From acbe410e0b477d42e6c6107e62b34a29269ccead Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 27 Jul 2020 12:35:54 -0400
Subject: [PATCH] Remove a metric aggregator.

---
 service/pom.xml                               | 25 -------------------
 .../textsecuregcm/WhisperServerService.java   | 18 -------------
 2 files changed, 43 deletions(-)

diff --git a/service/pom.xml b/service/pom.xml
index 3120e2a01..7d848486a 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -80,31 +80,6 @@
             <version>1.5.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.newrelic.telemetry</groupId>
-            <artifactId>micrometer-registry-new-relic</artifactId>
-            <version>0.5.0</version>
-
-            <exclusions>
-                <exclusion>
-                    <groupId>com.newrelic.telemetry</groupId>
-                    <artifactId>telemetry</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.newrelic.telemetry</groupId>
-            <artifactId>telemetry-http-okhttp</artifactId>
-            <version>0.6.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.newrelic.telemetry</groupId>
-            <artifactId>dropwizard-metrics-newrelic</artifactId>
-            <version>0.5.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 29f877b9e..13418fbc9 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -43,9 +43,7 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.RedisClusterClient;
-import io.micrometer.NewRelicRegistryConfig;
 import io.micrometer.core.instrument.Metrics;
-import io.micrometer.newrelic.NewRelicRegistry;
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -248,22 +246,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
                                                 .build());
     }
 
-    {
-      final MicrometerConfiguration micrometerNewRelicConfig = micrometerConfigurationByName.get("newrelic");
-
-      Metrics.addRegistry(NewRelicRegistry.builder(new NewRelicRegistryConfig() {
-        @Override
-        public String get(final String key) {
-          return null;
-        }
-
-        @Override
-        public String apiKey() {
-          return micrometerNewRelicConfig.getApiKey();
-        }
-      }).build());
-    }
-
     environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     environment.getObjectMapper().setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
     environment.getObjectMapper().setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);