summary refs log tree commit diff
path: root/synapse/storage/controllers/state.py
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/controllers/state.py
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/controllers/state.py')
-rw-r--r--synapse/storage/controllers/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/controllers/state.py b/synapse/storage/controllers/state.py

index 0d480f1014..7b2084664c 100644 --- a/synapse/storage/controllers/state.py +++ b/synapse/storage/controllers/state.py
@@ -29,7 +29,7 @@ from typing import ( from synapse.api.constants import EventTypes from synapse.events import EventBase -from synapse.logging.opentracing import trace +from synapse.logging.tracing import trace from synapse.storage.state import StateFilter from synapse.storage.util.partial_state_events_tracker import ( PartialCurrentStateTracker,