Skip to content

Commit e4d9e00

Browse files
committed
Update SignalDatadogReporterFactory host
1 parent 82b92c4 commit e4d9e00

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

src/main/java/org/signal/storageservice/metrics/SignalDatadogReporterFactory.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import com.fasterxml.jackson.annotation.JsonProperty;
1111
import com.fasterxml.jackson.annotation.JsonTypeName;
1212
import io.dropwizard.metrics.common.BaseReporterFactory;
13-
import java.net.InetAddress;
14-
import java.net.UnknownHostException;
1513
import java.util.ArrayList;
1614
import java.util.EnumSet;
1715
import java.util.List;
@@ -24,6 +22,7 @@
2422
import org.coursera.metrics.datadog.MetricNameFormatterFactory;
2523
import org.coursera.metrics.datadog.transport.AbstractTransportFactory;
2624
import org.signal.storageservice.StorageServiceVersion;
25+
import org.signal.storageservice.util.HostSupplier;
2726

2827
@JsonTypeName("signal-datadog")
2928
public class SignalDatadogReporterFactory extends BaseReporterFactory {
@@ -79,7 +78,7 @@ public ScheduledReporter build(final MetricRegistry registry) {
7978

8079
return DatadogReporter.forRegistry(registry)
8180
.withTransport(transport.build())
82-
.withHost(deriveHost())
81+
.withHost(HostSupplier.getHost())
8382
.withTags(combinedTags)
8483
.withPrefix(prefix)
8584
.withExpansions(expansions)
@@ -90,15 +89,4 @@ public ScheduledReporter build(final MetricRegistry registry) {
9089
.convertRatesTo(getRateUnit())
9190
.build();
9291
}
93-
94-
private String deriveHost() {
95-
if (host != null) {
96-
return host;
97-
}
98-
try {
99-
return InetAddress.getLocalHost().getHostName();
100-
} catch (UnknownHostException e) {
101-
throw new IllegalStateException("unable to calculate some name for local host", e);
102-
}
103-
}
10492
}

0 commit comments

Comments
 (0)