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 Original file line number Diff line number Diff line change @@ -186,7 +186,7 @@ def export(self) -> None:
186
186
self .flush_condition .notify ()
187
187
188
188
def _drain_queue (self ):
189
- """ " Export all elements until queue is empty.
189
+ """Export all elements until queue is empty.
190
190
191
191
Can only be called from the worker thread context because it invokes
192
192
`export` that is not thread safe.
Original file line number Diff line number Diff line change 19
19
20
20
from abc import ABC , abstractmethod
21
21
from logging import getLogger
22
- from typing import Collection
22
+ from typing import Collection , Optional
23
23
24
- from opentelemetry .instrumentation .dependencies import get_dependency_conflicts
24
+ from opentelemetry .instrumentation .dependencies import (
25
+ DependencyConflict ,
26
+ get_dependency_conflicts ,
27
+ )
25
28
26
29
_LOG = getLogger (__name__ )
27
30
@@ -72,7 +75,7 @@ def _instrument(self, **kwargs):
72
75
def _uninstrument (self , ** kwargs ):
73
76
"""Uninstrument the library"""
74
77
75
- def _check_dependency_conflicts (self ) -> bool :
78
+ def _check_dependency_conflicts (self ) -> Optional [ DependencyConflict ] :
76
79
dependencies = self .instrumentation_dependencies ()
77
80
return get_dependency_conflicts (dependencies )
78
81
You can’t perform that action at this time.
0 commit comments