From 11598e855fea45fd2bad2b46e2b73ae63d78daa0 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 20 Oct 2021 16:15:56 -0400 Subject: [PATCH] Count non-normalized or impossible numbers --- .../mappers/ImpossiblePhoneNumberExceptionMapper.java | 9 +++++++++ .../mappers/NonNormalizedPhoneNumberExceptionMapper.java | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/ImpossiblePhoneNumberExceptionMapper.java b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/ImpossiblePhoneNumberExceptionMapper.java index 14878b7b6..edbd670fa 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/ImpossiblePhoneNumberExceptionMapper.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/ImpossiblePhoneNumberExceptionMapper.java @@ -5,14 +5,23 @@ package org.whispersystems.textsecuregcm.mappers; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Metrics; import org.whispersystems.textsecuregcm.util.ImpossiblePhoneNumberException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; +import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; + public class ImpossiblePhoneNumberExceptionMapper implements ExceptionMapper { + private static final Counter IMPOSSIBLE_NUMBER_COUNTER = + Metrics.counter(name(ImpossiblePhoneNumberExceptionMapper.class, "impossibleNumbers")); + @Override public Response toResponse(final ImpossiblePhoneNumberException exception) { + IMPOSSIBLE_NUMBER_COUNTER.increment(); + return Response.status(Response.Status.BAD_REQUEST).build(); } } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/NonNormalizedPhoneNumberExceptionMapper.java b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/NonNormalizedPhoneNumberExceptionMapper.java index 192826042..71c58eb23 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/NonNormalizedPhoneNumberExceptionMapper.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/NonNormalizedPhoneNumberExceptionMapper.java @@ -5,15 +5,24 @@ package org.whispersystems.textsecuregcm.mappers; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Metrics; import org.whispersystems.textsecuregcm.util.NonNormalizedPhoneNumberException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; +import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; + public class NonNormalizedPhoneNumberExceptionMapper implements ExceptionMapper { + private static final Counter NON_NORMALIZED_NUMBER_COUNTER = + Metrics.counter(name(NonNormalizedPhoneNumberExceptionMapper.class, "nonNormalizedNumbers")); + @Override public Response toResponse(final NonNormalizedPhoneNumberException exception) { + NON_NORMALIZED_NUMBER_COUNTER.increment(); + return Response.status(Status.BAD_REQUEST) .entity(new NonNormalizedPhoneNumberResponse(exception.getOriginalNumber(), exception.getNormalizedNumber())) .build();