From 35e7010a0d635dea850a5ba4cf863f8f49a647cd Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Thu, 27 May 2021 01:11:52 +0530 Subject: [PATCH] fix type hints --- .../src/opentelemetry/exporter/datadog/spanprocessor.py | 2 +- .../src/opentelemetry/instrumentation/instrumentor.py | 9 ++++++--- 2 files changed, 7 insertions(+), 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 index 155fd9d3fc..1eb7aed740 100644 --- 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 index 9a77b9c8f0..43a4ea59bb 100644 --- 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)