diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-20 10:32:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 10:32:33 -0400 |
| commit | dbc630a628e4fc6eb5eff09ce5edba062c0e9955 (patch) | |
| tree | 2763c1411e608531526b269f9a2746121e117774 /synapse/logging | |
| parent | Add more types to synapse.storage.database. (#8127) (diff) | |
| download | synapse-dbc630a628e4fc6eb5eff09ce5edba062c0e9955.tar.xz | |
Use the JSON encoder without whitespace in more places. (#8124)
Diffstat (limited to 'synapse/logging')
| -rw-r--r-- | synapse/logging/opentracing.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index abe532d350..d39ac62168 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -172,12 +172,11 @@ from functools import wraps from typing import TYPE_CHECKING, Dict, Optional, Type import attr -from canonicaljson import json from twisted.internet import defer from synapse.config import ConfigError -from synapse.util import json_decoder +from synapse.util import json_decoder, json_encoder if TYPE_CHECKING: from synapse.http.site import SynapseRequest @@ -693,7 +692,7 @@ def active_span_context_as_string(): opentracing.tracer.inject( opentracing.tracer.active_span, opentracing.Format.TEXT_MAP, carrier ) - return json.dumps(carrier) + return json_encoder.encode(carrier) @only_if_tracing |