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

Replace metrics with logging statements.

This commit is contained in:
Jon Chambers 2020-08-31 15:10:33 -04:00 committed by Jon Chambers
parent dfe80a30dc
commit 8b70c69a0d
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/workers/ScourMessageCacheCommand.java
View File

@ -1,8 +1,5 @@
package org.whispersystems.textsecuregcm.workers; package org.whispersystems.textsecuregcm.workers;
import com.codahale.metrics.Histogram;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import io.dropwizard.cli.ConfiguredCommand; import io.dropwizard.cli.ConfiguredCommand;
@ -19,22 +16,16 @@ import org.whispersystems.textsecuregcm.entities.MessageProtos;
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
import org.whispersystems.textsecuregcm.storage.FaultTolerantDatabase; import org.whispersystems.textsecuregcm.storage.FaultTolerantDatabase;
import org.whispersystems.textsecuregcm.storage.Messages; import org.whispersystems.textsecuregcm.storage.Messages;
import org.whispersystems.textsecuregcm.util.Constants;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static com.codahale.metrics.MetricRegistry.name;
public class ScourMessageCacheCommand extends ConfiguredCommand<WhisperServerConfiguration> { public class ScourMessageCacheCommand extends ConfiguredCommand<WhisperServerConfiguration> {
private FaultTolerantRedisClient redisClient; private FaultTolerantRedisClient redisClient;
private Messages messageDatabase; private Messages messageDatabase;
private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private final Histogram queueSizeHistogram = metricRegistry.histogram(name(getClass(), "queueSize"));
private static final Logger log = LoggerFactory.getLogger(ScourMessageCacheCommand.class); private static final Logger log = LoggerFactory.getLogger(ScourMessageCacheCommand.class);
public ScourMessageCacheCommand() { public ScourMessageCacheCommand() {
@ -96,7 +87,7 @@ public class ScourMessageCacheCommand extends ConfiguredCommand<WhisperServerCon
"user_queue_persisting::" + accountNumberAndDeviceId); "user_queue_persisting::" + accountNumberAndDeviceId);
}); });
queueSizeHistogram.update(messageCount.longValue()); log.info("Persisted a queue with {} messages", messageCount.get());
} }
private void persistMessage(final String accountNumber, final long deviceId, final byte[] message) { private void persistMessage(final String accountNumber, final long deviceId, final byte[] message) {