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

Associate source/destination country codes for reported messages

This commit is contained in:
Jon Chambers 2022-07-13 16:13:54 -04:00 committed by Jon Chambers
parent 6754ec5e10
commit d290aad27b
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
service/src/main/java/org/whispersystems/textsecuregcm/metrics/ReportedMessageMetricsListener.java
View File

@ -8,7 +8,11 @@ package org.whispersystems.textsecuregcm.metrics;
import static com.codahale.metrics.MetricRegistry.name; import static com.codahale.metrics.MetricRegistry.name;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import net.logstash.logback.marker.Markers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.ReportMessageManager; import org.whispersystems.textsecuregcm.storage.ReportMessageManager;
import org.whispersystems.textsecuregcm.storage.ReportedMessageListener; import org.whispersystems.textsecuregcm.storage.ReportedMessageListener;
@ -24,15 +28,27 @@ public class ReportedMessageMetricsListener implements ReportedMessageListener {
private static final String COUNTRY_CODE_TAG_NAME = "countryCode"; private static final String COUNTRY_CODE_TAG_NAME = "countryCode";
private static final Logger logger = LoggerFactory.getLogger(ReportedMessageMetricsListener.class);
public ReportedMessageMetricsListener(final AccountsManager accountsManager) { public ReportedMessageMetricsListener(final AccountsManager accountsManager) {
this.accountsManager = accountsManager; this.accountsManager = accountsManager;
} }
@Override @Override
public void handleMessageReported(final String sourceNumber, final UUID messageGuid, final UUID reporterUuid) { public void handleMessageReported(final String sourceNumber, final UUID messageGuid, final UUID reporterUuid) {
Metrics.counter(REPORTED_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, Util.getCountryCode(sourceNumber)).increment(); final String sourceCountryCode = Util.getCountryCode(sourceNumber);
accountsManager.getByAccountIdentifier(reporterUuid).ifPresent(reporter -> Metrics.counter(REPORTED_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, sourceCountryCode).increment();
Metrics.counter(REPORTER_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, Util.getCountryCode(reporter.getNumber())).increment());
accountsManager.getByAccountIdentifier(reporterUuid).ifPresent(reporter -> {
final String destinationCountryCode = Util.getCountryCode(reporter.getNumber());
logger.info(Markers.appendEntries(Map.of(
"sourceCountry", sourceCountryCode,
"destinationCountry", destinationCountryCode)),
"Message reported");
Metrics.counter(REPORTER_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, destinationCountryCode).increment();
});
} }
} }