From f8cbb4f386d0dbc28e0a3b1c38fa46c1e1015044 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Mon, 11 Jan 2021 11:02:59 -0500 Subject: [PATCH] Temporarily suspend client version metrics to reduce load on our metric aggregator. --- .../metrics/MetricsRequestEventListener.java | 3 ++- .../MetricsRequestEventListenerTest.java | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListener.java index 381515989..2998de2e9 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListener.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListener.java @@ -76,7 +76,8 @@ class MetricsRequestEventListener implements RequestEventListener { tags.add(Tag.of(TRAFFIC_SOURCE_TAG, trafficSource.name().toLowerCase())); final List userAgentValues = event.getContainerRequest().getRequestHeader("User-Agent"); - tags.addAll(UserAgentTagUtil.getUserAgentTags(userAgentValues != null ? userAgentValues.stream().findFirst().orElse(null) : null)); + // tags.addAll(UserAgentTagUtil.getUserAgentTags(userAgentValues != null ? userAgentValues.stream().findFirst().orElse(null) : null)); + tags.add(UserAgentTagUtil.getPlatformTag(userAgentValues != null ? userAgentValues.stream().findFirst().orElse(null) : null)); meterRegistry.counter(REQUEST_COUNTER_NAME, tags).increment(); 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 c91691a17..018246991 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java @@ -113,12 +113,14 @@ public class MetricsRequestEventListenerTest { tags.add(tag); } - assertEquals(5, tags.size()); + // TODO Restore this when we return to detailed metrics and restore the version tag + // assertEquals(5, tags.size()); + assertEquals(4, tags.size()); assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.PATH_TAG, path))); assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.STATUS_CODE_TAG, String.valueOf(statusCode)))); assertTrue(tags.contains(Tag.of(MetricsRequestEventListener.TRAFFIC_SOURCE_TAG, TRAFFIC_SOURCE.name().toLowerCase()))); assertTrue(tags.contains(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "android"))); - assertTrue(tags.contains(Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7"))); + // assertTrue(tags.contains(Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7"))); } @Test @@ -182,12 +184,14 @@ public class MetricsRequestEventListenerTest { tags.add(tag); } - assertEquals(5, tags.size()); + // TODO Restore this when we return to detailed metrics and restore the version tag + // assertEquals(5, tags.size()); + assertEquals(4, 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.contains(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "android"))); - assertTrue(tags.contains(Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7"))); + // assertTrue(tags.contains(Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7"))); } @Test @@ -238,11 +242,14 @@ public class MetricsRequestEventListenerTest { tags.add(tag); } - assertEquals(5, tags.size()); + // TODO Restore this when we return to detailed metrics and restore the version tag + // assertEquals(5, tags.size()); + assertEquals(4, 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)); + // assertTrue(tags.containsAll(UserAgentTagUtil.UNRECOGNIZED_TAGS)); + assertTrue(tags.contains(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "unrecognized"))); } @Test