summary refs log tree commit diff
path: root/tests/logging/test_tracing.py
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-03 00:10:14 -0500
committerEric Eastwood <erice@element.io>2022-08-03 00:10:14 -0500
commitb6f56656ab95b26fdbaccdcf94d77211688732c7 (patch)
treea3504c10d70e4a7f665ac0f406a26d2023d87e04 /tests/logging/test_tracing.py
parentFix table missing column (diff)
downloadsynapse-b6f56656ab95b26fdbaccdcf94d77211688732c7.tar.xz
Use latested Twisted from source to fix contextvar issues causing OTEL `Failed to detach context` errors
See https://github.com/matrix-org/synapse/pull/13400#discussion_r936195492
Diffstat (limited to 'tests/logging/test_tracing.py')
-rw-r--r--tests/logging/test_tracing.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/logging/test_tracing.py b/tests/logging/test_tracing.py

index 25a617ea6d..a2065d75de 100644 --- a/tests/logging/test_tracing.py +++ b/tests/logging/test_tracing.py
@@ -139,10 +139,10 @@ class TracingTestCase(TestCase): with start_active_span( f"task{i}", tracer=self._tracer, - ) as span1: - self.assertEqual(opentelemetry.trace.get_current_span(), span1) + ) as span: + self.assertEqual(opentelemetry.trace.get_current_span(), span) await clock.sleep(4) - self.assertEqual(opentelemetry.trace.get_current_span(), span1) + self.assertEqual(opentelemetry.trace.get_current_span(), span) async def root(): with start_active_span("root_span", tracer=self._tracer) as root_span: @@ -163,12 +163,12 @@ class TracingTestCase(TestCase): self.assertEqual(opentelemetry.trace.get_current_span(), root_span) # start the test off - d1 = defer.ensureDeferred(root()) + root_defferred = defer.ensureDeferred(root()) # let the tasks complete reactor.pump((2,) * 8) - self.successResultOf(d1) + self.successResultOf(root_defferred) # Active span is unset now that we're outside of the `with` scopes self.assertEqual( opentelemetry.trace.get_current_span(), opentelemetry.trace.INVALID_SPAN