summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/logging/tracing.py4
-rw-r--r--tests/logging/test_tracing.py6
2 files changed, 4 insertions, 6 deletions
diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py

index f8b35d2660..e3a1a010a2 100644 --- a/synapse/logging/tracing.py +++ b/synapse/logging/tracing.py
@@ -686,9 +686,7 @@ def inject_active_tracing_context_into_header_dict( Note: The headers set by the tracer are custom to the tracer implementation which should be unique enough that they don't interfere with any headers set by - synapse or twisted. If we're still using jaeger these headers would be those - here: - https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py + synapse or twisted. """ if check_destination: if destination is None: diff --git a/tests/logging/test_tracing.py b/tests/logging/test_tracing.py
index 36736ea8c5..25a617ea6d 100644 --- a/tests/logging/test_tracing.py +++ b/tests/logging/test_tracing.py
@@ -113,9 +113,9 @@ class TracingTestCase(TestCase): ) def test_side_by_side_spans(self) -> None: - with start_active_span( - "span1", tracer=self._tracer - ) as span1, start_active_span("span2", tracer=self._tracer) as span2: + with start_active_span("span1", tracer=self._tracer), start_active_span( + "span2", tracer=self._tracer + ) as span2: # We expect the last span in `with` list to be active self.assertEqual(opentelemetry.trace.get_current_span(), span2)