MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused metrics

This commit is contained in:
Chris Eager 2023-02-23 12:27:56 -06:00 committed by Chris Eager
parent 2be22c2a8e
commit b5fb33e21e
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
service/src/main/java/org/whispersystems/textsecuregcm/limits/LockingRateLimiter.java
View File

@ -5,27 +5,20 @@
package org.whispersystems.textsecuregcm.limits; package org.whispersystems.textsecuregcm.limits;
import static com.codahale.metrics.MetricRegistry.name; import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
import io.lettuce.core.SetArgs; import io.lettuce.core.SetArgs;
import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import java.time.Duration; import java.time.Duration;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
import org.whispersystems.textsecuregcm.util.Constants;
public class LockingRateLimiter extends StaticRateLimiter { public class LockingRateLimiter extends StaticRateLimiter {
private static final RateLimitExceededException REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION private static final RateLimitExceededException REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION
= new RateLimitExceededException(Duration.ZERO, true); = new RateLimitExceededException(Duration.ZERO, true);
@Deprecated
private final Meter meter;
private final Counter counter; private final Counter counter;
@ -34,15 +27,12 @@ public class LockingRateLimiter extends StaticRateLimiter {
final RateLimiterConfig config, final RateLimiterConfig config,
final FaultTolerantRedisCluster cacheCluster) { final FaultTolerantRedisCluster cacheCluster) {
super(name, config, cacheCluster); super(name, config, cacheCluster);
final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); this.counter = Metrics.counter(name(getClass(), "locked"), "name", name);
this.meter = metricRegistry.meter(name(getClass(), name, "locked"));
this.counter = Metrics.counter(MetricsUtil.name(getClass(), "locked"), "name", name);
} }
@Override @Override
public void validate(final String key, final int amount) throws RateLimitExceededException { public void validate(final String key, final int amount) throws RateLimitExceededException {
if (!acquireLock(key)) { if (!acquireLock(key)) {
meter.mark();
counter.increment(); counter.increment();
throw REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION; throw REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION;
} }

14
service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java
View File

@ -4,12 +4,9 @@
*/ */
package org.whispersystems.textsecuregcm.limits; package org.whispersystems.textsecuregcm.limits;
import static com.codahale.metrics.MetricRegistry.name;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
@ -18,9 +15,7 @@ import java.time.Duration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.SystemMapper; import org.whispersystems.textsecuregcm.util.SystemMapper;
public class StaticRateLimiter implements RateLimiter { public class StaticRateLimiter implements RateLimiter {
@ -34,19 +29,15 @@ public class StaticRateLimiter implements RateLimiter {
protected final FaultTolerantRedisCluster cacheCluster; protected final FaultTolerantRedisCluster cacheCluster;
private final Counter counter; private final Counter counter;
@Deprecated
private final Meter meter;
public StaticRateLimiter( public StaticRateLimiter(
final String name, final String name,
final RateLimiterConfig config, final RateLimiterConfig config,
final FaultTolerantRedisCluster cacheCluster) { final FaultTolerantRedisCluster cacheCluster) {
final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
this.name = requireNonNull(name); this.name = requireNonNull(name);
this.config = requireNonNull(config); this.config = requireNonNull(config);
this.cacheCluster = requireNonNull(cacheCluster); this.cacheCluster = requireNonNull(cacheCluster);
this.meter = metricRegistry.meter(name(getClass(), name, "exceeded")); this.counter = Metrics.counter(name(getClass(), "exceeded"), "name", name);
this.counter = Metrics.counter(MetricsUtil.name(getClass(), "exceeded"), "name", name);
} }
@Override @Override
@ -55,7 +46,6 @@ public class StaticRateLimiter implements RateLimiter {
if (bucket.add(amount)) { if (bucket.add(amount)) {
setBucket(key, bucket); setBucket(key, bucket);
} else { } else {
meter.mark();
counter.increment(); counter.increment();
throw new RateLimitExceededException(bucket.getTimeUntilSpaceAvailable(amount), true); throw new RateLimitExceededException(bucket.getTimeUntilSpaceAvailable(amount), true);
} }