diff --git a/service/pom.xml b/service/pom.xml index ecfe85989..b63469405 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -80,12 +80,6 @@ 1.5.2 - - io.micrometer - micrometer-registry-datadog - 1.5.2 - - io.micrometer micrometer-registry-signalfx @@ -98,12 +92,6 @@ 1.0.4 - - org.coursera - dropwizard-metrics-datadog - 1.1.13 - - com.amazonaws aws-java-sdk-s3 diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index b81d9afb2..106fe7562 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -48,8 +48,6 @@ import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; -import io.micrometer.datadog.DatadogConfig; -import io.micrometer.datadog.DatadogMeterRegistry; import io.micrometer.signalfx.SignalFxConfig; import io.micrometer.wavefront.WavefrontConfig; import io.micrometer.wavefront.WavefrontMeterRegistry; @@ -259,41 +257,6 @@ public class WhisperServerService extends Application getConventionTags(@Nonnull Meter.Id id) { - final List tags = super.getConventionTags(id); - tags.add(new ImmutableTag("environment", micrometerDatadogConfig.getEnvironment())); - return tags; - } - - @Override - protected DistributionStatisticConfig defaultHistogramConfig() { - return DistributionStatisticConfig.builder() - .percentiles(.75, .95, .99, .999) - .build() - .merge(super.defaultHistogramConfig()); - } - }); - } - { final MicrometerConfiguration micrometerSignalfxConfig = micrometerConfigurationByName.get("signalfx"); Metrics.addRegistry(new SignalSignalFxMeterRegistry(new SignalFxConfig() { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalDatadogReporterFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalDatadogReporterFactory.java deleted file mode 100644 index e73c4a847..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalDatadogReporterFactory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.whispersystems.textsecuregcm.metrics; - -import com.amazonaws.util.EC2MetadataUtils; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.ScheduledReporter; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.dropwizard.metrics.BaseReporterFactory; -import org.coursera.metrics.datadog.DatadogReporter; -import org.coursera.metrics.datadog.DefaultMetricNameFormatterFactory; -import org.coursera.metrics.datadog.DynamicTagsCallbackFactory; -import org.coursera.metrics.datadog.MetricNameFormatterFactory; -import org.coursera.metrics.datadog.transport.AbstractTransportFactory; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.EnumSet; -import java.util.List; - -@SuppressWarnings("FieldMayBeFinal") -@JsonTypeName("signaldatadog") -public class SignalDatadogReporterFactory extends BaseReporterFactory { - - @JsonProperty - private List tags = null; - - @Valid - @JsonProperty - private DynamicTagsCallbackFactory dynamicTagsCallback = null; - - @JsonProperty - private String prefix = null; - - @Valid - @NotNull - @JsonProperty - private EnumSet expansions = DatadogReporter.Expansion.ALL; - - @Valid - @NotNull - @JsonProperty - private MetricNameFormatterFactory metricNameFormatter = new DefaultMetricNameFormatterFactory(); - - @Valid - @NotNull - @JsonProperty - private AbstractTransportFactory transport = null; - - public ScheduledReporter build(MetricRegistry registry) { - return DatadogReporter.forRegistry(registry) - .withTransport(transport.build()) - .withHost(EC2MetadataUtils.getInstanceId()) - .withTags(tags) - .withPrefix(prefix) - .withExpansions(expansions) - .withMetricNameFormatter(metricNameFormatter.build()) - .withDynamicTagCallback(dynamicTagsCallback != null ? dynamicTagsCallback.build() : null) - .filter(getFilter()) - .convertDurationsTo(getDurationUnit()) - .convertRatesTo(getRateUnit()) - .build(); - } -} diff --git a/service/src/main/resources/META-INF/services/io.dropwizard.metrics.ReporterFactory b/service/src/main/resources/META-INF/services/io.dropwizard.metrics.ReporterFactory index 1a5808380..a000ec042 100644 --- a/service/src/main/resources/META-INF/services/io.dropwizard.metrics.ReporterFactory +++ b/service/src/main/resources/META-INF/services/io.dropwizard.metrics.ReporterFactory @@ -1,3 +1,2 @@ org.whispersystems.textsecuregcm.metrics.JsonMetricsReporterFactory -org.whispersystems.textsecuregcm.metrics.SignalDatadogReporterFactory org.whispersystems.textsecuregcm.metrics.SignalSignalfxReporterFactory