diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java
index fd803d47a..a41742ebd 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java
@@ -1,22 +1,45 @@
 package org.whispersystems.textsecuregcm.metrics;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.dropwizard.jersey.DropwizardResourceConfig;
+import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
+import org.eclipse.jetty.websocket.api.RemoteEndpoint;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.UpgradeRequest;
+import org.glassfish.jersey.server.ApplicationHandler;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.ContainerResponse;
 import org.glassfish.jersey.server.ExtendedUriInfo;
+import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.monitoring.RequestEvent;
 import org.glassfish.jersey.uri.UriTemplate;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.whispersystems.websocket.WebSocketResourceProvider;
+import org.whispersystems.websocket.auth.WebsocketAuthValueFactoryProvider;
+import org.whispersystems.websocket.logging.WebsocketRequestLog;
+import org.whispersystems.websocket.messages.protobuf.ProtobufWebSocketMessageFactory;
+import org.whispersystems.websocket.messages.protobuf.SubProtocol;
+import org.whispersystems.websocket.session.WebSocketSessionContextValueFactoryProvider;
 
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import java.nio.ByteBuffer;
+import java.security.Principal;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Optional;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -96,4 +119,87 @@ public class MetricsRequestEventListenerTest {
 
         assertEquals("/first/second/{param}/{moreDifferentParam}", MetricsRequestEventListener.getPathTemplate(uriInfo));
     }
+
+    @Test
+    public void testActualRouteMessageSuccess() throws InvalidProtocolBufferException {
+        MetricsApplicationEventListener applicationEventListener = mock(MetricsApplicationEventListener.class);
+        when(applicationEventListener.onRequest(any())).thenReturn(listener);
+
+        ResourceConfig resourceConfig = new DropwizardResourceConfig();
+        resourceConfig.register(applicationEventListener);
+        resourceConfig.register(new TestResource());
+        resourceConfig.register(new WebSocketSessionContextValueFactoryProvider.Binder());
+        resourceConfig.register(new WebsocketAuthValueFactoryProvider.Binder<>(TestPrincipal.class));
+        resourceConfig.register(new JacksonMessageBodyProvider(new ObjectMapper()));
+
+        ApplicationHandler                       applicationHandler = new ApplicationHandler(resourceConfig);
+        WebsocketRequestLog                      requestLog         = mock(WebsocketRequestLog.class);
+        WebSocketResourceProvider<TestPrincipal> provider           = new WebSocketResourceProvider<>("127.0.0.1", applicationHandler, requestLog, new TestPrincipal("foo"), new ProtobufWebSocketMessageFactory(), Optional.empty(), 30000);
+
+        Session        session        = mock(Session.class       );
+        RemoteEndpoint remoteEndpoint = mock(RemoteEndpoint.class);
+        UpgradeRequest request        = mock(UpgradeRequest.class);
+
+        when(session.getUpgradeRequest()).thenReturn(request);
+        when(session.getRemote()).thenReturn(remoteEndpoint);
+
+        final ArgumentCaptor<Iterable<Tag>> tagCaptor = ArgumentCaptor.forClass(Iterable.class);
+        when(meterRegistry.counter(eq(MetricsRequestEventListener.COUNTER_NAME), any(Iterable.class))).thenReturn(counter);
+
+        provider.onWebSocketConnect(session);
+
+        byte[] message = new ProtobufWebSocketMessageFactory().createRequest(Optional.of(111L), "GET", "/v1/test/hello", new LinkedList<>(), Optional.empty()).toByteArray();
+
+        provider.onWebSocketBinary(message, 0, message.length);
+
+        ArgumentCaptor<ByteBuffer> responseBytesCaptor = ArgumentCaptor.forClass(ByteBuffer.class);
+        verify(remoteEndpoint).sendBytesByFuture(responseBytesCaptor.capture());
+
+        SubProtocol.WebSocketResponseMessage response = getResponse(responseBytesCaptor);
+
+        assertThat(response.getStatus()).isEqualTo(200);
+
+        verify(meterRegistry).counter(eq(MetricsRequestEventListener.COUNTER_NAME), tagCaptor.capture());
+
+        final Iterable<Tag> tagIterable = tagCaptor.getValue();
+        final Set<Tag> tags = new HashSet<>();
+
+        for (final Tag tag : tagIterable) {
+            tags.add(tag);
+        }
+
+        assertEquals(5, tags.size());
+        assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.PATH_TAG, "/v1/test/hello")));
+        assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.STATUS_CODE_TAG, String.valueOf(200))));
+        assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.TRAFFIC_SOURCE_TAG, TRAFFIC_SOURCE.name().toLowerCase())));
+        assertTrue(tags.containsAll(UserAgentTagUtil.UNRECOGNIZED_TAGS));
+    }
+
+    private static SubProtocol.WebSocketResponseMessage getResponse(ArgumentCaptor<ByteBuffer> responseCaptor) throws InvalidProtocolBufferException {
+        return SubProtocol.WebSocketMessage.parseFrom(responseCaptor.getValue().array()).getResponse();
+    }
+
+    public static class TestPrincipal implements Principal {
+
+        private final String name;
+
+        private TestPrincipal(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+    }
+
+    @Path("/v1/test")
+    public static class TestResource {
+
+        @GET
+        @Path("/hello")
+        public String testGetHello() {
+            return "Hello!";
+        }
+    }
 }