From c9f5d4c08d661de35c2e39ec7e065d0bced61817 Mon Sep 17 00:00:00 2001
From: owent <admin@owent.net>
Date: Mon, 6 Mar 2023 10:06:47 +0800
Subject: [PATCH] Call `TracerContext::ForceFlush` when force flush or shut a
 tracer, fix the unit test in #1793 .

Signed-off-by: owent <admin@owent.net>
---
 .../opentelemetry/sdk/trace/tracer_context.h       |  2 +-
 sdk/src/trace/tracer.cc                            | 14 ++++++++++++--
 sdk/src/trace/tracer_context.cc                    |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_context.h b/sdk/include/opentelemetry/sdk/trace/tracer_context.h
index 573af20b7d..6dcdda8e01 100644
--- a/sdk/include/opentelemetry/sdk/trace/tracer_context.h
+++ b/sdk/include/opentelemetry/sdk/trace/tracer_context.h
@@ -87,7 +87,7 @@ class TracerContext
   /**
    * Shutdown the span processor associated with this tracer provider.
    */
-  bool Shutdown() noexcept;
+  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
 
 private:
   //  order of declaration is important here - resource object should be destroyed after processor.
diff --git a/sdk/src/trace/tracer.cc b/sdk/src/trace/tracer.cc
index 74e16bdfe0..07fd36d5b7 100644
--- a/sdk/src/trace/tracer.cc
+++ b/sdk/src/trace/tracer.cc
@@ -104,12 +104,22 @@ nostd::shared_ptr<trace_api::Span> Tracer::StartSpan(
 
 void Tracer::ForceFlushWithMicroseconds(uint64_t timeout) noexcept
 {
-  (void)timeout;
+  if (context_)
+  {
+    context_->ForceFlush(
+        std::chrono::microseconds{static_cast<std::chrono::microseconds::rep>(timeout)});
+  }
 }
 
 void Tracer::CloseWithMicroseconds(uint64_t timeout) noexcept
 {
-  (void)timeout;
+  // Trace context is shared by many tracers.So we just call ForceFlush to flush all pending spans
+  // and do not  shutdown it.
+  if (context_)
+  {
+    context_->ForceFlush(
+        std::chrono::microseconds{static_cast<std::chrono::microseconds::rep>(timeout)});
+  }
 }
 }  // namespace trace
 }  // namespace sdk
diff --git a/sdk/src/trace/tracer_context.cc b/sdk/src/trace/tracer_context.cc
index d204218021..0b89c5cefb 100644
--- a/sdk/src/trace/tracer_context.cc
+++ b/sdk/src/trace/tracer_context.cc
@@ -53,9 +53,9 @@ bool TracerContext::ForceFlush(std::chrono::microseconds timeout) noexcept
   return processor_->ForceFlush(timeout);
 }
 
-bool TracerContext::Shutdown() noexcept
+bool TracerContext::Shutdown(std::chrono::microseconds timeout) noexcept
 {
-  return processor_->Shutdown();
+  return processor_->Shutdown(timeout);
 }
 
 }  // namespace trace