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

Add a country code dimension to the non-normalized number counter

This commit is contained in:
Jon Chambers 2022-08-10 14:49:08 -04:00 committed by Jon Chambers
parent 2bfe2c8ff8
commit 4d78437fe4
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
service/src/main/java/org/whispersystems/textsecuregcm/mappers/NonNormalizedPhoneNumberExceptionMapper.java
View File

@ -5,23 +5,33 @@
package org.whispersystems.textsecuregcm.mappers; package org.whispersystems.textsecuregcm.mappers;
import io.micrometer.core.instrument.Counter; import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import org.whispersystems.textsecuregcm.util.NonNormalizedPhoneNumberException;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.ExceptionMapper;
import org.whispersystems.textsecuregcm.util.NonNormalizedPhoneNumberException;
import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
public class NonNormalizedPhoneNumberExceptionMapper implements ExceptionMapper<NonNormalizedPhoneNumberException> { public class NonNormalizedPhoneNumberExceptionMapper implements ExceptionMapper<NonNormalizedPhoneNumberException> {
private static final Counter NON_NORMALIZED_NUMBER_COUNTER = private static final String NON_NORMALIZED_NUMBER_COUNTER_NAME =
Metrics.counter(name(NonNormalizedPhoneNumberExceptionMapper.class, "nonNormalizedNumbers")); name(NonNormalizedPhoneNumberExceptionMapper.class, "nonNormalizedNumbers");
@Override @Override
public Response toResponse(final NonNormalizedPhoneNumberException exception) { public Response toResponse(final NonNormalizedPhoneNumberException exception) {
NON_NORMALIZED_NUMBER_COUNTER.increment(); String countryCode;
try {
countryCode =
String.valueOf(PhoneNumberUtil.getInstance().parse(exception.getOriginalNumber(), null).getCountryCode());
} catch (final NumberParseException ignored) {
countryCode = "unknown";
}
Metrics.counter(NON_NORMALIZED_NUMBER_COUNTER_NAME, "countryCode", countryCode).increment();
return Response.status(Status.BAD_REQUEST) return Response.status(Status.BAD_REQUEST)
.entity(new NonNormalizedPhoneNumberResponse(exception.getOriginalNumber(), exception.getNormalizedNumber())) .entity(new NonNormalizedPhoneNumberResponse(exception.getOriginalNumber(), exception.getNormalizedNumber()))