Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 15:18:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of MDC with custom fields on the appender

Browse Source
This commit is contained in:
Ehren Kret
2021-05-11 14:08:20 -05:00
parent 09e0934eaf
commit 02d06af3fc
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -43,8 +43,6 @@ import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.wavefront.WavefrontConfig;
import io.micrometer.wavefront.WavefrontMeterRegistry;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.time.Duration;
import java.util.ArrayList;
@@ -67,7 +65,6 @@ import org.jdbi.v3.core.Jdbi;
import org.signal.zkgroup.ServerSecretParams;
import org.signal.zkgroup.auth.ServerZkAuthOperations;
import org.signal.zkgroup.profiles.ServerZkProfileOperations;
import org.slf4j.MDC;
import org.whispersystems.dispatch.DispatchManager;
import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
import org.whispersystems.textsecuregcm.auth.CertificateGenerator;
@@ -231,14 +228,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
@Override
public void run(WhisperServerConfiguration config, Environment environment)
throws Exception {
try {
MDC.put("host", InetAddress.getLocalHost().getHostName());
} catch (UnknownHostException e) {
MDC.put("host", "unknown");
}
MDC.put("service", "chat");
MDC.put("ddsource", "logstash");
MDC.put("ddtags", "env:" + config.getEnvironment());
SharedMetricRegistries.add(Constants.METRICS_NAME, environment.metrics());
final WavefrontConfig wavefrontConfig = new WavefrontConfig() {