From b6f56656ab95b26fdbaccdcf94d77211688732c7 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Wed, 3 Aug 2022 00:10:14 -0500 Subject: 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 --- tests/logging/test_tracing.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') 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 -- cgit 1.5.1