From 44cb79657400c56e48e39a7936c3d9c6baf5849c Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 25 Jan 2022 11:22:15 -0500
Subject: [PATCH] Add more detail to "could not get acceptable languages"
 logging

---
 .../textsecuregcm/controllers/ProfileController.java       | 7 ++++++-
 .../textsecuregcm/controllers/SubscriptionController.java  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
index 819d5333a..6b689a265 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
@@ -40,6 +40,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
@@ -435,7 +436,11 @@ public class ProfileController {
     try {
       return containerRequestContext.getAcceptableLanguages();
     } catch (final ProcessingException e) {
-      logger.warn("Could not get acceptable languages", e);
+      logger.warn("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}",
+          containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE),
+          containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT),
+          e);
+
       return List.of();
     }
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
index 2513e3eb4..62a6722d8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
@@ -51,6 +51,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
@@ -855,7 +856,11 @@ public class SubscriptionController {
     try {
       return containerRequestContext.getAcceptableLanguages();
     } catch (final ProcessingException e) {
-      logger.warn("Could not get acceptable languages", e);
+      logger.warn("Could not get acceptable languages; Accept-Language: {}; User-Agent: {}",
+          containerRequestContext.getHeaderString(HttpHeaders.ACCEPT_LANGUAGE),
+          containerRequestContext.getHeaderString(HttpHeaders.USER_AGENT),
+          e);
+
       return List.of();
     }
   }