diff --git a/service/config/sample.yml b/service/config/sample.yml index 9f2aa44aa..daaec66ef 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -156,10 +156,6 @@ cdn: bucket: # S3 Bucket name region: # AWS region -wavefront: # Wavefront micrometer metrics config - uri: # Wavefront proxy endpoint - batchSize: # Number of measurements to send per request - datadog: apiKey: environment: diff --git a/service/pom.xml b/service/pom.xml index 0aa52a27c..e58ab7e02 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -231,10 +231,6 @@ io.micrometer micrometer-core - - io.micrometer - micrometer-registry-wavefront - io.micrometer micrometer-registry-datadog diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index 9ae4ddd29..4b269de6c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -47,7 +47,6 @@ import org.whispersystems.textsecuregcm.configuration.TurnConfiguration; import org.whispersystems.textsecuregcm.configuration.TwilioConfiguration; import org.whispersystems.textsecuregcm.configuration.UnidentifiedDeliveryConfiguration; import org.whispersystems.textsecuregcm.configuration.VoiceVerificationConfiguration; -import org.whispersystems.textsecuregcm.configuration.WavefrontConfiguration; import org.whispersystems.textsecuregcm.configuration.ZkConfig; import org.whispersystems.websocket.configuration.WebSocketConfiguration; @@ -79,11 +78,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private CdnConfiguration cdn; - @NotNull - @Valid - @JsonProperty - private WavefrontConfiguration wavefront; - @NotNull @Valid @JsonProperty @@ -438,10 +432,6 @@ public class WhisperServerConfiguration extends Configuration { return cdn; } - public WavefrontConfiguration getWavefrontConfiguration() { - return wavefront; - } - public DatadogConfiguration getDatadogConfiguration() { return datadog; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index 9ed0db953..3c427977f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -36,8 +36,6 @@ import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; import io.micrometer.datadog.DatadogMeterRegistry; -import io.micrometer.wavefront.WavefrontConfig; -import io.micrometer.wavefront.WavefrontMeterRegistry; import java.net.http.HttpClient; import java.time.Duration; import java.util.ArrayList; @@ -262,30 +260,6 @@ public class WhisperServerService extends Application disabledMetricAttributes) - throws UnknownHostException - { - super(registry, "json-reporter", filter, rateUnit, durationUnit, Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("json-reporter")), true, disabledMetricAttributes); - this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_2).build(); - this.uri = UriBuilder.fromUri(uri).queryParam("h", HostnameUtil.getLocalHostname()).build(); - } - - @Override - public void report(SortedMap stringGaugeSortedMap, - SortedMap stringCounterSortedMap, - SortedMap stringHistogramSortedMap, - SortedMap stringMeterSortedMap, - SortedMap stringTimerSortedMap) - { - try { - logger.debug("Reporting metrics..."); - - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - JsonGenerator json = factory.createGenerator(outputStream, JsonEncoding.UTF8); - - json.writeStartObject(); - - for (Map.Entry gauge : stringGaugeSortedMap.entrySet()) { - reportGauge(json, gauge.getKey(), gauge.getValue()); - } - - for (Map.Entry counter : stringCounterSortedMap.entrySet()) { - reportCounter(json, counter.getKey(), counter.getValue()); - } - - for (Map.Entry histogram : stringHistogramSortedMap.entrySet()) { - reportHistogram(json, histogram.getKey(), histogram.getValue()); - } - - for (Map.Entry meter : stringMeterSortedMap.entrySet()) { - reportMeter(json, meter.getKey(), meter.getValue()); - } - - for (Map.Entry timer : stringTimerSortedMap.entrySet()) { - reportTimer(json, timer.getKey(), timer.getValue()); - } - - json.writeEndObject(); - json.close(); - - outputStream.close(); - - HttpRequest request = HttpRequest.newBuilder() - .uri(uri) - .POST(HttpRequest.BodyPublishers.ofByteArray(outputStream.toByteArray())) - .header("Content-Type", "application/json") - .build(); - - HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.discarding()); - - logger.debug("Metrics server response: " + response.statusCode()); - } catch (IOException e) { - logger.warn("Error sending metrics", e); - } catch (Exception e) { - logger.warn("error", e); - } - } - - private void reportGauge(JsonGenerator json, String name, Gauge gauge) throws IOException { - Object gaugeValue = evaluateGauge(gauge); - - if (gaugeValue instanceof Number) { - json.writeFieldName(sanitize(name)); - json.writeObject(gaugeValue); - } - } - - private void reportCounter(JsonGenerator json, String name, Counter counter) throws IOException { - json.writeFieldName(sanitize(name)); - json.writeNumber(counter.getCount()); - } - - private void reportHistogram(JsonGenerator json, String name, Histogram histogram) throws IOException { - Snapshot snapshot = histogram.getSnapshot(); - json.writeFieldName(sanitize(name)); - json.writeStartObject(); - json.writeNumberField("count", histogram.getCount()); - writeSnapshot(json, snapshot); - json.writeEndObject(); - } - - private void reportMeter(JsonGenerator json, String name, Meter meter) throws IOException { - json.writeFieldName(sanitize(name)); - json.writeStartObject(); - writeMetered(json, meter); - json.writeEndObject(); - } - - private void reportTimer(JsonGenerator json, String name, Timer timer) throws IOException { - json.writeFieldName(sanitize(name)); - json.writeStartObject(); - json.writeFieldName("rate"); - json.writeStartObject(); - writeMetered(json, timer); - json.writeEndObject(); - json.writeFieldName("duration"); - json.writeStartObject(); - writeTimedSnapshot(json, timer.getSnapshot()); - json.writeEndObject(); - json.writeEndObject(); - } - - private Object evaluateGauge(Gauge gauge) { - try { - return gauge.getValue(); - } catch (RuntimeException e) { - logger.warn("Error reading gauge", e); - return "error reading gauge"; - } - } - - private void writeTimedSnapshot(JsonGenerator json, Snapshot snapshot) throws IOException { - if (!getDisabledMetricAttributes().contains(MetricAttribute.MAX)) { - json.writeNumberField("max", convertDuration(snapshot.getMax())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.MEAN)) { - json.writeNumberField("mean", convertDuration(snapshot.getMean())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.MIN)) { - json.writeNumberField("min", convertDuration(snapshot.getMin())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.STDDEV)) { - json.writeNumberField("stddev", convertDuration(snapshot.getStdDev())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P50)) { - json.writeNumberField("median", convertDuration(snapshot.getMedian())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P75)) { - json.writeNumberField("p75", convertDuration(snapshot.get75thPercentile())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P95)) { - json.writeNumberField("p95", convertDuration(snapshot.get95thPercentile())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P98)) { - json.writeNumberField("p98", convertDuration(snapshot.get98thPercentile())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P99)) { - json.writeNumberField("p99", convertDuration(snapshot.get99thPercentile())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P999)) { - json.writeNumberField("p999", convertDuration(snapshot.get999thPercentile())); - } - } - - private void writeSnapshot(JsonGenerator json, Snapshot snapshot) throws IOException { - if (!getDisabledMetricAttributes().contains(MetricAttribute.MAX)) { - json.writeNumberField("max", snapshot.getMax()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.MEAN)) { - json.writeNumberField("mean", snapshot.getMean()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.MIN)) { - json.writeNumberField("min", snapshot.getMin()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.STDDEV)) { - json.writeNumberField("stddev", snapshot.getStdDev()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P50)) { - json.writeNumberField("median", snapshot.getMedian()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P75)) { - json.writeNumberField("p75", snapshot.get75thPercentile()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P95)) { - json.writeNumberField("p95", snapshot.get95thPercentile()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P98)) { - json.writeNumberField("p98", snapshot.get98thPercentile()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P99)) { - json.writeNumberField("p99", snapshot.get99thPercentile()); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.P999)) { - json.writeNumberField("p999", snapshot.get999thPercentile()); - } - } - - private void writeMetered(JsonGenerator json, Metered meter) throws IOException { - if (!getDisabledMetricAttributes().contains(MetricAttribute.COUNT)) { - json.writeNumberField("count", convertRate(meter.getCount())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.MEAN_RATE)) { - json.writeNumberField("mean", convertRate(meter.getMeanRate())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.M1_RATE)) { - json.writeNumberField("m1", convertRate(meter.getOneMinuteRate())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.M5_RATE)) { - json.writeNumberField("m5", convertRate(meter.getFiveMinuteRate())); - } - - if (!getDisabledMetricAttributes().contains(MetricAttribute.M15_RATE)) { - json.writeNumberField("m15", convertRate(meter.getFifteenMinuteRate())); - } - } - - private String sanitize(String metricName) { - return SIMPLE_NAMES.matcher(metricName).replaceAll("_"); - } - - public static Builder forRegistry(MetricRegistry registry) { - return new Builder(registry); - } - - public static class Builder { - - private final MetricRegistry registry; - private MetricFilter filter = MetricFilter.ALL; - private Set disabledMetricAttributes = Collections.emptySet(); - private TimeUnit rateUnit = TimeUnit.SECONDS; - private TimeUnit durationUnit = TimeUnit.MILLISECONDS; - private URI uri; - - private Builder(MetricRegistry registry) { - this.registry = registry; - } - - public Builder convertRatesTo(TimeUnit rateUnit) { - this.rateUnit = rateUnit; - return this; - } - - public Builder convertDurationsTo(TimeUnit durationUnit) { - this.durationUnit = durationUnit; - return this; - } - - public Builder filter(MetricFilter filter) { - this.filter = filter; - return this; - } - - public Builder disabledMetricAttributes(Set disabledMetricAttributes) { - this.disabledMetricAttributes = disabledMetricAttributes; - return this; - } - - public Builder withUri(URI uri) { - this.uri = uri; - return this; - } - - public JsonMetricsReporter build() throws UnknownHostException { - if (uri == null) { - throw new IllegalArgumentException("No URI specified!"); - } - - return new JsonMetricsReporter(registry, uri, filter, rateUnit, durationUnit, disabledMetricAttributes); - } - } -} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/JsonMetricsReporterFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/JsonMetricsReporterFactory.java deleted file mode 100644 index bb2600d3a..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/JsonMetricsReporterFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2013-2020 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.whispersystems.textsecuregcm.metrics; - -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.ScheduledReporter; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeName; - -import javax.validation.constraints.NotNull; -import java.net.URI; -import java.net.UnknownHostException; - -import io.dropwizard.metrics.BaseReporterFactory; - -@JsonTypeName("json") -public class JsonMetricsReporterFactory extends BaseReporterFactory { - - @JsonProperty - @NotNull - private URI uri; - - @Override - public ScheduledReporter build(MetricRegistry metricRegistry) { - try { - return JsonMetricsReporter.forRegistry(metricRegistry) - .withUri(uri) - .convertRatesTo(getRateUnit()) - .convertDurationsTo(getDurationUnit()) - .filter(getFilter()) - .disabledMetricAttributes(getDisabledAttributes()) - .build(); - } catch (UnknownHostException e) { - throw new IllegalArgumentException(e); - } - } -} 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 be127b6fd..c6b835054 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,2 +1 @@ -org.whispersystems.textsecuregcm.metrics.JsonMetricsReporterFactory org.whispersystems.textsecuregcm.metrics.SignalDatadogReporterFactory