From fba76863903917fa0487cde51fc9263c039b5713 Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Mon, 22 Apr 2024 18:17:45 -0500 Subject: [PATCH] Remove `shard` tag from Lettuce circuit breaker metrics --- .../textsecuregcm/redis/LettuceShardCircuitBreaker.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/LettuceShardCircuitBreaker.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/LettuceShardCircuitBreaker.java index 9087442b6..df9db0112 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/LettuceShardCircuitBreaker.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/LettuceShardCircuitBreaker.java @@ -56,7 +56,6 @@ public class LettuceShardCircuitBreaker implements NettyCustomizer { private static final Logger logger = LoggerFactory.getLogger(ChannelCircuitBreakerHandler.class); - private static final String SHARD_TAG_NAME = "shard"; private static final String CLUSTER_TAG_NAME = "cluster"; private final String clusterName; @@ -82,8 +81,7 @@ public class LettuceShardCircuitBreaker implements NettyCustomizer { // In some cases, like the default connection, the remote address includes the DNS hostname, which we want to exclude. final String shardAddress = StringUtils.substringAfter(remoteAddress.toString(), "/"); breaker = CircuitBreaker.of("%s/%s-breaker".formatted(clusterName, shardAddress), circuitBreakerConfig); - CircuitBreakerUtil.registerMetrics(breaker, getClass(), - Tags.of(CLUSTER_TAG_NAME, clusterName, SHARD_TAG_NAME, shardAddress)); + CircuitBreakerUtil.registerMetrics(breaker, getClass(), Tags.of(CLUSTER_TAG_NAME, clusterName)); } @Override