summary refs log tree commit diff
path: root/synapse/storage/databases
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-03 16:18:12 -0500
committerEric Eastwood <erice@element.io>2022-08-03 16:18:12 -0500
commitccd475299b2ab6faf8dbbd4dd7d77c84dc214dd0 (patch)
tree6c4a6673c6122762d4c18bd3b626d2b90c007cf5 /synapse/storage/databases
parentRevert "Update treq to match minimum Twisted Python versions" (diff)
downloadsynapse-ccd475299b2ab6faf8dbbd4dd7d77c84dc214dd0.tar.xz
Fix tracing imports after merging in develop
Diffstat (limited to 'synapse/storage/databases')
-rw-r--r--synapse/storage/databases/main/stream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py

index a347430aa7..f61f290547 100644 --- a/synapse/storage/databases/main/stream.py +++ b/synapse/storage/databases/main/stream.py
@@ -58,7 +58,7 @@ from twisted.internet import defer from synapse.api.filtering import Filter from synapse.events import EventBase from synapse.logging.context import make_deferred_yieldable, run_in_background -from synapse.logging.opentracing import trace +from synapse.logging.tracing import trace from synapse.storage._base import SQLBaseStore from synapse.storage.database import ( DatabasePool,