From b25e50bdaece5d1eba1eb067284687b00331139d Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 4 Nov 2020 17:41:45 -0500
Subject: [PATCH] Drop API keys from Micrometer configuration.

---
 .../textsecuregcm/WhisperServerService.java               | 5 -----
 .../configuration/MicrometerConfiguration.java            | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index a32121a07..43d65bc54 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -230,11 +230,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
       public String uri() {
         return config.getMicrometerConfiguration().getUri();
       }
-
-      @Override
-      public String apiToken() {
-        return config.getMicrometerConfiguration().getApiKey();
-      }
     }, Clock.SYSTEM) {
       @Override
       protected DistributionStatisticConfig defaultHistogramConfig() {
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 f7a871cb7..fe4589afb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
@@ -14,15 +14,7 @@ public class MicrometerConfiguration {
     @JsonProperty
     private String uri;
 
-    @JsonProperty
-    @NotEmpty
-    private String apiKey;
-
     public String getUri() {
         return uri;
     }
-
-    public String getApiKey() {
-        return apiKey;
-    }
 }