fix core: add test on HttpClient destructor awaiting pending requests

commit_hash:40d2a155ff1cf8d5e96b3dab4938fc474dd5199f

Author: smorivan

.mapping.json

@@ -714,6 +714,15 @@
   "core/functional_tests/http2server/tests/conftest.py":"taxi/uservices/userver/core/functional_tests/http2server/tests/conftest.py",
   "core/functional_tests/http2server/tests/test_http2_streaming.py":"taxi/uservices/userver/core/functional_tests/http2server/tests/test_http2_streaming.py",
   "core/functional_tests/http2server/tests/test_http2server.py":"taxi/uservices/userver/core/functional_tests/http2server/tests/test_http2server.py",
+  "core/functional_tests/http_client_plugins/CMakeLists.txt":"taxi/uservices/userver/core/functional_tests/http_client_plugins/CMakeLists.txt",
+  "core/functional_tests/http_client_plugins/config_vars.yaml":"taxi/uservices/userver/core/functional_tests/http_client_plugins/config_vars.yaml",
+  "core/functional_tests/http_client_plugins/main.cpp":"taxi/uservices/userver/core/functional_tests/http_client_plugins/main.cpp",
+  "core/functional_tests/http_client_plugins/src/echo_handler.hpp":"taxi/uservices/userver/core/functional_tests/http_client_plugins/src/echo_handler.hpp",
+  "core/functional_tests/http_client_plugins/src/echo_handler_detach.hpp":"taxi/uservices/userver/core/functional_tests/http_client_plugins/src/echo_handler_detach.hpp",
+  "core/functional_tests/http_client_plugins/src/plugin.hpp":"taxi/uservices/userver/core/functional_tests/http_client_plugins/src/plugin.hpp",
+  "core/functional_tests/http_client_plugins/static_config.yaml":"taxi/uservices/userver/core/functional_tests/http_client_plugins/static_config.yaml",
+  "core/functional_tests/http_client_plugins/tests/conftest.py":"taxi/uservices/userver/core/functional_tests/http_client_plugins/tests/conftest.py",
+  "core/functional_tests/http_client_plugins/tests/test_plugin.py":"taxi/uservices/userver/core/functional_tests/http_client_plugins/tests/test_plugin.py",
   "core/functional_tests/https/CMakeLists.txt":"taxi/uservices/userver/core/functional_tests/https/CMakeLists.txt",
   "core/functional_tests/https/cert.crt":"taxi/uservices/userver/core/functional_tests/https/cert.crt",
   "core/functional_tests/https/httpserver_handlers.hpp":"taxi/uservices/userver/core/functional_tests/https/httpserver_handlers.hpp",

core/functional_tests/http_client_plugins/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(userver-core-tests-http-client-plugins CXX)
+
+file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*pp")
+add_executable(${PROJECT_NAME} ${SOURCES} "main.cpp")
+target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
+target_link_libraries(${PROJECT_NAME} userver::core)
+
+userver_chaos_testsuite_add()

core/functional_tests/http_client_plugins/config_vars.yaml

@@ -0,0 +1 @@
+echo-url: $mockserver/echo

core/functional_tests/http_client_plugins/main.cpp

@@ -0,0 +1,25 @@
+#include <userver/clients/dns/component.hpp>
+#include <userver/clients/http/component.hpp>
+#include <userver/components/minimal_server_component_list.hpp>
+#include <userver/server/handlers/tests_control.hpp>
+#include <userver/testsuite/testsuite_support.hpp>
+#include <userver/utils/daemon_run.hpp>
+
+#include <userver/utest/using_namespace_userver.hpp>
+
+#include <echo_handler.hpp>
+#include <echo_handler_detach.hpp>
+#include <plugin.hpp>
+
+int main(int argc, char* argv[]) {
+    const auto component_list = components::MinimalServerComponentList()
+                                    .Append<EchoHandler>()
+                                    .Append<EchoHandlerDetach>()
+                                    .Append<components::TestsuiteSupport>()
+                                    .Append<server::handlers::TestsControl>()
+                                    .Append<clients::dns::Component>()
+                                    .Append<PluginComponent>()
+                                    .Append<components::HttpClientCore>()
+                                    .Append<components::HttpClient>();
+    return utils::DaemonMain(argc, argv, component_list);
+}

core/functional_tests/http_client_plugins/src/echo_handler.hpp

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <userver/clients/http/component.hpp>
+#include <userver/components/component.hpp>
+#include <userver/server/handlers/http_handler_base.hpp>
+#include <userver/utils/algo.hpp>
+#include <userver/yaml_config/merge_schemas.hpp>
+
+class EchoHandler final : public server::handlers::HttpHandlerBase {
+public:
+    static constexpr std::string_view kName = "handler-echo";
+
+    EchoHandler(const components::ComponentConfig& config, const components::ComponentContext& context)
+        : HttpHandlerBase(config, context),
+          echo_url_{config["echo-url"].As<std::string>()},
+          http_client_(context.FindComponent<components::HttpClient>().GetHttpClient()) {}
+
+    std::string HandleRequestThrow(const server::http::HttpRequest&, server::request::RequestContext&) const override {
+        auto response = http_client_.CreateRequest().get(echo_url_).perform();
+        response->raise_for_status();
+        UASSERT(utils::FindOptional(response->headers(), std::string_view{"additional-header"}) == "header-value");
+        return {};
+    }
+
+    static yaml_config::Schema GetStaticConfigSchema() {
+        return yaml_config::MergeSchemas<server::handlers::HttpHandlerBase>(R"(
+    type: object
+    description: HTTP echo component
+    additionalProperties: false
+    properties:
+        echo-url:
+            type: string
+            description: some other microservice listens on this URL
+    )");
+    }
+
+private:
+    const std::string echo_url_;
+    clients::http::Client& http_client_;
+};

core/functional_tests/http_client_plugins/src/echo_handler_detach.hpp

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <userver/clients/http/component.hpp>
+#include <userver/components/component.hpp>
+#include <userver/server/handlers/http_handler_base.hpp>
+#include <userver/yaml_config/merge_schemas.hpp>
+
+class EchoHandlerDetach final : public server::handlers::HttpHandlerBase {
+public:
+    static constexpr std::string_view kName = "handler-echo-detach";
+
+    EchoHandlerDetach(const components::ComponentConfig& config, const components::ComponentContext& context)
+        : HttpHandlerBase(config, context),
+          echo_url_{config["echo-url"].As<std::string>()},
+          http_client_(context.FindComponent<components::HttpClient>().GetHttpClient()) {}
+
+    std::string HandleRequestThrow(const server::http::HttpRequest&, server::request::RequestContext&) const override {
+        http_client_.CreateRequest().get(echo_url_).async_perform().Detach();
+        return {};
+    }
+
+    static yaml_config::Schema GetStaticConfigSchema() {
+        return yaml_config::MergeSchemas<server::handlers::HttpHandlerBase>(R"(
+    type: object
+    description: HTTP echo detach component
+    additionalProperties: false
+    properties:
+        echo-url:
+            type: string
+            description: some other microservice listens on this URL
+    )");
+    }
+
+private:
+    const std::string echo_url_;
+    clients::http::Client& http_client_;
+};

core/functional_tests/http_client_plugins/src/plugin.hpp

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <userver/clients/http/plugin.hpp>
+#include <userver/clients/http/plugin_component.hpp>
+#include <userver/clients/http/response.hpp>
+#include <userver/components/component.hpp>
+#include <userver/yaml_config/merge_schemas.hpp>
+
+class Plugin final : public clients::http::Plugin {
+public:
+    Plugin(std::string key, std::string value)
+        : clients::http::Plugin("add-header"),
+          key_(std::make_unique<std::string>(std::move(key))),
+          value_(std::make_unique<std::string>(std::move(value))) {}
+
+    void HookPerformRequest(clients::http::PluginRequest& request) override { request.SetHeader(*key_, *value_); }
+
+    void HookCreateSpan(clients::http::PluginRequest&, tracing::Span&) override {}
+
+    void HookOnCompleted(clients::http::PluginRequest&, clients::http::Response& response) override {
+        response.headers().emplace(*key_, *value_);
+    }
+
+    void HookOnError(clients::http::PluginRequest&, std::error_code) override {}
+
+    bool HookOnRetry(clients::http::PluginRequest&) override { return true; }
+
+private:
+    std::unique_ptr<std::string> key_;
+    std::unique_ptr<std::string> value_;
+};
+
+class PluginComponent final : public clients::http::plugin::ComponentBase {
+public:
+    static constexpr std::string_view kName = "http-client-plugin-add-header";
+
+    PluginComponent(const components::ComponentConfig& config, const components::ComponentContext& context)
+        : ComponentBase(config, context),
+          plugin_(std::make_unique<Plugin>(config["key"].As<std::string>(), config["value"].As<std::string>())) {}
+
+    ~PluginComponent() override = default;
+
+    clients::http::Plugin& GetPlugin() override { return *plugin_; }
+    static yaml_config::Schema GetStaticConfigSchema() {
+        return yaml_config::MergeSchemas<clients::http::plugin::ComponentBase>(R"(
+    type: object
+    description: Test plugin adding header to request and response
+    additionalProperties: false
+    properties:
+        key:
+            type: string
+            description: header name
+        value:
+            type: string
+            description: header value
+    )");
+    }
+
+private:
+    std::unique_ptr<Plugin> plugin_;
+};

core/functional_tests/http_client_plugins/static_config.yaml

@@ -0,0 +1,51 @@
+components_manager:
+    components:
+        http-client-plugin-add-header:
+            key: additional-header
+            value: header-value
+        handler-echo:
+            echo-url: $echo-url
+            path: /echo
+            method: GET
+            task_processor: main-task-processor
+        handler-echo-detach:
+            echo-url: $echo-url
+            path: /echo-detach
+            method: GET
+            task_processor: main-task-processor
+
+        http-client:
+            plugins:
+                add-header: 1
+        http-client-core:
+            fs-task-processor: fs-task-processor
+
+        dns-client:
+            fs-task-processor: fs-task-processor
+
+        testsuite-support:
+        tests-control:
+            # Some options from server::handlers::HttpHandlerBase
+            path: /tests/{action}
+            method: POST
+            task_processor: main-task-processor
+
+        server:
+            listener:
+                port: 8089
+                task_processor: main-task-processor
+        logging:
+            fs-task-processor: fs-task-processor
+            loggers:
+                default:
+                    file_path: '@stderr'
+                    level: info
+
+    task_processors:
+        main-task-processor:
+            worker_threads: 4
+
+        fs-task-processor:
+            worker_threads: 4
+
+    default_task_processor: main-task-processor

core/functional_tests/http_client_plugins/tests/conftest.py

@@ -0,0 +1 @@
+pytest_plugins = ['pytest_userver.plugins.core']

core/functional_tests/http_client_plugins/tests/test_plugin.py

@@ -0,0 +1,31 @@
+import asyncio
+
+import pytest
+
+
+async def test_plugin(service_client, mockserver):
+    @mockserver.json_handler('/echo')
+    async def _handler(request):
+        assert request.headers['additional-header'] == 'header-value'
+        return mockserver.make_response()
+
+    response = await service_client.get(
+        '/echo',
+    )
+    assert _handler.times_called == 1
+    assert response.status_code == 200
+
+
+@pytest.mark.uservice_oneshot
+async def test_await_detached_request(service_client, mockserver):
+    @mockserver.json_handler('/echo')
+    async def _handler(request):
+        assert request.headers['additional-header'] == 'header-value'
+        await asyncio.sleep(3)
+        return mockserver.make_response()
+
+    response = await service_client.get(
+        '/echo-detach',
+    )
+    assert response.status_code == 200
+    # without awaiting detached requests in HttpClient there would be segfault at teardown