diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index 8db2d9c88..b81d9afb2 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -311,6 +311,11 @@ public class WhisperServerService extends Application getConventionTags(@Nonnull Meter.Id id) { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalSignalfxReporterFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalSignalfxReporterFactory.java index c44c8eb6d..2d3b29cee 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalSignalfxReporterFactory.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalSignalfxReporterFactory.java @@ -6,6 +6,7 @@ import com.codahale.metrics.ScheduledReporter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.signalfx.codahale.reporter.SignalFxReporter; +import com.signalfx.endpoint.SignalFxEndpoint; import com.signalfx.metrics.auth.StaticAuthToken; import io.dropwizard.metrics.BaseReporterFactory; @@ -22,9 +23,14 @@ public class SignalSignalfxReporterFactory extends BaseReporterFactory { @NotEmpty private String environment = null; + @JsonProperty + @NotEmpty + private String hostname = null; + public ScheduledReporter build(MetricRegistry registry) { return new SignalFxReporter.Builder(registry, new StaticAuthToken(authToken), EC2MetadataUtils.getInstanceId()) .addDimension("environment", environment) + .setEndpoint(new SignalFxEndpoint(SignalFxEndpoint.DEFAULT_SCHEME, hostname, SignalFxEndpoint.DEFAULT_PORT)) .setFilter(getFilter()) .setDurationUnit(getDurationUnit()) .setRateUnit(getRateUnit())