MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Override default ingestion URI for SignalFx (#131)

This commit is contained in:
Ehren Kret 2020-08-07 15:29:42 -05:00 committed by GitHub
parent 91086d004c
commit 4b7e48d3ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,6 +311,11 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
public String source() { public String source() {
return instanceId; return instanceId;
} }
@Override
public String uri() {
return micrometerSignalfxConfig.getUri();
}
}, Clock.SYSTEM) { }, Clock.SYSTEM) {
@Override @Override
protected List<Tag> getConventionTags(@Nonnull Meter.Id id) { protected List<Tag> getConventionTags(@Nonnull Meter.Id id) {

6
service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalSignalfxReporterFactory.java
View File

@ -6,6 +6,7 @@ import com.codahale.metrics.ScheduledReporter;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonTypeName;
import com.signalfx.codahale.reporter.SignalFxReporter; import com.signalfx.codahale.reporter.SignalFxReporter;
import com.signalfx.endpoint.SignalFxEndpoint;
import com.signalfx.metrics.auth.StaticAuthToken; import com.signalfx.metrics.auth.StaticAuthToken;
import io.dropwizard.metrics.BaseReporterFactory; import io.dropwizard.metrics.BaseReporterFactory;
@ -22,9 +23,14 @@ public class SignalSignalfxReporterFactory extends BaseReporterFactory {
@NotEmpty @NotEmpty
private String environment = null; private String environment = null;
@JsonProperty
@NotEmpty
private String hostname = null;
public ScheduledReporter build(MetricRegistry registry) { public ScheduledReporter build(MetricRegistry registry) {
return new SignalFxReporter.Builder(registry, new StaticAuthToken(authToken), EC2MetadataUtils.getInstanceId()) return new SignalFxReporter.Builder(registry, new StaticAuthToken(authToken), EC2MetadataUtils.getInstanceId())
.addDimension("environment", environment) .addDimension("environment", environment)
.setEndpoint(new SignalFxEndpoint(SignalFxEndpoint.DEFAULT_SCHEME, hostname, SignalFxEndpoint.DEFAULT_PORT))
.setFilter(getFilter()) .setFilter(getFilter())
.setDurationUnit(getDurationUnit()) .setDurationUnit(getDurationUnit())
.setRateUnit(getRateUnit()) .setRateUnit(getRateUnit())