refactor grpc: better middlewares API

commit_hash:b34f2d28c987452a9c182c427196b697f3ee6cca

Author: ArkadyRudenko

.mapping.json

@@ -798,6 +798,11 @@
   "core/include/userver/logging/impl/log_stats.hpp":"taxi/uservices/userver/core/include/userver/logging/impl/log_stats.hpp",
   "core/include/userver/logging/level_serialization.hpp":"taxi/uservices/userver/core/include/userver/logging/level_serialization.hpp",
   "core/include/userver/logging/logger.hpp":"taxi/uservices/userver/core/include/userver/logging/logger.hpp",
+  "core/include/userver/middlewares/groups.hpp":"taxi/uservices/userver/core/include/userver/middlewares/groups.hpp",
+  "core/include/userver/middlewares/impl/middleware_pipeline_config.hpp":"taxi/uservices/userver/core/include/userver/middlewares/impl/middleware_pipeline_config.hpp",
+  "core/include/userver/middlewares/impl/simple_middleware_pipeline.hpp":"taxi/uservices/userver/core/include/userver/middlewares/impl/simple_middleware_pipeline.hpp",
+  "core/include/userver/middlewares/pipeline.hpp":"taxi/uservices/userver/core/include/userver/middlewares/pipeline.hpp",
+  "core/include/userver/middlewares/runner.hpp":"taxi/uservices/userver/core/include/userver/middlewares/runner.hpp",
   "core/include/userver/moodycamel/concurrentqueue_fwd.h":"taxi/uservices/userver/core/include/userver/moodycamel/concurrentqueue_fwd.h",
   "core/include/userver/net/blocking/get_addr_info.hpp":"taxi/uservices/userver/core/include/userver/net/blocking/get_addr_info.hpp",
   "core/include/userver/os_signals/component.hpp":"taxi/uservices/userver/core/include/userver/os_signals/component.hpp",
@@ -1468,6 +1473,15 @@
   "core/src/logging/tp_logger_test.cpp":"taxi/uservices/userver/core/src/logging/tp_logger_test.cpp",
   "core/src/logging/tp_logger_utils.cpp":"taxi/uservices/userver/core/src/logging/tp_logger_utils.cpp",
   "core/src/logging/tp_logger_utils.hpp":"taxi/uservices/userver/core/src/logging/tp_logger_utils.hpp",
+  "core/src/middlewares/impl/middleware_pipeline_config.cpp":"taxi/uservices/userver/core/src/middlewares/impl/middleware_pipeline_config.cpp",
+  "core/src/middlewares/impl/middlewares_graph.cpp":"taxi/uservices/userver/core/src/middlewares/impl/middlewares_graph.cpp",
+  "core/src/middlewares/impl/middlewares_graph.hpp":"taxi/uservices/userver/core/src/middlewares/impl/middlewares_graph.hpp",
+  "core/src/middlewares/impl/topology_sort.cpp":"taxi/uservices/userver/core/src/middlewares/impl/topology_sort.cpp",
+  "core/src/middlewares/impl/topology_sort.hpp":"taxi/uservices/userver/core/src/middlewares/impl/topology_sort.hpp",
+  "core/src/middlewares/impl/topology_test.cpp":"taxi/uservices/userver/core/src/middlewares/impl/topology_test.cpp",
+  "core/src/middlewares/middleware_pipeline_test.cpp":"taxi/uservices/userver/core/src/middlewares/middleware_pipeline_test.cpp",
+  "core/src/middlewares/pipeline.cpp":"taxi/uservices/userver/core/src/middlewares/pipeline.cpp",
+  "core/src/middlewares/runner.cpp":"taxi/uservices/userver/core/src/middlewares/runner.cpp",
   "core/src/net/blocking/get_addr_info.cpp":"taxi/uservices/userver/core/src/net/blocking/get_addr_info.cpp",
   "core/src/net/blocking/get_addr_info_test.cpp":"taxi/uservices/userver/core/src/net/blocking/get_addr_info_test.cpp",
   "core/src/os_signals/component.cpp":"taxi/uservices/userver/core/src/os_signals/component.cpp",
@@ -1958,18 +1972,14 @@
   "grpc/include/userver/ugrpc/impl/deadline_timepoint.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/deadline_timepoint.hpp",
   "grpc/include/userver/ugrpc/impl/internal_tag_fwd.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/internal_tag_fwd.hpp",
   "grpc/include/userver/ugrpc/impl/maybe_owned_string.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/maybe_owned_string.hpp",
-  "grpc/include/userver/ugrpc/impl/middleware_pipeline_config.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/middleware_pipeline_config.hpp",
   "grpc/include/userver/ugrpc/impl/protobuf_collector.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/protobuf_collector.hpp",
   "grpc/include/userver/ugrpc/impl/queue_runner.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/queue_runner.hpp",
-  "grpc/include/userver/ugrpc/impl/simple_middleware_pipeline.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/simple_middleware_pipeline.hpp",
   "grpc/include/userver/ugrpc/impl/span.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/span.hpp",
   "grpc/include/userver/ugrpc/impl/static_service_metadata.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/static_service_metadata.hpp",
   "grpc/include/userver/ugrpc/impl/statistics.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/statistics.hpp",
   "grpc/include/userver/ugrpc/impl/statistics_scope.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/statistics_scope.hpp",
   "grpc/include/userver/ugrpc/impl/statistics_storage.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/statistics_storage.hpp",
   "grpc/include/userver/ugrpc/impl/to_string.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/to_string.hpp",
-  "grpc/include/userver/ugrpc/middlewares/pipeline.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/middlewares/pipeline.hpp",
-  "grpc/include/userver/ugrpc/middlewares/runner.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/middlewares/runner.hpp",
   "grpc/include/userver/ugrpc/proto_json.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/proto_json.hpp",
   "grpc/include/userver/ugrpc/protobuf_visit.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/protobuf_visit.hpp",
   "grpc/include/userver/ugrpc/server/call.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/call.hpp",
@@ -1998,7 +2008,6 @@
   "grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp",
   "grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/middleware.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/middleware.hpp",
   "grpc/include/userver/ugrpc/server/middlewares/fwd.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/fwd.hpp",
-  "grpc/include/userver/ugrpc/server/middlewares/groups.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/groups.hpp",
   "grpc/include/userver/ugrpc/server/middlewares/headers_propagator/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/headers_propagator/component.hpp",
   "grpc/include/userver/ugrpc/server/middlewares/log/component.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/middlewares/log/component.hpp",
   "grpc/include/userver/ugrpc/server/result.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/result.hpp",
@@ -2068,9 +2077,6 @@
   "grpc/src/ugrpc/impl/internal_tag.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/internal_tag.hpp",
   "grpc/src/ugrpc/impl/logging.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/logging.cpp",
   "grpc/src/ugrpc/impl/logging.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/logging.hpp",
-  "grpc/src/ugrpc/impl/middleware_pipeline_config.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/middleware_pipeline_config.cpp",
-  "grpc/src/ugrpc/impl/middlewares_graph.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/middlewares_graph.cpp",
-  "grpc/src/ugrpc/impl/middlewares_graph.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/middlewares_graph.hpp",
   "grpc/src/ugrpc/impl/protobuf_collector.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/protobuf_collector.cpp",
   "grpc/src/ugrpc/impl/protobuf_utils.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/protobuf_utils.cpp",
   "grpc/src/ugrpc/impl/protobuf_utils.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/protobuf_utils.hpp",
@@ -2084,10 +2090,6 @@
   "grpc/src/ugrpc/impl/statistics_storage.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/statistics_storage.cpp",
   "grpc/src/ugrpc/impl/status.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/status.cpp",
   "grpc/src/ugrpc/impl/status.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/status.hpp",
-  "grpc/src/ugrpc/impl/topology_sort.cpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/topology_sort.cpp",
-  "grpc/src/ugrpc/impl/topology_sort.hpp":"taxi/uservices/userver/grpc/src/ugrpc/impl/topology_sort.hpp",
-  "grpc/src/ugrpc/middlewares/pipeline.cpp":"taxi/uservices/userver/grpc/src/ugrpc/middlewares/pipeline.cpp",
-  "grpc/src/ugrpc/middlewares/runner.cpp":"taxi/uservices/userver/grpc/src/ugrpc/middlewares/runner.cpp",
   "grpc/src/ugrpc/proto_json.cpp":"taxi/uservices/userver/grpc/src/ugrpc/proto_json.cpp",
   "grpc/src/ugrpc/protobuf_visit.cpp":"taxi/uservices/userver/grpc/src/ugrpc/protobuf_visit.cpp",
   "grpc/src/ugrpc/server/call.cpp":"taxi/uservices/userver/grpc/src/ugrpc/server/call.cpp",
@@ -2147,7 +2149,6 @@
   "grpc/tests/generic_client_test.cpp":"taxi/uservices/userver/grpc/tests/generic_client_test.cpp",
   "grpc/tests/generic_server_test.cpp":"taxi/uservices/userver/grpc/tests/generic_server_test.cpp",
   "grpc/tests/logging_test.cpp":"taxi/uservices/userver/grpc/tests/logging_test.cpp",
-  "grpc/tests/middleware_pipeline_test.cpp":"taxi/uservices/userver/grpc/tests/middleware_pipeline_test.cpp",
   "grpc/tests/middlewares_test.cpp":"taxi/uservices/userver/grpc/tests/middlewares_test.cpp",
   "grpc/tests/proto_json.cpp":"taxi/uservices/userver/grpc/tests/proto_json.cpp",
   "grpc/tests/protobuf_collector_test.cpp":"taxi/uservices/userver/grpc/tests/protobuf_collector_test.cpp",
@@ -2164,7 +2165,6 @@
   "grpc/tests/tests/timed_out_service.hpp":"taxi/uservices/userver/grpc/tests/tests/timed_out_service.hpp",
   "grpc/tests/tests/unit_test_client_qos.hpp":"taxi/uservices/userver/grpc/tests/tests/unit_test_client_qos.hpp",
   "grpc/tests/timeout_test.cpp":"taxi/uservices/userver/grpc/tests/timeout_test.cpp",
-  "grpc/tests/topology_test.cpp":"taxi/uservices/userver/grpc/tests/topology_test.cpp",
   "grpc/tests/tracing_test.cpp":"taxi/uservices/userver/grpc/tests/tracing_test.cpp",
   "grpc/tests/unimplemented_test.cpp":"taxi/uservices/userver/grpc/tests/unimplemented_test.cpp",
   "grpc/tests/wait_any_test.cpp":"taxi/uservices/userver/grpc/tests/wait_any_test.cpp",

…rver/ugrpc/server/middlewares/groups.hpp …e/include/userver/middlewares/groups.hppgrpc/include/userver/ugrpc/server/middlewares/groups.hpp renamed to core/include/userver/middlewares/groups.hpp grpc/include/userver/ugrpc/server/middlewares/groups.hpp renamed to core/include/userver/middlewares/groups.hpp

@@ -1,17 +1,17 @@
 #pragma once
 
-/// @file userver/ugrpc/server/middlewares/groups.hpp
+/// @file userver/middlewares/groups.hpp
 /// @brief
 /// There are groups of middlewares to build a pipeline.
 /// @see @ref scripts/docs/en/userver/grpc_server_middlewares.md
 
-#include <userver/ugrpc/middlewares/pipeline.hpp>
+#include <userver/middlewares/pipeline.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
-/// Server middlewares groups for middlewares pipeline.
+/// Middlewares groups for middlewares pipeline.
 /// @see @ref scripts/docs/en/userver/grpc_server_middlewares.md
-namespace ugrpc::server::groups {
+namespace middlewares::groups {
 
 /// @brief The first group in the pipeline.
 struct PreCore final {
@@ -22,7 +22,11 @@ struct PreCore final {
 /// @brief The Group to work wih logging. Is located after PreCore.
 ///
 /// @details There are:
+///
+/// gRPC-server:
 /// ugrpc::server::middlewares::log::Component.
+/// gRPC-client:
+/// ugrpc::client::middlewares::log::Component.
 struct Logging final {
     static constexpr std::string_view kName = "logging";
     static inline const auto kDependency = middlewares::MiddlewareDependencyBuilder().After<PreCore>();
@@ -37,8 +41,12 @@ struct Auth final {
 /// @brief The core group of middlewares. Is located after `Auth`.
 ///
 /// @details There are:
+///
+/// gRPC-server:
 /// * ugrpc::server::middlewares::congestion_control::Component
 /// * ugrpc::server::middlewares::deadline_propagation::Component
+/// gRPC-client:
+/// * ugrpc::client::middlewares::deadline_propagation::Component
 struct Core final {
     static constexpr std::string_view kName = "core";
     static inline const auto kDependency = middlewares::MiddlewareDependencyBuilder().After<Auth>();
@@ -53,13 +61,17 @@ struct PostCore final {
 /// @brief The group for user middlewares - the last group in pipeline. It group used by default.
 ///
 /// @details There are:
+///
+/// gRPC-server:
 /// * ugrpc::server::middlewares::baggage::Component
 /// * ugrpc::server::middlewares::headers_propagator::Component
+/// gRPC-client:
+/// * ugrpc::client::middlewares::baggage::Component
 struct User final {
     static constexpr std::string_view kName = "user";
     static inline const auto kDependency = middlewares::MiddlewareDependencyBuilder().After<PostCore>();
 };
 
-}  // namespace ugrpc::server::groups
+}  // namespace middlewares::groups
 
 USERVER_NAMESPACE_END

…grpc/impl/middleware_pipeline_config.hpp …ares/impl/middleware_pipeline_config.hppgrpc/include/userver/ugrpc/impl/middleware_pipeline_config.hpp renamed to core/include/userver/middlewares/impl/middleware_pipeline_config.hpp grpc/include/userver/ugrpc/impl/middleware_pipeline_config.hpp renamed to core/include/userver/middlewares/impl/middleware_pipeline_config.hpp

@@ -8,7 +8,7 @@
 
 USERVER_NAMESPACE_BEGIN
 
-namespace ugrpc::middlewares::impl {
+namespace middlewares::impl {
 
 struct BaseMiddlewareConfig final {
     bool enabled{true};
@@ -43,6 +43,6 @@ bool operator==(const MiddlewareEnabled& l, const MiddlewareEnabled& r);
 
 using MiddlewareOrderedList = std::vector<MiddlewareEnabled>;
 
-}  // namespace ugrpc::middlewares::impl
+}  // namespace middlewares::impl
 
 USERVER_NAMESPACE_END

…grpc/impl/simple_middleware_pipeline.hpp …ares/impl/simple_middleware_pipeline.hppgrpc/include/userver/ugrpc/impl/simple_middleware_pipeline.hpp renamed to core/include/userver/middlewares/impl/simple_middleware_pipeline.hpp grpc/include/userver/ugrpc/impl/simple_middleware_pipeline.hpp renamed to core/include/userver/middlewares/impl/simple_middleware_pipeline.hpp

@@ -5,7 +5,7 @@
 
 USERVER_NAMESPACE_BEGIN
 
-namespace ugrpc::impl {
+namespace middlewares::impl {
 
 // Interface for creating middlewares.
 template <typename MiddlewareBase, typename HandlerInfo>
@@ -34,6 +34,6 @@ class SimpleMiddlewarePipeline : public PipelineCreatorInterface<MiddlewareBase,
     Middlewares mids_;
 };
 
-}  // namespace ugrpc::impl
+}  // namespace middlewares::impl
 
 USERVER_NAMESPACE_END

…e/userver/ugrpc/middlewares/pipeline.hpp …include/userver/middlewares/pipeline.hppgrpc/include/userver/ugrpc/middlewares/pipeline.hpp renamed to core/include/userver/middlewares/pipeline.hpp grpc/include/userver/ugrpc/middlewares/pipeline.hpp renamed to core/include/userver/middlewares/pipeline.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-/// @file userver/ugrpc/middlewares/pipeline.hpp
+/// @file userver/middlewares/pipeline.hpp
 /// @brief Lists all available middlewares and builds their order of execution.
 
 #include <unordered_map>
@@ -10,11 +10,11 @@
 #include <userver/utils/meta_light.hpp>
 #include <userver/yaml_config/fwd.hpp>
 
-#include <userver/ugrpc/impl/middleware_pipeline_config.hpp>
+#include <userver/middlewares/impl/middleware_pipeline_config.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
-namespace ugrpc::middlewares {
+namespace middlewares {
 
 /// @brief The dependency type between middlewares.
 ///
@@ -184,6 +184,6 @@ MiddlewareDependencyBuilder MiddlewareDependencyBuilder::InGroup() && {
     return std::move(*this).Before(impl::EndOfGroup<Group>(), DependencyType::kWeak);
 }
 
-}  // namespace ugrpc::middlewares
+}  // namespace middlewares
 
 USERVER_NAMESPACE_END

…ude/userver/ugrpc/middlewares/runner.hpp …e/include/userver/middlewares/runner.hppgrpc/include/userver/ugrpc/middlewares/runner.hpp renamed to core/include/userver/middlewares/runner.hpp grpc/include/userver/ugrpc/middlewares/runner.hpp renamed to core/include/userver/middlewares/runner.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-/// @file userver/ugrpc/middlewares/runner.hpp
-/// @brief @copybrief ugrpc::middlewares::RunnerComponentBase
+/// @file userver/middlewares/runner.hpp
+/// @brief @copybrief middlewares::RunnerComponentBase
 
 #include <vector>
 
@@ -12,13 +12,13 @@
 #include <userver/utils/impl/internal_tag.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
 
-#include <userver/ugrpc/impl/middleware_pipeline_config.hpp>
-#include <userver/ugrpc/impl/simple_middleware_pipeline.hpp>
-#include <userver/ugrpc/middlewares/pipeline.hpp>
+#include <userver/middlewares/impl/middleware_pipeline_config.hpp>
+#include <userver/middlewares/impl/simple_middleware_pipeline.hpp>
+#include <userver/middlewares/pipeline.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
-namespace ugrpc::middlewares {
+namespace middlewares {
 
 namespace impl {
 
@@ -28,7 +28,7 @@ yaml_config::YamlConfig ValidateAndMergeMiddlewareConfigs(
     yaml_config::Schema schema
 );
 
-/// Make the default builder for `ugrpc::middlewares::groups::User` group.
+/// Make the default builder for `middlewares::groups::User` group.
 MiddlewareDependencyBuilder MakeDefaultUserDependency();
 
 class WithMiddlewareDependencyComponentBase : public components::ComponentBase {
@@ -40,8 +40,7 @@ class WithMiddlewareDependencyComponentBase : public components::ComponentBase {
     )
         : components::ComponentBase(config, context) {}
 
-    virtual const ugrpc::middlewares::impl::MiddlewareDependency& GetMiddlewareDependency(utils::impl::InternalTag
-    ) const = 0;
+    virtual const middlewares::impl::MiddlewareDependency& GetMiddlewareDependency(utils::impl::InternalTag) const = 0;
 };
 
 }  // namespace impl
@@ -91,8 +90,7 @@ additionalProperties: false
 
     /// @cond
     /// Only for internal use.
-    const ugrpc::middlewares::impl::MiddlewareDependency& GetMiddlewareDependency(utils::impl::InternalTag
-    ) const override {
+    const middlewares::impl::MiddlewareDependency& GetMiddlewareDependency(utils::impl::InternalTag) const override {
         return dependency_;
     }
 
@@ -101,7 +99,7 @@ additionalProperties: false
 
 private:
     const formats::yaml::Value global_config_;
-    ugrpc::middlewares::impl::MiddlewareDependency dependency_;
+    middlewares::impl::MiddlewareDependency dependency_;
 };
 
 /// @brief Base class for a component that runs middlewares.
@@ -117,7 +115,7 @@ additionalProperties: false
 /// middlewares and overriding configs.
 template <typename MiddlewareBase, typename HandlerInfo>
 class RunnerComponentBase : public components::ComponentBase,
-                            public ugrpc::impl::PipelineCreatorInterface<MiddlewareBase, HandlerInfo> {
+                            public impl::PipelineCreatorInterface<MiddlewareBase, HandlerInfo> {
 public:
     static yaml_config::Schema GetStaticConfigSchema() {
         return yaml_config::MergeSchemas<components::ComponentBase>(R"(
@@ -207,7 +205,7 @@ namespace impl {
 /// @brief A short-cut for defining a middleware-factory.
 ///
 /// `MiddlewareBase` type is a interface of middleware, so `Middleware` type is a implementation of this interface.
-/// Your middleware will be created with a default constructor and will be in `ugrpc::middlewares::groups::User` group.
+/// Your middleware will be created with a default constructor and will be in `middlewares::groups::User` group.
 template <typename MiddlewareBase, typename Middleware, typename HandlerInfo>
 class SimpleMiddlewareFactoryComponent final : public MiddlewareFactoryComponentBase<MiddlewareBase, HandlerInfo> {
 public:
@@ -220,7 +218,7 @@ class SimpleMiddlewareFactoryComponent final : public MiddlewareFactoryComponent
         : MiddlewareFactoryComponentBase<MiddlewareBase, HandlerInfo>(
               config,
               context,
-              ugrpc::middlewares::MiddlewareDependencyBuilder{Middleware::kDependency}
+              middlewares::MiddlewareDependencyBuilder{Middleware::kDependency}
           ) {}
 
 private:
@@ -232,10 +230,10 @@ class SimpleMiddlewareFactoryComponent final : public MiddlewareFactoryComponent
 
 }  // namespace impl
 
-}  // namespace ugrpc::middlewares
+}  // namespace middlewares
 
 template <typename MiddlewareBase, typename Middleware, typename HandlerInfo>
 inline constexpr bool components::kHasValidate<
-    ugrpc::middlewares::impl::SimpleMiddlewareFactoryComponent<MiddlewareBase, Middleware, HandlerInfo>> = true;
+    middlewares::impl::SimpleMiddlewareFactoryComponent<MiddlewareBase, Middleware, HandlerInfo>> = true;
 
 USERVER_NAMESPACE_END

…grpc/impl/middleware_pipeline_config.cpp …ares/impl/middleware_pipeline_config.cppgrpc/src/ugrpc/impl/middleware_pipeline_config.cpp renamed to core/src/middlewares/impl/middleware_pipeline_config.cpp grpc/src/ugrpc/impl/middleware_pipeline_config.cpp renamed to core/src/middlewares/impl/middleware_pipeline_config.cpp

@@ -1,10 +1,10 @@
-#include <userver/ugrpc/impl/middleware_pipeline_config.hpp>
+#include <userver/middlewares/impl/middleware_pipeline_config.hpp>
 
 #include <userver/yaml_config/yaml_config.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
-namespace ugrpc::middlewares::impl {
+namespace middlewares::impl {
 
 MiddlewarePipelineConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To<MiddlewarePipelineConfig>) {
     MiddlewarePipelineConfig config;
@@ -30,6 +30,6 @@ bool operator==(const MiddlewareEnabled& l, const MiddlewareEnabled& r) {
     return l.name == r.name && l.enabled == r.enabled;
 }
 
-}  // namespace ugrpc::middlewares::impl
+}  // namespace middlewares::impl
 
 USERVER_NAMESPACE_END