fix(typing): update types to be compatible with latest mypy (backport #…

…4234) (backport #4263) (#4278)

* fix(typing): update types to be compatible with latest mypy (backport #4234) (#4263)

* fix(typing): update types to be compatible with latest mypy (#4234)

* Initial mypy fixes for CI

* Ignored mypy error with type and type constructors

* Fix formatting

* Fixed incorrect typing

* Undo initial change

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
(cherry picked from commit 5140de4)

* ci(mypy): remove type callable ignores (backport #4253) (#4258)

* Remove ignores for updated mypy (#4253)

Mypy==0.982 has just been released and fixed the inherent type/callable type hinting that was the problem from #4234. As a result, the type ignore comments added in #4234 to bypass the type/callable issue are not unneeded and are breaking CI.

(cherry picked from commit 0ba3e29)

# Conflicts:
#	ddtrace/profiling/collector/memalloc.py
#	ddtrace/profiling/exporter/http.py

* fix conflicts

Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>

Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com>
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
(cherry picked from commit 026d614)

# Conflicts:
#	ddtrace/debugging/_debugger.py
#	ddtrace/internal/utils/cache.py
#	ddtrace/profiling/collector/asyncio.py

* Resolve merge conflicts with 0.61

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Yun Kim <yun.kim@datadoghq.com>

ddtrace/internal/atexit.py

@@ -45,7 +45,7 @@ def register(
         return func
 
     def unregister(func):
-        # type: (typing.Callable[..., None]) -> None
+        # type: (typing.Callable[..., typing.Any]) -> None
         """
         Unregister an exit function which was previously registered using
         atexit.register.

ddtrace/internal/runtime/runtime_metrics.py

@@ -148,7 +148,7 @@ def flush(self):
                 log.debug("Writing metric %s:%s", key, value)
                 self._dogstatsd_client.distribution(key, value)
 
-    def _stop_service(self):  # type: ignore[override]
+    def _stop_service(self):
         # type: (...) -> None
         # De-register span hook
         super(RuntimeWorker, self)._stop_service()

ddtrace/internal/utils/cache.py

@@ -11,9 +11,8 @@
 miss = object()
 
 T = TypeVar("T")
-S = TypeVar("S")
-F = Callable[[T], S]
-M = Callable[[Any, T], S]
+F = Callable[[T], Any]
+M = Callable[[Any, T], Any]
 
 
 def cached(maxsize=256):
@@ -32,7 +31,7 @@ def cached_wrapper(f):
         lock = RLock()
 
         def cached_f(key):
-            # type: (T) -> S
+            # type: (T) -> Any
             if len(cache) >= maxsize:
                 for _, h in zip(range(maxsize >> 1), sorted(cache, key=lambda h: cache[h][1])):
                     del cache[h]

ddtrace/internal/writer.py

@@ -549,7 +549,7 @@ def flush_queue(self, raise_exc=False):
     def periodic(self):
         self.flush_queue(raise_exc=False)
 
-    def _stop_service(  # type: ignore[override]
+    def _stop_service(
         self,
         timeout=None,  # type: Optional[float]
     ):

ddtrace/profiling/collector/_lock.py

@@ -197,13 +197,13 @@ def _set_original(
         # type: (...) -> None
         pass
 
-    def _start_service(self):  # type: ignore[override]
+    def _start_service(self):
         # type: (...) -> None
         """Start collecting lock usage."""
         self.patch()
         super(LockCollector, self)._start_service()
 
-    def _stop_service(self):  # type: ignore[override]
+    def _stop_service(self):
         # type: (...) -> None
         """Stop collecting lock usage."""
         super(LockCollector, self)._stop_service()

ddtrace/profiling/collector/memalloc.py

@@ -93,7 +93,7 @@ class MemoryCollector(collector.PeriodicCollector):
     heap_sample_size = attr.ib(type=int, factory=_get_default_heap_sample_size)
     ignore_profiler = attr.ib(factory=attr_utils.from_env("DD_PROFILING_IGNORE_PROFILER", False, formats.asbool))
 
-    def _start_service(self):  # type: ignore[override]
+    def _start_service(self):
         # type: (...) -> None
         """Start collecting memory profiles."""
         if _memalloc is None:
@@ -103,7 +103,7 @@ def _start_service(self):  # type: ignore[override]
 
         super(MemoryCollector, self)._start_service()
 
-    def _stop_service(self):  # type: ignore[override]
+    def _stop_service(self):
         # type: (...) -> None
         super(MemoryCollector, self)._stop_service()
 

ddtrace/profiling/profiler.py

@@ -225,7 +225,7 @@ def copy(self):
             service=self.service, env=self.env, version=self.version, tracer=self.tracer, tags=self.tags
         )
 
-    def _start_service(self):  # type: ignore[override]
+    def _start_service(self):
         # type: (...) -> None
         """Start the profiler."""
         collectors = []
@@ -243,7 +243,7 @@ def _start_service(self):  # type: ignore[override]
         if self._scheduler is not None:
             self._scheduler.start()
 
-    def _stop_service(  # type: ignore[override]
+    def _stop_service(
         self, flush=True  # type: bool
     ):
         # type: (...) -> None

ddtrace/profiling/scheduler.py

@@ -28,7 +28,7 @@ def __attrs_post_init__(self):
         # Copy the value to use it later since we're going to adjust the real interval
         self._configured_interval = self.interval
 
-    def _start_service(self):  # type: ignore[override]
+    def _start_service(self):
         # type: (...) -> None
         """Start the scheduler."""
         LOG.debug("Starting scheduler")

ddtrace/tracer.py

@@ -228,7 +228,7 @@ def log(self, value):
     def debug_logging(self):
         return log.isEnabledFor(logging.DEBUG)
 
-    @debug_logging.setter  # type: ignore[misc]
+    @debug_logging.setter
     @removals.remove(
         message="Use logging.setLevel instead", category=DDTraceDeprecationWarning, removal_version="1.0.0"
     )

ddtrace/utils/cache.py

@@ -3,7 +3,6 @@
 from ..internal.utils.cache import CachedMethodDescriptor  # noqa
 from ..internal.utils.cache import F  # noqa
 from ..internal.utils.cache import M  # noqa
-from ..internal.utils.cache import S  # noqa
 from ..internal.utils.cache import T  # noqa
 from ..internal.utils.cache import cached  # noqa
 from ..internal.utils.cache import cachedmethod  # noqa