Rename CircuitBreakerUtil to ResilienceUtil

This commit is contained in:
Jon Chambers
2025-08-27 14:20:04 -04:00
committed by Jon Chambers
parent 807e03ca2b
commit bc20aee7c9
22 changed files with 60 additions and 61 deletions

View File

@@ -17,7 +17,7 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil;
import org.whispersystems.textsecuregcm.util.ResilienceUtil;
public class FaultTolerantRedisClient {
@@ -40,8 +40,8 @@ public class FaultTolerantRedisClient {
RedisUriUtil.createRedisUriWithTimeout(redisConfiguration.getUri(), redisConfiguration.getTimeout()),
redisConfiguration.getTimeout(),
redisConfiguration.getCircuitBreakerConfigurationName() != null
? CircuitBreakerUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker", redisConfiguration.getCircuitBreakerConfigurationName())
: CircuitBreakerUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker"));
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker", redisConfiguration.getCircuitBreakerConfigurationName())
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker"));
}
@VisibleForTesting

View File

@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil;
import org.whispersystems.textsecuregcm.util.ResilienceUtil;
/**
* Adds a circuit breaker to every Netty {@link Channel} that gets created, so that a single unhealthy shard does not
@@ -105,8 +105,8 @@ public class LettuceShardCircuitBreaker implements NettyCustomizer {
SHARD_ADDRESS_TAG_NAME, shardAddress);
breaker = circuitBreakerConfigurationName != null
? CircuitBreakerUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName, circuitBreakerConfigurationName, tags)
: CircuitBreakerUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName, tags);
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName, circuitBreakerConfigurationName, tags)
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName, tags);
}
@Override