celery: remove deprecated import of ContextManager from typing (#3145)

* celery: remove deprecated import of ContextManager from typing

Signed-off-by: emdneto <[email protected]>

* add type checking

Signed-off-by: emdneto <[email protected]>

* ruff

Signed-off-by: emdneto <[email protected]>

---------

Signed-off-by: emdneto <[email protected]>

Author: emdneto

instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py

@@ -12,15 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import logging
-from typing import ContextManager, Optional, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
 
 from celery import registry  # pylint: disable=no-name-in-module
 from celery.app.task import Task
 
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Span
 
+if TYPE_CHECKING:
+    from contextlib import AbstractContextManager
+
 logger = logging.getLogger(__name__)
 
 # Celery Context key
@@ -123,7 +128,7 @@ def attach_context(
     task: Optional[Task],
     task_id: str,
     span: Span,
-    activation: ContextManager[Span],
+    activation: AbstractContextManager[Span],
     token: Optional[object],
     is_publish: bool = False,
 ) -> None:
@@ -171,7 +176,7 @@ def detach_context(task, task_id, is_publish=False) -> None:
 
 def retrieve_context(
     task, task_id, is_publish=False
-) -> Optional[Tuple[Span, ContextManager[Span], Optional[object]]]:
+) -> Optional[Tuple[Span, AbstractContextManager[Span], Optional[object]]]:
     """Helper to retrieve an active `Span`, `ContextManager` and context token
     stored in a `Task` instance
     """

instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt

@@ -1,6 +1,6 @@
 amqp==5.2.0
 asgiref==3.8.1
-billiard==4.2.0
+billiard==4.2.1
 celery==5.3.6
 click==8.1.7
 click-didyoumean==0.3.0