Merge branch 'release-v1.43' into develop

CHANGES.md

@@ -1,3 +1,12 @@
+Synapse 1.43.0rc2 (2021-09-17)
+==============================
+
+Bugfixes
+--------
+
+- Added opentracing logging to help debug [\#9424](https://github.com/matrix-org/synapse/issues/9424). ([\#10828](https://github.com/matrix-org/synapse/issues/10828))
+
+
 Synapse 1.43.0rc1 (2021-09-14)
 ==============================
 

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.43.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.43.0~rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 17 Sep 2021 10:43:21 +0100
+
 matrix-synapse-py3 (1.43.0~rc1) stable; urgency=medium
 
   * New synapse release 1.43.0~rc1.

synapse/__init__.py

@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.43.0rc1"
+__version__ = "1.43.0rc2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when

synapse/handlers/sync.py

@@ -1533,9 +1533,6 @@ class SyncHandler:
         newly_left_rooms = room_changes.newly_left_rooms
 
         async def handle_room_entries(room_entry: "RoomSyncResultBuilder"):
-            with start_active_span("generate_room_entry"):
-                set_tag("room_id", room_entry.room_id)
-                log_kv({"events": len(room_entry.events or [])})
             logger.debug("Generating room entry for %s", room_entry.room_id)
             res = await self._generate_room_entry(
                 sync_result_builder,
@@ -1960,6 +1957,11 @@ class SyncHandler:
         room_id = room_builder.room_id
         since_token = room_builder.since_token
         upto_token = room_builder.upto_token
+
+        with start_active_span("generate_room_entry"):
+            set_tag("room_id", room_id)
+            log_kv({"events": len(events or ())})
+
             log_kv(
                 {
                     "since_token": since_token,
@@ -2013,21 +2015,34 @@ class SyncHandler:
                 account_data_events.append({"type": "m.tag", "content": {"tags": tags}})
 
             for account_data_type, content in account_data.items():
-            account_data_events.append({"type": account_data_type, "content": content})
+                account_data_events.append(
+                    {"type": account_data_type, "content": content}
+                )
 
-        account_data_events = sync_config.filter_collection.filter_room_account_data(
+            account_data_events = (
+                sync_config.filter_collection.filter_room_account_data(
                     account_data_events
                 )
+            )
 
             ephemeral = sync_config.filter_collection.filter_room_ephemeral(ephemeral)
 
             if not (
-            always_include or batch or account_data_events or ephemeral or full_state
+                always_include
+                or batch
+                or account_data_events
+                or ephemeral
+                or full_state
             ):
                 return
 
             state = await self.compute_state_delta(
-            room_id, batch, sync_config, since_token, now_token, full_state=full_state
+                room_id,
+                batch,
+                sync_config,
+                since_token,
+                now_token,
+                full_state=full_state,
             )
 
             summary: Optional[JsonDict] = {}