From 97a948ec84ccd4bbc59f9901a9a539d9575f0026 Mon Sep 17 00:00:00 2001 From: esigo Date: Sat, 18 Dec 2021 21:59:49 +0100 Subject: [PATCH 1/3] Jaeger exporter Shutdown --- .../opentelemetry/exporters/jaeger/jaeger_exporter.h | 5 +---- exporters/jaeger/src/jaeger_exporter.cc | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h index da2ed33719..ecb08114f4 100644 --- a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h +++ b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h @@ -65,10 +65,7 @@ class JaegerExporter final : public opentelemetry::sdk::trace::SpanExporter * @param timeout an option timeout, default to max. */ bool Shutdown( - std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override - { - return true; - } + std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; private: void InitializeEndpoint(); diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc index 6d1291130c..c4e6ac0f0b 100644 --- a/exporters/jaeger/src/jaeger_exporter.cc +++ b/exporters/jaeger/src/jaeger_exporter.cc @@ -85,6 +85,12 @@ void JaegerExporter::InitializeEndpoint() assert(false); } +bool JaegerExporter::Shutdown(std::chrono::microseconds timeout) noexcept +{ + is_shutdown_ = true; + return true; +} + } // namespace jaeger } // namespace exporter OPENTELEMETRY_END_NAMESPACE From 8dee88342542c6a9497ba57c3fb81abcac6e90fc Mon Sep 17 00:00:00 2001 From: esigo Date: Sat, 18 Dec 2021 22:00:56 +0100 Subject: [PATCH 2/3] Revert "Jaeger exporter Shutdown" This reverts commit 97a948ec84ccd4bbc59f9901a9a539d9575f0026. --- .../opentelemetry/exporters/jaeger/jaeger_exporter.h | 5 ++++- exporters/jaeger/src/jaeger_exporter.cc | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h index ecb08114f4..da2ed33719 100644 --- a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h +++ b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h @@ -65,7 +65,10 @@ class JaegerExporter final : public opentelemetry::sdk::trace::SpanExporter * @param timeout an option timeout, default to max. */ bool Shutdown( - std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; + std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override + { + return true; + } private: void InitializeEndpoint(); diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc index c4e6ac0f0b..6d1291130c 100644 --- a/exporters/jaeger/src/jaeger_exporter.cc +++ b/exporters/jaeger/src/jaeger_exporter.cc @@ -85,12 +85,6 @@ void JaegerExporter::InitializeEndpoint() assert(false); } -bool JaegerExporter::Shutdown(std::chrono::microseconds timeout) noexcept -{ - is_shutdown_ = true; - return true; -} - } // namespace jaeger } // namespace exporter OPENTELEMETRY_END_NAMESPACE From 19aa567822dc85549a258b7341973c8b8bda7457 Mon Sep 17 00:00:00 2001 From: esigo Date: Sat, 18 Dec 2021 22:02:36 +0100 Subject: [PATCH 3/3] Jaeger exporter Shutdown --- .../opentelemetry/exporters/jaeger/jaeger_exporter.h | 5 +---- exporters/jaeger/src/jaeger_exporter.cc | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h index da2ed33719..ecb08114f4 100644 --- a/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h +++ b/exporters/jaeger/include/opentelemetry/exporters/jaeger/jaeger_exporter.h @@ -65,10 +65,7 @@ class JaegerExporter final : public opentelemetry::sdk::trace::SpanExporter * @param timeout an option timeout, default to max. */ bool Shutdown( - std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override - { - return true; - } + std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; private: void InitializeEndpoint(); diff --git a/exporters/jaeger/src/jaeger_exporter.cc b/exporters/jaeger/src/jaeger_exporter.cc index 6d1291130c..c4e6ac0f0b 100644 --- a/exporters/jaeger/src/jaeger_exporter.cc +++ b/exporters/jaeger/src/jaeger_exporter.cc @@ -85,6 +85,12 @@ void JaegerExporter::InitializeEndpoint() assert(false); } +bool JaegerExporter::Shutdown(std::chrono::microseconds timeout) noexcept +{ + is_shutdown_ = true; + return true; +} + } // namespace jaeger } // namespace exporter OPENTELEMETRY_END_NAMESPACE