Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 02:08:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate between websocket and "boring" HTTP traffic.

Browse Source
This commit is contained in:
Jon Chambers
2020-05-27 17:36:04 -04:00
committed by Jon Chambers
parent f18ab9e5cc
commit 228ffcbfce
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,11 @@ import org.glassfish.jersey.server.monitoring.RequestEventListener;
*/
public class MetricsApplicationEventListener implements ApplicationEventListener {
private final MetricsRequestEventListener metricsRequestEventListener = new MetricsRequestEventListener();
private final MetricsRequestEventListener metricsRequestEventListener;
public MetricsApplicationEventListener(final TrafficSource trafficSource) {
this.metricsRequestEventListener = new MetricsRequestEventListener(trafficSource);
}
@Override
public void onEvent(final ApplicationEvent event) {

20
service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListener.java
View File

@@ -17,19 +17,22 @@ import java.util.List;
*/
class MetricsRequestEventListener implements RequestEventListener {
static final String COUNTER_NAME = MetricRegistry.name(MetricsRequestEventListener.class, "request");
static final String COUNTER_NAME = MetricRegistry.name(MetricsRequestEventListener.class, "request");
static final String PATH_TAG = "path";
static final String STATUS_CODE_TAG = "status";
static final String PATH_TAG = "path";
static final String STATUS_CODE_TAG = "status";
static final String TRAFFIC_SOURCE_TAG = "trafficSource";
private final MeterRegistry meterRegistry;
private final TrafficSource trafficSource;
private final MeterRegistry meterRegistry;
public MetricsRequestEventListener() {
this(Metrics.globalRegistry);
public MetricsRequestEventListener(final TrafficSource trafficSource) {
this(trafficSource, Metrics.globalRegistry);
}
@VisibleForTesting
MetricsRequestEventListener(final MeterRegistry meterRegistry) {
MetricsRequestEventListener(final TrafficSource trafficSource, final MeterRegistry meterRegistry) {
this.trafficSource = trafficSource;
this.meterRegistry = meterRegistry;
}
@@ -37,9 +40,10 @@ class MetricsRequestEventListener implements RequestEventListener {
public void onEvent(final RequestEvent event) {
if (event.getType() == RequestEvent.Type.FINISHED) {
if (!event.getUriInfo().getMatchedTemplates().isEmpty()) {
final List<Tag> tags = new ArrayList<>(4);
final List<Tag> tags = new ArrayList<>(5);
tags.add(Tag.of(PATH_TAG, getPathTemplate(event.getUriInfo())));
tags.add(Tag.of(STATUS_CODE_TAG, String.valueOf(event.getContainerResponse().getStatus())));
tags.add(Tag.of(TRAFFIC_SOURCE_TAG, trafficSource.name().toLowerCase()));
event.getContainerRequest().getRequestHeader("User-Agent")
.stream()

6
service/src/main/java/org/whispersystems/textsecuregcm/metrics/TrafficSource.java Normal file
View File

@@ -0,0 +1,6 @@
package org.whispersystems.textsecuregcm.metrics;
public enum TrafficSource {
HTTP,
WEBSOCKET
}