fix type hints

open-telemetry · May 26, 2021 · 0fafe94 · 0fafe94
1 parent e00338d
commit 0fafe94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py
@@ -186,7 +186,7 @@ def export(self) -> None:
                 self.flush_condition.notify()
 
     def _drain_queue(self):
-        """ "Export all elements until queue is empty.
+        """Export all elements until queue is empty.
 
         Can only be called from the worker thread context because it invokes
         `export` that is not thread safe.

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py
@@ -19,9 +19,12 @@
 
 from abc import ABC, abstractmethod
 from logging import getLogger
-from typing import Collection
+from typing import Collection, Optional
 
-from opentelemetry.instrumentation.dependencies import get_dependency_conflicts
+from opentelemetry.instrumentation.dependencies import (
+    DependencyConflict,
+    get_dependency_conflicts,
+)
 
 _LOG = getLogger(__name__)
 
@@ -72,7 +75,7 @@ def _instrument(self, **kwargs):
     def _uninstrument(self, **kwargs):
         """Uninstrument the library"""
 
-    def _check_dependency_conflicts(self) -> bool:
+    def _check_dependency_conflicts(self) -> Optional[DependencyConflict]:
         dependencies = self.instrumentation_dependencies()
         return get_dependency_conflicts(dependencies)