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

Standardize a utility method for getting local host names.

Browse Source
This commit is contained in:
Jon Chambers
2021-06-09 12:19:53 -04:00
committed by Jon Chambers
parent 827a3af419
commit c634185b6f
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,7 @@ import org.whispersystems.textsecuregcm.storage.UsernamesManager;
import org.whispersystems.textsecuregcm.util.AsnManager;
import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.DynamoDbFromConfig;
import org.whispersystems.textsecuregcm.util.HostnameUtil;
import org.whispersystems.textsecuregcm.util.TorExitNodeManager;
import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
import org.whispersystems.textsecuregcm.websocket.DeadLetterHandler;
@@ -280,21 +281,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
});
{
final String hostname;
{
String localHostName = "unknown";
try {
localHostName = InetAddress.getLocalHost().getHostName().toLowerCase(Locale.US);
log.info("Setting host tag to {}", localHostName);
} catch (final UnknownHostException e) {
log.warn("Failed to get hostname", e);
}
hostname = localHostName;
}
final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(new DatadogConfig() {
@Override
public String get(final String key) {
@@ -320,7 +306,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
datadogMeterRegistry.config().commonTags(
Tags.of(
"service", "chat",
"host", hostname,
"host", HostnameUtil.getLocalHostname(),
"version", WhisperServerVersion.getServerVersion(),
"env", config.getDatadogConfiguration().getEnvironment()))
.meterFilter(MeterFilter.denyNameStartsWith(MetricsRequestEventListener.REQUEST_COUNTER_NAME))