Adjust opentracing return types for mocks (#6527)

stubs/opentracing/opentracing/mocktracer/binary_propagator.pyi

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ..span import SpanContext
+from .context import SpanContext
 from .propagator import Propagator
 
 class BinaryPropagator(Propagator):

stubs/opentracing/opentracing/mocktracer/context.pyi

@@ -1,3 +1,5 @@
+from _typeshed import Self
+
 import opentracing
 
 class SpanContext(opentracing.SpanContext):
@@ -6,4 +8,4 @@ class SpanContext(opentracing.SpanContext):
     def __init__(self, trace_id: int | None = ..., span_id: int | None = ..., baggage: dict[str, str] | None = ...) -> None: ...
     @property
     def baggage(self) -> dict[str, str]: ...
-    def with_baggage_item(self, key: str, value: str) -> SpanContext: ...
+    def with_baggage_item(self: Self, key: str, value: str) -> Self: ...

stubs/opentracing/opentracing/mocktracer/propagator.pyi

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ..span import SpanContext
+from .context import SpanContext
 
 class Propagator:
     def inject(self, span_context: SpanContext, carrier: dict[Any, Any]) -> None: ...

stubs/opentracing/opentracing/mocktracer/span.pyi

@@ -1,7 +1,10 @@
+from _typeshed import Self
 from typing import Any
 
-from ..span import Span, SpanContext
+from ..span import Span
 from ..tracer import Tracer
+from .context import SpanContext
+from .tracer import MockTracer
 
 class MockSpan(Span):
     operation_name: str | None
@@ -20,12 +23,12 @@ class MockSpan(Span):
         tags: dict[str, Any] | None = ...,
         start_time: float | None = ...,
     ) -> None: ...
-    def set_operation_name(self, operation_name: str) -> Span: ...
-    def set_tag(self, key: str, value: str | bool | int | float) -> Span: ...
-    def log_kv(self, key_values: dict[str, Any], timestamp: float | None = ...) -> Span: ...
-    def finish(self, finish_time: float | None = ...) -> None: ...
-    def set_baggage_item(self, key: str, value: str) -> Span: ...
-    def get_baggage_item(self, key: str) -> str | None: ...
+    @property
+    def tracer(self) -> MockTracer: ...
+    def set_operation_name(self: Self, operation_name: str) -> Self: ...
+    def set_tag(self: Self, key: str, value: str | bool | int | float) -> Self: ...
+    def log_kv(self: Self, key_values: dict[str, Any], timestamp: float | None = ...) -> Self: ...
+    def set_baggage_item(self: Self, key: str, value: str) -> Self: ...
 
 class LogData:
     key_values: dict[str, Any]

stubs/opentracing/opentracing/mocktracer/text_propagator.pyi

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ..span import SpanContext
+from .context import SpanContext
 from .propagator import Propagator
 
 prefix_tracer_state: str

stubs/opentracing/opentracing/mocktracer/tracer.pyi

@@ -1,10 +1,26 @@
+from typing import Any
+
 from ..scope_manager import ScopeManager
 from ..span import Span
-from ..tracer import Tracer
+from ..tracer import Reference, Tracer
+from .context import SpanContext
 from .propagator import Propagator
+from .span import MockSpan
 
 class MockTracer(Tracer):
     def __init__(self, scope_manager: ScopeManager | None = ...) -> None: ...
+    @property
+    def active_span(self) -> MockSpan | None: ...
     def register_propagator(self, format: str, propagator: Propagator) -> None: ...
-    def finished_spans(self) -> list[Span]: ...
+    def finished_spans(self) -> list[MockSpan]: ...
     def reset(self) -> None: ...
+    def start_span(  # type: ignore[override]
+        self,
+        operation_name: str | None = ...,
+        child_of: Span | SpanContext | None = ...,
+        references: list[Reference] | None = ...,
+        tags: dict[Any, Any] | None = ...,
+        start_time: float | None = ...,
+        ignore_active_span: bool = ...,
+    ) -> MockSpan: ...
+    def extract(self, format: str, carrier: dict[Any, Any]) -> SpanContext: ...

stubs/opentracing/opentracing/span.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Self
 from types import TracebackType
 from typing import Any, Type
 
@@ -14,15 +15,15 @@ class Span:
     def context(self) -> SpanContext: ...
     @property
     def tracer(self) -> Tracer: ...
-    def set_operation_name(self, operation_name: str) -> Span: ...
+    def set_operation_name(self: Self, operation_name: str) -> Self: ...
     def finish(self, finish_time: float | None = ...) -> None: ...
-    def set_tag(self, key: str, value: str | bool | int | float) -> Span: ...
-    def log_kv(self, key_values: dict[str, Any], timestamp: float | None = ...) -> Span: ...
-    def set_baggage_item(self, key: str, value: str) -> Span: ...
+    def set_tag(self: Self, key: str, value: str | bool | int | float) -> Self: ...
+    def log_kv(self: Self, key_values: dict[str, Any], timestamp: float | None = ...) -> Self: ...
+    def set_baggage_item(self: Self, key: str, value: str) -> Self: ...
     def get_baggage_item(self, key: str) -> str | None: ...
-    def __enter__(self) -> Span: ...
+    def __enter__(self: Self) -> Self: ...
     def __exit__(
         self, exc_type: Type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...
-    def log_event(self, event: Any, payload: Any | None = ...) -> Span: ...
-    def log(self, **kwargs: Any) -> Span: ...
+    def log_event(self: Self, event: Any, payload: Any | None = ...) -> Self: ...
+    def log(self: Self, **kwargs: Any) -> Self: ...