ForceFlush before cancling the running requests when shutdown.

owent · owent · commit 0b29cc3cb11b · 2024-07-01T15:24:51.000+08:00
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
@@ -275,7 +275,7 @@ class OtlpHttpClient
                  std::shared_ptr<ext::http::client::HttpClient> http_client);
 
   // Stores if this HTTP client had its Shutdown() method called
-  bool is_shutdown_;
+  std::atomic<bool> is_shutdown_;
 
   // The configuration options associated with this HTTP client.
   const OtlpHttpClientOptions options_;
diff --git a/exporters/otlp/src/otlp_grpc_client.cc b/exporters/otlp/src/otlp_grpc_client.cc
@@ -567,14 +567,21 @@ bool OtlpGrpcClient::Shutdown(std::chrono::microseconds timeout) noexcept
     return true;
   }
 
+  bool force_flush_result;
   if (false == is_shutdown_.exchange(true, std::memory_order_acq_rel))
   {
     is_shutdown_ = true;
 
+    force_flush_result = ForceFlush(timeout);
+
     async_data_->cq.Shutdown();
   }
+  else
+  {
+    force_flush_result = ForceFlush(timeout);
+  }
 
-  return ForceFlush(timeout);
+  return force_flush_result;
 }
 
 #endif
diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "opentelemetry/exporters/otlp/otlp_http_client.h"
+#include <chrono>
 
 #if defined(HAVE_GSL)
 #  include <gsl/gsl>
@@ -819,19 +820,23 @@ bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept
 
 bool OtlpHttpClient::Shutdown(std::chrono::microseconds timeout) noexcept
 {
+  is_shutdown_.store(true, std::memory_order_release);
+
+  ForceFlush(timeout);
+
   {
     std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-    is_shutdown_ = true;
 
     // Shutdown the session manager
     http_client_->CancelAllSessions();
     http_client_->FinishAllSessions();
   }
 
-  ForceFlush(timeout);
-
+  // Wait util all sessions are canceled.
   while (cleanupGCSessions())
-    ;
+  {
+    ForceFlush(std::chrono::milliseconds{1});
+  }
   return true;
 }
 
@@ -1017,7 +1022,7 @@ bool OtlpHttpClient::cleanupGCSessions() noexcept
 
 bool OtlpHttpClient::IsShutdown() const noexcept
 {
-  return is_shutdown_;
+  return is_shutdown_.load(std::memory_order_acquire);
 }
 
 }  // namespace otlp

Original file line number	Diff line number	Diff line change
`@@ -567,14 +567,21 @@ bool OtlpGrpcClient::Shutdown(std::chrono::microseconds timeout) noexcept`
`567`	`567`	`return true;`
`568`	`568`	`}`
`569`	`569`
	`570`	`+ bool force_flush_result;`
`570`	`571`	`if (false == is_shutdown_.exchange(true, std::memory_order_acq_rel))`
`571`	`572`	`{`
`572`	`573`	`is_shutdown_ = true;`
`573`	`574`
	`575`	`+ force_flush_result = ForceFlush(timeout);`
	`576`	`+`
`574`	`577`	`async_data_->cq.Shutdown();`
`575`	`578`	`}`
	`579`	`+ else`
	`580`	`+ {`
	`581`	`+ force_flush_result = ForceFlush(timeout);`
	`582`	`+ }`
`576`	`583`
`577`		`- return ForceFlush(timeout);`
	`584`	`+ return force_flush_result;`
`578`	`585`	`}`
`579`	`586`
`580`	`587`	`#endif`