From 6d9779c9e69a5467b3ad171caaf7440224c74e8c Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Fri, 10 Feb 2023 19:37:34 +0000
Subject: [PATCH 1/2] Apply logging from hotfixes branch to develop

Part of #4826.

Originally added in #11882.
---
 synapse/rest/client/account.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/synapse/rest/client/account.py b/synapse/rest/client/account.py
index 4373c7366262..232f3a976d76 100644
--- a/synapse/rest/client/account.py
+++ b/synapse/rest/client/account.py
@@ -415,6 +415,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
             request, MsisdnRequestTokenBody
         )
         msisdn = phone_number_to_msisdn(body.country, body.phone_number)
+        logger.info("Request #%s to verify ownership of %s", body.send_attempt, msisdn)
 
         if not await check_3pid_allowed(self.hs, "msisdn", msisdn):
             raise SynapseError(
@@ -444,6 +445,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
                 await self.hs.get_clock().sleep(random.randint(1, 10) / 10)
                 return 200, {"sid": random_string(16)}
 
+            logger.info("MSISDN %s is already in use by %s", msisdn, existing_user_id)
             raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE)
 
         if not self.hs.config.registration.account_threepid_delegate_msisdn:
@@ -468,6 +470,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         threepid_send_requests.labels(type="msisdn", reason="add_threepid").observe(
             body.send_attempt
         )
+        logger.info("MSISDN %s: got response from identity server: %s", msisdn, ret)
 
         return 200, ret
 

From 6d4982950654de89f1f3dd3031120b7ddac73005 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Fri, 10 Feb 2023 19:43:42 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/15054.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/15054.misc

diff --git a/changelog.d/15054.misc b/changelog.d/15054.misc
new file mode 100644
index 000000000000..d800b107cf14
--- /dev/null
+++ b/changelog.d/15054.misc
@@ -0,0 +1 @@
+Merge debug logging from the hotfixes branch.