diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-03 16:18:12 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-03 16:18:12 -0500 |
| commit | ccd475299b2ab6faf8dbbd4dd7d77c84dc214dd0 (patch) | |
| tree | 6c4a6673c6122762d4c18bd3b626d2b90c007cf5 /synapse/handlers/federation.py | |
| parent | Revert "Update treq to match minimum Twisted Python versions" (diff) | |
| download | synapse-ccd475299b2ab6faf8dbbd4dd7d77c84dc214dd0.tar.xz | |
Fix tracing imports after merging in develop
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 30f1585a85..0aa4878f5b 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -59,7 +59,7 @@ from synapse.events.validator import EventValidator from synapse.federation.federation_client import InvalidResponseError from synapse.http.servlet import assert_params_in_dict from synapse.logging.context import nested_logging_context -from synapse.logging.opentracing import trace +from synapse.logging.tracing import trace from synapse.metrics.background_process_metrics import run_as_background_process from synapse.module_api import NOT_SPAM from synapse.replication.http.federation import ( |