fix core: await pending requests completion in clients::http::Client destructor

commit_hash:84e415cc3be3bbcfc3918ad949fc3853ec5c4f9e

Author: smorivan

core/include/userver/clients/http/client_with_plugins.hpp

@@ -10,6 +10,7 @@
 #include <userver/clients/http/client.hpp>
 #include <userver/clients/http/plugin.hpp>
 #include <userver/utils/impl/internal_tag.hpp>
+#include <userver/utils/impl/wait_token_storage.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
@@ -46,6 +47,7 @@ class ClientWithPlugins final : public Client {
 private:
     std::shared_ptr<ClientCore> client_core_;
     std::vector<utils::NotNull<clients::http::Plugin*>> plugins_;
+    utils::impl::WaitTokenStorage wts_;
 };
 
 }  // namespace clients::http

core/include/userver/clients/http/request.hpp

@@ -15,6 +15,7 @@
 #include <userver/crypto/certificate.hpp>
 #include <userver/crypto/private_key.hpp>
 #include <userver/http/http_version.hpp>
+#include <userver/utils/impl/internal_tag.hpp>
 #include <userver/utils/impl/source_location.hpp>
 #include <userver/utils/not_null.hpp>
 
@@ -24,6 +25,10 @@ namespace tracing {
 class TracingManagerBase;
 }  // namespace tracing
 
+namespace utils::impl {
+class WaitTokenStorageLock;
+}  // namespace utils::impl
+
 /// HTTP client helpers
 namespace clients::http {
 
@@ -350,6 +355,8 @@ class Request final {
 
     // Set deadline propagation settings. For internal use only.
     void SetDeadlinePropagationConfig(const DeadlinePropagationConfig& deadline_propagation_config) &;
+
+    void SetWaitToken(utils::impl::InternalTag, utils::impl::WaitTokenStorageLock&&);
     /// @endcond
 
     /// Disable auto-decoding of received replies. Useful to proxy replies 'as is'.

core/src/clients/http/client_with_plugins.cpp

@@ -13,11 +13,12 @@ ClientWithPlugins::ClientWithPlugins(
 )
     : client_core_(std::move(client_core)), plugins_(std::move(plugins)) {}
 
-ClientWithPlugins::~ClientWithPlugins() = default;
+ClientWithPlugins::~ClientWithPlugins() { wts_.WaitForAllTokens(); }
 
 Request ClientWithPlugins::CreateRequest() {
     auto request = client_core_->CreateRequest();
     request.SetPluginsList(plugins_);
+    request.SetWaitToken(utils::impl::InternalTag{}, wts_.GetToken());
     return request;
 }
 

core/src/clients/http/request.cpp

@@ -558,6 +558,10 @@ const std::string& Request::GetData() const& { return pimpl_->easy().get_post_da
 
 std::string Request::ExtractData() { return pimpl_->easy().extract_post_data(); }
 
+void Request::SetWaitToken(utils::impl::InternalTag, utils::impl::WaitTokenStorageLock&& wait_token) {
+    pimpl_->SetWaitToken(std::move(wait_token));
+}
+
 }  // namespace clients::http
 
 USERVER_NAMESPACE_END

core/src/clients/http/request_state.cpp

@@ -1096,6 +1096,8 @@ void RequestState::SetTracingManager(const tracing::TracingManagerBase& m) { tra
 
 PluginRequest RequestState::GetEditableRequestInstance() { return PluginRequest(*this); }
 
+void RequestState::SetWaitToken(utils::impl::WaitTokenStorageLock&& wait_token) { wait_token_ = std::move(wait_token); }
+
 }  // namespace clients::http
 
 USERVER_NAMESPACE_END

core/src/clients/http/request_state.hpp

@@ -25,6 +25,7 @@
 #include <userver/tracing/manager.hpp>
 #include <userver/tracing/span.hpp>
 #include <userver/tracing/tags.hpp>
+#include <userver/utils/impl/wait_token_storage.hpp>
 #include <userver/utils/not_null.hpp>
 #include <userver/utils/zstring_view.hpp>
 
@@ -145,6 +146,8 @@ class RequestState : public std::enable_shared_from_this<RequestState> {
 
     void SetTracingManager(const tracing::TracingManagerBase&);
 
+    void SetWaitToken(utils::impl::WaitTokenStorageLock&&);
+
     /// true if proxy was set using proxy method
     bool IsProxySet() const;
 
@@ -264,6 +267,8 @@ class RequestState : public std::enable_shared_from_this<RequestState> {
     };
 
     std::variant<FullBufferedData, StreamData> data_;
+
+    utils::impl::WaitTokenStorageLock wait_token_;
 };
 
 }  // namespace clients::http