From 764b200289734ac4feeeaf05bdb6a5d4e3e2740b Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Mon, 30 Sep 2024 17:14:50 -0400 Subject: [PATCH] Clarify open websocket gauge name --- .../websocket/AuthenticatedConnectListener.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java index 9b7356d98..25520f43e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java @@ -39,10 +39,9 @@ import reactor.core.scheduler.Scheduler; public class AuthenticatedConnectListener implements WebSocketConnectListener { - private static final String OPEN_WEBSOCKET_COUNTER_NAME = - name(WebSocketConnection.class, "openWebsockets"); - private static final String CONNECTED_DURATION_TIMER_NAME = name(AuthenticatedConnectListener.class, - "connectedDuration"); + private static final String OPEN_WEBSOCKET_GAUGE_NAME = name(WebSocketConnection.class, "openWebsockets"); + private static final String CONNECTED_DURATION_TIMER_NAME = + name(AuthenticatedConnectListener.class, "connectedDuration"); private static final String AUTHENTICATED_TAG_NAME = "authenticated"; @@ -105,10 +104,10 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener { openUnauthenticatedWebsocketsByClientPlatform.put(clientPlatform, new AtomicInteger(0)); final Tags clientPlatformTag = Tags.of(UserAgentTagUtil.PLATFORM_TAG, clientPlatform.name().toLowerCase()); - Metrics.gauge(OPEN_WEBSOCKET_COUNTER_NAME, clientPlatformTag.and(authenticatedTag), + Metrics.gauge(OPEN_WEBSOCKET_GAUGE_NAME, clientPlatformTag.and(authenticatedTag), openAuthenticatedWebsocketsByClientPlatform.get(clientPlatform)); - Metrics.gauge(OPEN_WEBSOCKET_COUNTER_NAME, clientPlatformTag.and(unauthenticatedTag), + Metrics.gauge(OPEN_WEBSOCKET_GAUGE_NAME, clientPlatformTag.and(unauthenticatedTag), openUnauthenticatedWebsocketsByClientPlatform.get(clientPlatform)); durationTimersByClientPlatform.put(clientPlatform, @@ -122,10 +121,10 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener { openUnauthenticatedWebsocketsFromUnknownPlatforms = new AtomicInteger(0); final Tags unrecognizedPlatform = Tags.of(UserAgentTagUtil.PLATFORM_TAG, "unrecognized"); - Metrics.gauge(OPEN_WEBSOCKET_COUNTER_NAME, unrecognizedPlatform.and(authenticatedTag), + Metrics.gauge(OPEN_WEBSOCKET_GAUGE_NAME, unrecognizedPlatform.and(authenticatedTag), openAuthenticatedWebsocketsFromUnknownPlatforms); - Metrics.gauge(OPEN_WEBSOCKET_COUNTER_NAME, unrecognizedPlatform.and(unauthenticatedTag), + Metrics.gauge(OPEN_WEBSOCKET_GAUGE_NAME, unrecognizedPlatform.and(unauthenticatedTag), openUnauthenticatedWebsocketsFromUnknownPlatforms); durationTimerForUnknownPlatforms = Metrics.timer(CONNECTED_DURATION_TIMER_NAME,