From 070195afeee13aaa432af74a685e41f2a5a07277 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Fri, 29 Jul 2022 22:49:34 -0500
Subject: [PATCH] Use correct type for what start_as_current_span returns

See:

 - https://github.com/open-telemetry/opentelemetry-python/pull/198#discussion_r333399436
 - https://github.com/open-telemetry/opentelemetry-python/issues/219
---
 synapse/logging/tracing.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py
index 8385eb88d62a..8c8b713dd56a 100644
--- a/synapse/logging/tracing.py
+++ b/synapse/logging/tracing.py
@@ -173,6 +173,7 @@ def set_fates(clotho, lachesis, atropos, father="Zues", mother="Themis"):
     TYPE_CHECKING,
     Any,
     Callable,
+    ContextManager,
     Dict,
     Generator,
     Iterable,
@@ -476,7 +477,7 @@ def start_active_span(
     end_on_exit: bool = True,
     # For testing only
     tracer: Optional["opentelemetry.sdk.trace.TracerProvider"] = None,
-) -> Iterator["opentelemetry.trace.span.Span"]:
+) -> ContextManager["opentelemetry.trace.span.Span"]:
     if opentelemetry is None:
         return contextlib.nullcontext()  # type: ignore[unreachable]