From b005fcd56a2ff729a91684c991c0d105b2586aca Mon Sep 17 00:00:00 2001 From: alrex Date: Thu, 22 Oct 2020 21:07:31 -0700 Subject: [PATCH] Revert "exporter/jaeger: Either collector submit batch or Agent emit batch (#982)" This reverts commit ed0198d7b61905b81a7803b1cd001550e7438310. --- .../src/opentelemetry/exporter/jaeger/__init__.py | 3 +-- .../tests/test_jaeger_exporter.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py index ccb530b7a..afa0b2578 100644 --- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py +++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py @@ -168,8 +168,7 @@ class JaegerSpanExporter(SpanExporter): if self.collector is not None: self.collector.submit(batch) - else: - self.agent_client.emit(batch) + self.agent_client.emit(batch) return SpanExportResult.SUCCESS diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py index a8809f88a..7b3916c5b 100644 --- a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py +++ b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py @@ -367,7 +367,7 @@ class TestJaegerSpanExporter(unittest.TestCase): exporter._collector = collector_mock exporter.export((self._test_span,)) - self.assertEqual(agent_client_mock.emit.call_count, 1) + self.assertEqual(agent_client_mock.emit.call_count, 2) self.assertEqual(collector_mock.submit.call_count, 1) def test_agent_client(self):