Add MetricHttpChannelListener

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -157,6 +157,7 @@ import org.whispersystems.textsecuregcm.mappers.RegistrationServiceSenderExcepti
 import org.whispersystems.textsecuregcm.mappers.ServerRejectedExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.SubscriptionProcessorExceptionMapper;
 import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener;
+import org.whispersystems.textsecuregcm.metrics.MetricsHttpChannelListener;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.metrics.ReportedMessageMetricsListener;
 import org.whispersystems.textsecuregcm.metrics.TrafficSource;
@@ -180,7 +181,6 @@ import org.whispersystems.textsecuregcm.securestorage.SecureStorageClient;
 import org.whispersystems.textsecuregcm.securevaluerecovery.SecureValueRecovery2Client;
 import org.whispersystems.textsecuregcm.spam.FilterSpam;
 import org.whispersystems.textsecuregcm.spam.PushChallengeConfigProvider;
-import org.whispersystems.textsecuregcm.spam.RateLimitChallengeListener;
 import org.whispersystems.textsecuregcm.spam.ReportSpamTokenProvider;
 import org.whispersystems.textsecuregcm.spam.ScoreThresholdProvider;
 import org.whispersystems.textsecuregcm.spam.SenderOverrideProvider;
@@ -792,6 +792,9 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             .setAuthenticator(accountAuthenticator)
             .buildAuthFilter();
 
+    final MetricsHttpChannelListener metricsHttpChannelListener = new MetricsHttpChannelListener(clientReleaseManager);
+    metricsHttpChannelListener.configure(environment);
+
     environment.jersey().register(new VirtualExecutorServiceProvider("managed-async-virtual-thread-"));
     environment.jersey().register(new RequestStatisticsFilter(TrafficSource.HTTP));
     environment.jersey().register(MultiRecipientMessageProvider.class);

service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsHttpChannelListener.java

@@ -0,0 +1,159 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.metrics;
+
+import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.net.HttpHeaders;
+import io.dropwizard.core.setup.Environment;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Tags;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.util.component.Container;
+import org.eclipse.jetty.util.component.LifeCycle;
+import org.glassfish.jersey.server.ExtendedUriInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
+import org.whispersystems.textsecuregcm.util.logging.UriInfoUtil;
+
+/**
+ * Gathers and reports HTTP request metrics at the Jetty container level, which sits above Jersey. In order to get
+ * templated Jersey request paths, it implements {@link javax.ws.rs.container.ContainerRequestFilter}, in order to
+ * give itself access to the template. It is limited to {@link TrafficSource#HTTP} requests.
+ * <p>
+ * It implements {@link LifeCycle.Listener} without overriding methods, so that it can be an event listener that
+ * Dropwizard will attach to the container&mdash;the {@link Container.Listener} implementation is where it attaches
+ * itself to any {@link Connector}s.
+ *
+ * @see MetricsRequestEventListener
+ */
+public class MetricsHttpChannelListener implements HttpChannel.Listener, Container.Listener, LifeCycle.Listener,
+    ContainerRequestFilter {
+
+  private static final Logger logger = LoggerFactory.getLogger(MetricsHttpChannelListener.class);
+
+  private record RequestInfo(String path, String method, int statusCode, @Nullable String userAgent) {
+
+  }
+
+  private final ClientReleaseManager clientReleaseManager;
+
+  public static final String REQUEST_COUNTER_NAME = name(MetricsHttpChannelListener.class, "request");
+  public static final String REQUESTS_BY_VERSION_COUNTER_NAME = name(MetricsHttpChannelListener.class,
+      "requestByVersion");
+  @VisibleForTesting
+  static final String URI_INFO_PROPERTY_NAME = MetricsHttpChannelListener.class.getName() + ".uriInfo";
+
+  @VisibleForTesting
+  static final String PATH_TAG = "path";
+
+  @VisibleForTesting
+  static final String METHOD_TAG = "method";
+
+  @VisibleForTesting
+  static final String STATUS_CODE_TAG = "status";
+
+  @VisibleForTesting
+  static final String TRAFFIC_SOURCE_TAG = "trafficSource";
+
+  private final MeterRegistry meterRegistry;
+
+
+  public MetricsHttpChannelListener(final ClientReleaseManager clientReleaseManager) {
+    this(Metrics.globalRegistry, clientReleaseManager);
+  }
+
+  @VisibleForTesting
+  MetricsHttpChannelListener(final MeterRegistry meterRegistry, final ClientReleaseManager clientReleaseManager) {
+    this.meterRegistry = meterRegistry;
+    this.clientReleaseManager = clientReleaseManager;
+  }
+
+  public void configure(final Environment environment) {
+    // register as ContainerRequestFilter
+    environment.jersey().register(this);
+
+    // hook into lifecycle events, to react to the Connector being added
+    environment.lifecycle().addEventListener(this);
+  }
+
+  @Override
+  public void onRequestFailure(final Request request, final Throwable failure) {
+    final RequestInfo requestInfo = getRequestInfo(request);
+
+    logger.warn("Request failure: {} {} ({}) [{}] ",
+        requestInfo.method(),
+        requestInfo.path(),
+        requestInfo.userAgent(),
+        requestInfo.statusCode(), failure);
+  }
+
+  @Override
+  public void onComplete(final Request request) {
+
+    final RequestInfo requestInfo = getRequestInfo(request);
+
+    final List<Tag> tags = new ArrayList<>(5);
+    tags.add(Tag.of(PATH_TAG, requestInfo.path()));
+    tags.add(Tag.of(METHOD_TAG, requestInfo.method()));
+    tags.add(Tag.of(STATUS_CODE_TAG, String.valueOf(requestInfo.statusCode())));
+    tags.add(Tag.of(TRAFFIC_SOURCE_TAG, TrafficSource.HTTP.name().toLowerCase()));
+
+    final Tag platformTag = UserAgentTagUtil.getPlatformTag(requestInfo.userAgent());
+    tags.add(platformTag);
+
+    meterRegistry.counter(REQUEST_COUNTER_NAME, tags).increment();
+
+    UserAgentTagUtil.getClientVersionTag(requestInfo.userAgent(), clientReleaseManager).ifPresent(
+        clientVersionTag -> meterRegistry.counter(REQUESTS_BY_VERSION_COUNTER_NAME,
+            Tags.of(clientVersionTag, platformTag)).increment());
+  }
+
+  @Override
+  public void beanAdded(final Container parent, final Object child) {
+    if (child instanceof Connector connector) {
+      connector.addBean(this);
+    }
+  }
+
+  @Override
+  public void beanRemoved(final Container parent, final Object child) {
+
+  }
+
+  @Override
+  public void filter(final ContainerRequestContext requestContext) throws IOException {
+    requestContext.setProperty(URI_INFO_PROPERTY_NAME, requestContext.getUriInfo());
+  }
+
+  private RequestInfo getRequestInfo(Request request) {
+    final String path = Optional.ofNullable(request.getAttribute(URI_INFO_PROPERTY_NAME))
+        .map(attr -> UriInfoUtil.getPathTemplate((ExtendedUriInfo) attr))
+        .orElse("unknown");
+    final String method = Optional.ofNullable(request.getMethod()).orElse("unknown");
+    // Response cannot be null, but its status might not always reflect an actual response status, since it gets
+    // initialized to 200
+    final int status = request.getResponse().getStatus();
+
+    @Nullable final String userAgent = request.getHeader(HttpHeaders.USER_AGENT);
+
+    return new RequestInfo(path, method, status, userAgent);
+  }
+
+}