Skip to content

Commit 337d331

Browse files
committed
fix type hints
1 parent 1985f2c commit 337d331

File tree

2 files changed

+7
-4
lines changed
  • exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog
  • opentelemetry-instrumentation/src/opentelemetry/instrumentation

2 files changed

+7
-4
lines changed

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def export(self) -> None:
186186
self.flush_condition.notify()
187187

188188
def _drain_queue(self):
189-
""" "Export all elements until queue is empty.
189+
"""Export all elements until queue is empty.
190190
191191
Can only be called from the worker thread context because it invokes
192192
`export` that is not thread safe.

Diff for: opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919

2020
from abc import ABC, abstractmethod
2121
from logging import getLogger
22-
from typing import Collection
22+
from typing import Collection, Optional
2323

24-
from opentelemetry.instrumentation.dependencies import get_dependency_conflicts
24+
from opentelemetry.instrumentation.dependencies import (
25+
DependencyConflict,
26+
get_dependency_conflicts,
27+
)
2528

2629
_LOG = getLogger(__name__)
2730

@@ -72,7 +75,7 @@ def _instrument(self, **kwargs):
7275
def _uninstrument(self, **kwargs):
7376
"""Uninstrument the library"""
7477

75-
def _check_dependency_conflicts(self) -> bool:
78+
def _check_dependency_conflicts(self) -> Optional[DependencyConflict]:
7679
dependencies = self.instrumentation_dependencies()
7780
return get_dependency_conflicts(dependencies)
7881

0 commit comments

Comments
 (0)