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

Silence noisy warnings for invalid Accept-Language

This commit is contained in:
Ravi Khadiwala 2022-02-07 16:51:15 -06:00 committed by ravi-signal
parent baaae6cd9f
commit 9f5d97e1c6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
View File

@ -116,6 +116,7 @@ public class ProfileController {
private static final String PNI_CREDENTIAL_TYPE = "pni"; private static final String PNI_CREDENTIAL_TYPE = "pni";
private static final Counter VERSION_NOT_FOUND_COUNTER = Metrics.counter(name(ProfileController.class, "versionNotFound")); private static final Counter VERSION_NOT_FOUND_COUNTER = Metrics.counter(name(ProfileController.class, "versionNotFound"));
private static final Counter INVALID_ACCEPT_LANGUAGE_COUNTER = Metrics.counter(name(ProfileController.class, "invalidAcceptLanguageCounter"));
public ProfileController( public ProfileController(
Clock clock, Clock clock,
@ -437,7 +438,8 @@ public class ProfileController {
try { try {
return containerRequestContext.getAcceptableLanguages(); return containerRequestContext.getAcceptableLanguages();
} catch (final ProcessingException e) { } catch (final ProcessingException e) {
logger.warn("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}", INVALID_ACCEPT_LANGUAGE_COUNTER.increment();
logger.debug("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}",
containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE), containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE),
containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT), containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT),
e); e);

9
service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
View File

@ -56,6 +56,8 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
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 io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.signal.zkgroup.InvalidInputException; import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.VerificationFailedException; import org.signal.zkgroup.VerificationFailedException;
@ -78,6 +80,8 @@ import org.whispersystems.textsecuregcm.storage.SubscriptionManager.GetResult;
import org.whispersystems.textsecuregcm.stripe.StripeManager; import org.whispersystems.textsecuregcm.stripe.StripeManager;
import org.whispersystems.textsecuregcm.util.ExactlySize; import org.whispersystems.textsecuregcm.util.ExactlySize;
import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
@Path("/v1/subscription") @Path("/v1/subscription")
public class SubscriptionController { public class SubscriptionController {
@ -93,6 +97,8 @@ public class SubscriptionController {
private final BadgeTranslator badgeTranslator; private final BadgeTranslator badgeTranslator;
private final LevelTranslator levelTranslator; private final LevelTranslator levelTranslator;
private static final Counter INVALID_ACCEPT_LANGUAGE_COUNTER = Metrics.counter(name(SubscriptionController.class, "invalidAcceptLanguageCounter"));
public SubscriptionController( public SubscriptionController(
@Nonnull Clock clock, @Nonnull Clock clock,
@Nonnull SubscriptionConfiguration subscriptionConfiguration, @Nonnull SubscriptionConfiguration subscriptionConfiguration,
@ -859,7 +865,8 @@ public class SubscriptionController {
try { try {
return containerRequestContext.getAcceptableLanguages(); return containerRequestContext.getAcceptableLanguages();
} catch (final ProcessingException e) { } catch (final ProcessingException e) {
logger.warn("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}", INVALID_ACCEPT_LANGUAGE_COUNTER.increment();
logger.debug("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}",
containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE), containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE),
containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT), containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT),
e); e);