feat clients: enable deadline propagation by default

userver-framework · Jul 5, 2023 · 965b1c6 · 965b1c6
1 parent cf48e5c
commit 965b1c6
Show file tree

Hide file tree

Showing 69 changed files with 249 additions and 478 deletions.
diff --git a/clickhouse/functional_tests/basic_chaos/dynamic_config_fallback.json b/clickhouse/functional_tests/basic_chaos/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/clickhouse/functional_tests/metrics/dynamic_config_fallback.json b/clickhouse/functional_tests/metrics/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/clickhouse/tests/dynamic_config_fallback.json b/clickhouse/tests/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/conan/test_package/hello_service/dynamic_config_fallback.json b/conan/test_package/hello_service/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/core/functional_tests/basic_chaos/dynamic_config_fallback.json b/core/functional_tests/basic_chaos/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/core/functional_tests/basic_chaos/httpserver_handlers.hpp b/core/functional_tests/basic_chaos/httpserver_handlers.hpp
@@ -32,8 +32,8 @@ class HttpServerHandler final : public server::handlers::HttpHandlerBase {
  }
 
  if (type == "sleep") {
- engine::SleepFor(std::chrono::milliseconds{200});
  TESTPOINT("testpoint_request", {});
+ engine::SleepFor(std::chrono::milliseconds{200});
  return kDefaultAnswer;
  }
 

diff --git a/core/functional_tests/cache_update/dynamic_config_fallback.json b/core/functional_tests/cache_update/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/core/functional_tests/metrics/dynamic_config_fallback.json b/core/functional_tests/metrics/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/core/functional_tests/uctl/dynamic_config_fallback.json b/core/functional_tests/uctl/dynamic_config_fallback.json
@@ -7,10 +7,6 @@
  "max-size": 100,
  "token-update-interval-ms": 0
  },
- "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": {
- "cancel-request": false,
- "update-timeout": false
- },
  "USERVER_BAGGAGE_ENABLED": false,
  "USERVER_CACHES": {},
  "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false,

diff --git a/core/include/userver/clients/http/client.hpp b/core/include/userver/clients/http/client.hpp
@@ -12,6 +12,7 @@
 #include <userver/moodycamel/concurrentqueue_fwd.h>
 
 #include <userver/clients/dns/resolver_fwd.hpp>
+#include <userver/clients/http/impl/config.hpp>
 #include <userver/clients/http/plugin.hpp>
 #include <userver/clients/http/request.hpp>
 #include <userver/engine/task/task_processor_fwd.hpp>
@@ -47,25 +48,12 @@ namespace impl {
 class EasyWrapper;
 } // namespace impl
 
-struct Config;
 struct TestsuiteConfig;
-struct EnforceTaskDeadlineConfig;
 class Statistics;
 struct PoolStatistics;
 struct InstanceStatistics;
 class DestinationStatistics;
 
-struct ClientSettings final {
- std::string thread_name_prefix;
- size_t io_threads = 8;
- bool defer_events = false;
- const tracing::TracingManagerBase* tracing_manager_{nullptr};
- const server::http::HeadersPropagator* headers_propagator_{nullptr};
-};
-
-ClientSettings Parse(const yaml_config::YamlConfig& value,
- formats::parse::To<ClientSettings>);
-
 /// @ingroup userver_clients
 ///
 /// @brief HTTP client that returns a HTTP request builder from
@@ -78,8 +66,10 @@ ClientSettings Parse(const yaml_config::YamlConfig& value,
 /// @snippet clients/http/client_test.cpp Sample HTTP Client usage
 class Client final {
  public:
- Client(ClientSettings settings, engine::TaskProcessor& fs_task_processor,
+ Client(impl::ClientSettings settings,
+ engine::TaskProcessor& fs_task_processor,
  impl::PluginPipeline&& plugin_pipeline);
+
  ~Client();
 
  /// @brief Returns a HTTP request builder type with preset values of
@@ -117,7 +107,7 @@ class Client final {
  void SetAllowedUrlsExtra(std::vector<std::string>&& urls);
 
  // For internal use only.
- void SetConfig(const Config&);
+ void SetConfig(const impl::Config&);
  /// @endcond
 
  /// @brief Sets User-Agent headers for all the requests or removes that
@@ -140,8 +130,6 @@ class Client final {
  /// (most likely getaddrinfo).
  void SetDnsResolver(clients::dns::Resolver* resolver);
 
- void SetTracingManager(const tracing::TracingManagerBase&);
-
  private:
  void ReinitEasy();
 
@@ -159,7 +147,8 @@ class Client final {
  std::shared_ptr<curl::easy> TryDequeueIdle() noexcept;
 
  std::atomic<std::size_t> pending_tasks_{0};
- rcu::Variable<EnforceTaskDeadlineConfig> enforce_task_deadline_;
+
+ const impl::DeadlinePropagationConfig deadline_propagation_config_;
 
  std::shared_ptr<DestinationStatistics> destination_statistics_;
  std::unique_ptr<engine::ev::ThreadPool> thread_pool_;

diff --git a/core/include/userver/clients/http/component.hpp b/core/include/userver/clients/http/component.hpp
@@ -29,7 +29,6 @@ namespace components {
 /// ## Dynamic options:
 /// * @ref HTTP_CLIENT_CONNECT_THROTTLE
 /// * @ref HTTP_CLIENT_CONNECTION_POOL_SIZE
-/// * @ref HTTP_CLIENT_ENFORCE_TASK_DEADLINE
 /// * @ref USERVER_HTTP_PROXY
 ///
 /// ## Static options:
@@ -47,6 +46,7 @@ namespace components {
 /// testsuite-timeout | if set, force the request timeout regardless of the value passed in code | -
 /// testsuite-allowed-url-prefixes | if set, checks that all URLs start with any of the passed prefixes, asserts if not. Set for testing purposes only. | ''
 /// dns_resolver | server hostname resolver type (getaddrinfo or async) | 'async'
+/// set-deadline-propagation-header | whether to set http::common::kXYaTaxiClientTimeoutMs request header | true
 /// plugins | Plugin names to apply. A plugin component is called "http-client-plugin-" plus the plugin name.
 ///
 /// ## Static configuration example:

diff --git a/core/include/userver/clients/http/impl/config.hpp b/core/include/userver/clients/http/impl/config.hpp
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <chrono>
+#include <string>
+
+#include <userver/dynamic_config/fwd.hpp>
+#include <userver/formats/json_fwd.hpp>
+#include <userver/yaml_config/fwd.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace tracing {
+class TracingManagerBase;
+} // namespace tracing
+
+namespace server::http {
+class HeadersPropagator;
+} // namespace server::http
+
+namespace clients::http::impl {
+
+struct DeadlinePropagationConfig {
+ bool update_header{true};
+};
+
+// Static config
+struct ClientSettings final {
+ std::string thread_name_prefix{};
+ size_t io_threads{8};
+ bool defer_events{false};
+ DeadlinePropagationConfig deadline_propagation{};
+ const tracing::TracingManagerBase* tracing_manager{nullptr};
+ const server::http::HeadersPropagator* headers_propagator{nullptr};
+};
+
+ClientSettings Parse(const yaml_config::YamlConfig& value,
+ formats::parse::To<ClientSettings>);
+
+struct ThrottleConfig final {
+ static constexpr size_t kNoLimit = -1;
+
+ std::size_t http_connect_limit{kNoLimit};
+ std::chrono::microseconds http_connect_rate{0};
+ std::size_t https_connect_limit{kNoLimit};
+ std::chrono::microseconds https_connect_rate{0};
+ std::size_t per_host_connect_limit{kNoLimit};
+ std::chrono::microseconds per_host_connect_rate{0};
+};
+
+ThrottleConfig Parse(const formats::json::Value& value,
+ formats::parse::To<ThrottleConfig>);
+
+// Dynamic config
+struct Config final {
+ static constexpr std::size_t kDefaultConnectionPoolSize = 10000;
+
+ std::size_t connection_pool_size{kDefaultConnectionPoolSize};
+ std::string proxy;
+ ThrottleConfig throttle;
+};
+
+Config ParseConfig(const dynamic_config::DocsMap& docs_map);
+
+} // namespace clients::http::impl
+
+USERVER_NAMESPACE_END
diff --git a/core/include/userver/clients/http/request.hpp b/core/include/userver/clients/http/request.hpp
@@ -33,9 +33,14 @@ namespace clients::http {
 class RequestState;
 class StreamedResponse;
 class ConnectTo;
+class Form;
+class RequestStats;
+class DestinationStatistics;
+struct TestsuiteConfig;
 
 namespace impl {
 class EasyWrapper;
+struct DeadlinePropagationConfig;
 } // namespace impl
 
 /// HTTP request method
@@ -67,12 +72,6 @@ enum class ProxyAuthType {
 
 ProxyAuthType ProxyAuthTypeFromString(const std::string& auth_name);
 
-class Form;
-class RequestStats;
-class DestinationStatistics;
-struct TestsuiteConfig;
-struct EnforceTaskDeadlineConfig;
-
 /// Class for creating and performing new http requests
 class Request final {
  public:
@@ -261,16 +260,16 @@ class Request final {
 
  /// @cond
  // Set testsuite related settings. For internal use only.
- Request& SetTestsuiteConfig(
+ void SetTestsuiteConfig(
  const std::shared_ptr<const TestsuiteConfig>& config) &;
 
- Request& SetAllowedUrlsExtra(const std::vector<std::string>& urls) &;
+ void SetAllowedUrlsExtra(const std::vector<std::string>& urls) &;
 
  // Set deadline propagation settings. For internal use only.
- Request& SetEnforceTaskDeadline(
- EnforceTaskDeadlineConfig enforce_task_deadline) &;
+ void SetDeadlinePropagationConfig(
+ const impl::DeadlinePropagationConfig& deadline_propagation_config) &;
 
- Request& SetHeadersPropagator(const server::http::HeadersPropagator*) &;
+ void SetHeadersPropagator(const server::http::HeadersPropagator*) &;
  /// @endcond
 
  /// Disable auto-decoding of received replies.

diff --git a/core/library.yaml b/core/library.yaml
@@ -10,7 +10,6 @@ configs:
  - BAGGAGE_SETTINGS
  - HTTP_CLIENT_CONNECTION_POOL_SIZE
  - HTTP_CLIENT_CONNECT_THROTTLE
- - HTTP_CLIENT_ENFORCE_TASK_DEADLINE
  - USERVER_BAGGAGE_ENABLED
  - USERVER_CACHES
  - USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE