summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--docker/conf/homeserver.yaml18
-rw-r--r--synapse/storage/controllers/persist_events.py2
2 files changed, 19 insertions, 1 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml

index f10f78a48c..55977017e3 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml
@@ -184,3 +184,21 @@ trusted_key_servers: password_config: enabled: true + + +# foo +tracing: + enabled: true + sample_rate: 1 + jaeger_exporter_config: + agent_host_name: host.docker.internal + agent_port: 6831 + # Split UDP packets (UDP_PACKET_MAX_LENGTH is set to 65k in OpenTelemetry) + udp_split_oversized_batches: true + # If you define a collector, it will communicate directly to the collector, + # bypassing the agent + # + # It does not seem like the agent can keep up with the massive UDP load + # (1065 spans in one trace) so lets just use the HTTP collector endpoint + # instead which seems to work. + collector_endpoint: "http://host.docker.internal:14268/api/traces?format=jaeger.thrift" diff --git a/synapse/storage/controllers/persist_events.py b/synapse/storage/controllers/persist_events.py
index f34c067515..f87f5098a5 100644 --- a/synapse/storage/controllers/persist_events.py +++ b/synapse/storage/controllers/persist_events.py
@@ -781,7 +781,7 @@ class EventsPersistenceStorageController: stale_forward_extremities_counter.observe(len(stale)) return result - + async def _get_new_state_after_events( self, room_id: str,