From ec2c99148de0ff0a67f677eddea8cc299a6f1e2b Mon Sep 17 00:00:00 2001 From: Vu Tuan Dat Date: Wed, 12 Aug 2020 10:18:53 +0700 Subject: [PATCH 1/2] Either collector submit batch or Agent emit batch --- .../src/opentelemetry/exporter/jaeger/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 993bf4f0872..ead918f2dca 100644 --- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py +++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py @@ -162,7 +162,8 @@ def export(self, spans): if self.collector is not None: self.collector.submit(batch) - self.agent_client.emit(batch) + else: + self.agent_client.emit(batch) return SpanExportResult.SUCCESS From a317e37fcaad810935a746d549e488baf165d9da Mon Sep 17 00:00:00 2001 From: Vu Tuan Dat Date: Wed, 12 Aug 2020 10:38:10 +0700 Subject: [PATCH 2/2] Change agent_client call in unittest --- .../opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py index 30b7c85826a..b0ea491e764 100644 --- a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py +++ b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py @@ -362,7 +362,7 @@ def test_export(self): exporter._collector = collector_mock exporter.export((self._test_span,)) - self.assertEqual(agent_client_mock.emit.call_count, 2) + self.assertEqual(agent_client_mock.emit.call_count, 1) self.assertEqual(collector_mock.submit.call_count, 1) def test_agent_client(self):