From 93c3cea912db911d37e77a481770ba8cb1e8fbad Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Wed, 25 Aug 2021 16:27:01 -0500 Subject: [PATCH] Clean up old "ephemeral" metrics --- .../whispersystems/textsecuregcm/storage/MessagesCache.java | 6 ++---- .../textsecuregcm/storage/MessagesManager.java | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java index ac2c21674..5d454f87a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java @@ -62,14 +62,13 @@ public class MessagesCache extends RedisClusterPubSubAdapter imp private final Map messageListenersByQueueName = new HashMap<>(); private final Map queueNamesByMessageListener = new IdentityHashMap<>(); - private final Timer insertTimer = Metrics.timer(name(MessagesCache.class, "insert"), "ephemeral", "false"); + private final Timer insertTimer = Metrics.timer(name(MessagesCache.class, "insert")); private final Timer getMessagesTimer = Metrics.timer(name(MessagesCache.class, "get")); private final Timer getQueuesToPersistTimer = Metrics.timer(name(MessagesCache.class, "getQueuesToPersist")); private final Timer clearQueueTimer = Metrics.timer(name(MessagesCache.class, "clear")); private final Timer takeEphemeralMessageTimer = Metrics.timer(name(MessagesCache.class, "takeEphemeral")); private final Counter pubSubMessageCounter = Metrics.counter(name(MessagesCache.class, "pubSubMessage")); - private final Counter newMessageNotificationCounter = Metrics.counter(name(MessagesCache.class, "newMessageNotification"), "ephemeral", "false"); - private final Counter ephemeralMessageNotificationCounter = Metrics.counter(name(MessagesCache.class, "newMessageNotification"), "ephemeral", "true"); + private final Counter newMessageNotificationCounter = Metrics.counter(name(MessagesCache.class, "newMessageNotification")); private final Counter queuePersistedNotificationCounter = Metrics.counter(name(MessagesCache.class, "queuePersisted")); static final String NEXT_SLOT_TO_PERSIST_KEY = "user_queue_persist_slot"; @@ -355,7 +354,6 @@ public class MessagesCache extends RedisClusterPubSubAdapter imp } }); } else if (channel.startsWith(EPHEMERAL_QUEUE_KEYSPACE_PREFIX) && "rpush".equals(message)) { - ephemeralMessageNotificationCounter.increment(); notificationExecutorService.execute(() -> { try { findListener(channel).ifPresent(MessageAvailabilityListener::handleNewEphemeralMessageAvailable); diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java index b99e397bb..6e797cba3 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java @@ -29,9 +29,7 @@ public class MessagesManager { private static final Meter cacheHitByGuidMeter = metricRegistry.meter(name(MessagesManager.class, "cacheHitByGuid")); private static final Meter cacheMissByGuidMeter = metricRegistry.meter( name(MessagesManager.class, "cacheMissByGuid")); - - // migrated from MessagePersister, name is not a typo - private final Meter persistMessageMeter = metricRegistry.meter(name(MessagePersister.class, "persistMessage")); + private static final Meter persistMessageMeter = metricRegistry.meter(name(MessagesManager.class, "persistMessage")); private final MessagesDynamoDb messagesDynamoDb; private final MessagesCache messagesCache;