From f9df1e40907bec1cdcd40262998fb7f29b82e2df Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 10 Aug 2020 16:48:02 -0600 Subject: [PATCH] Add fixes --- .pylintrc | 1 + .../src/opentelemetry/exporter/otlp/exporter.py | 3 +++ .../exporter/otlp/metrics_exporter/__init__.py | 9 ++++++++- .../exporter/otlp/trace_exporter/__init__.py | 3 --- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index 5f9463df7d5..8f29b634f1b 100644 --- a/.pylintrc +++ b/.pylintrc @@ -65,6 +65,7 @@ disable=missing-docstring, too-few-public-methods, # Might be good to re-enable this later. too-many-instance-attributes, too-many-arguments, + duplicate-code, ungrouped-imports, # Leave this up to isort wrong-import-order, # Leave this up to isort bad-continuation, # Leave this up to black diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py index 6df9752922f..0ce7ef66177 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py @@ -189,3 +189,6 @@ def _export(self, data): return self.result.FAILURE return self._result.FAILURE + + def shutdown(self): + pass diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py index bd1ff4bf60c..944428e37d0 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/metrics_exporter/__init__.py @@ -15,7 +15,9 @@ """OTLP Metrics Exporter""" import logging +from typing import Sequence +# pylint: disable=duplicate-code from opentelemetry.exporter.otlp.exporter import ( OTLPExporterMixin, _get_resource_data, @@ -39,8 +41,9 @@ MetricDescriptor, ResourceMetrics, ) +from opentelemetry.sdk.metrics import Counter +from opentelemetry.sdk.metrics import Metric as SDKMetric from opentelemetry.sdk.metrics import ( - Counter, SumObserver, UpDownCounter, UpDownSumObserver, @@ -189,3 +192,7 @@ def _translate_data(self, data): "metrics", ) ) + + def export(self, metrics: Sequence[SDKMetric]) -> MetricsExportResult: + # pylint: disable=arguments-differ + return self._export(metrics) diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py index b61b0a55fd4..5a9a74a304f 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py @@ -204,6 +204,3 @@ def _translate_data(self, data) -> ExportTraceServiceRequest: def export(self, spans: Sequence[SDKSpan]) -> SpanExportResult: return self._export(spans) - - def shutdown(self): - pass