refactor core: move statistics to universal

Tests: проверно компиляцией и существующими тестами (это просто mv из core в universal, чтобы для universal классов можно было определять метрики)
commit_hash:463aca2801ce685754340f1b9043c52dd72b88cb

Author: vansokol

.mapping.json

@@ -1163,14 +1163,11 @@
   "core/include/userver/utils/statistics/graphite.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/graphite.hpp",
   "core/include/userver/utils/statistics/histogram.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/histogram.hpp",
   "core/include/userver/utils/statistics/histogram_aggregator.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/histogram_aggregator.hpp",
-  "core/include/userver/utils/statistics/histogram_view.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/histogram_view.hpp",
   "core/include/userver/utils/statistics/impl/histogram_bucket.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/impl/histogram_bucket.hpp",
   "core/include/userver/utils/statistics/json.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/json.hpp",
-  "core/include/userver/utils/statistics/labels.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/labels.hpp",
   "core/include/userver/utils/statistics/metadata.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metadata.hpp",
   "core/include/userver/utils/statistics/metric_tag.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metric_tag.hpp",
   "core/include/userver/utils/statistics/metric_tag_impl.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metric_tag_impl.hpp",
-  "core/include/userver/utils/statistics/metric_value.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metric_value.hpp",
   "core/include/userver/utils/statistics/metrics_storage.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metrics_storage.hpp",
   "core/include/userver/utils/statistics/metrics_storage_fwd.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/metrics_storage_fwd.hpp",
   "core/include/userver/utils/statistics/min_max_avg.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/min_max_avg.hpp",
@@ -1179,16 +1176,13 @@
   "core/include/userver/utils/statistics/portability_info.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/portability_info.hpp",
   "core/include/userver/utils/statistics/pretty_format.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/pretty_format.hpp",
   "core/include/userver/utils/statistics/prometheus.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/prometheus.hpp",
-  "core/include/userver/utils/statistics/rate.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/rate.hpp",
-  "core/include/userver/utils/statistics/rate_counter.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/rate_counter.hpp",
   "core/include/userver/utils/statistics/recentperiod.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/recentperiod.hpp",
   "core/include/userver/utils/statistics/recentperiod_detail.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/recentperiod_detail.hpp",
   "core/include/userver/utils/statistics/relaxed_counter.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/relaxed_counter.hpp",
   "core/include/userver/utils/statistics/solomon.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/solomon.hpp",
   "core/include/userver/utils/statistics/storage.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/storage.hpp",
   "core/include/userver/utils/statistics/striped_rate_counter.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/striped_rate_counter.hpp",
   "core/include/userver/utils/statistics/system_statistics_collector.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/system_statistics_collector.hpp",
-  "core/include/userver/utils/statistics/writer.hpp":"taxi/uservices/userver/core/include/userver/utils/statistics/writer.hpp",
   "core/include/userver/utils/task_builder.hpp":"taxi/uservices/userver/core/include/userver/utils/task_builder.hpp",
   "core/include/userver/utils/text.hpp":"taxi/uservices/userver/core/include/userver/utils/text.hpp",
   "core/include/userver/utils/trx_tracker.hpp":"taxi/uservices/userver/core/include/userver/utils/trx_tracker.hpp",
@@ -2100,8 +2094,6 @@
   "core/src/utils/statistics/pretty_format_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/pretty_format_test.cpp",
   "core/src/utils/statistics/prometheus.cpp":"taxi/uservices/userver/core/src/utils/statistics/prometheus.cpp",
   "core/src/utils/statistics/prometheus_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/prometheus_test.cpp",
-  "core/src/utils/statistics/rate.cpp":"taxi/uservices/userver/core/src/utils/statistics/rate.cpp",
-  "core/src/utils/statistics/rate_counter.cpp":"taxi/uservices/userver/core/src/utils/statistics/rate_counter.cpp",
   "core/src/utils/statistics/rate_counter_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/rate_counter_test.cpp",
   "core/src/utils/statistics/rate_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/rate_test.cpp",
   "core/src/utils/statistics/recent_period_benchmark.cpp":"taxi/uservices/userver/core/src/utils/statistics/recent_period_benchmark.cpp",
@@ -2124,8 +2116,6 @@
   "core/src/utils/statistics/value_builder_helpers_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/value_builder_helpers_test.cpp",
   "core/src/utils/statistics/visitation.cpp":"taxi/uservices/userver/core/src/utils/statistics/visitation.cpp",
   "core/src/utils/statistics/visitation.hpp":"taxi/uservices/userver/core/src/utils/statistics/visitation.hpp",
-  "core/src/utils/statistics/writer.cpp":"taxi/uservices/userver/core/src/utils/statistics/writer.cpp",
-  "core/src/utils/statistics/writer_state.hpp":"taxi/uservices/userver/core/src/utils/statistics/writer_state.hpp",
   "core/src/utils/statistics/writer_test.cpp":"taxi/uservices/userver/core/src/utils/statistics/writer_test.cpp",
   "core/src/utils/sys_info.cpp":"taxi/uservices/userver/core/src/utils/sys_info.cpp",
   "core/src/utils/sys_info.hpp":"taxi/uservices/userver/core/src/utils/sys_info.hpp",
@@ -5334,6 +5324,13 @@
   "universal/include/userver/utils/small_string_fwd.hpp":"taxi/uservices/userver/universal/include/userver/utils/small_string_fwd.hpp",
   "universal/include/userver/utils/small_string_serialization.hpp":"taxi/uservices/userver/universal/include/userver/utils/small_string_serialization.hpp",
   "universal/include/userver/utils/span.hpp":"taxi/uservices/userver/universal/include/userver/utils/span.hpp",
+  "universal/include/userver/utils/statistics/histogram_view.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/histogram_view.hpp",
+  "universal/include/userver/utils/statistics/labels.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/labels.hpp",
+  "universal/include/userver/utils/statistics/metric_value.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/metric_value.hpp",
+  "universal/include/userver/utils/statistics/rate.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/rate.hpp",
+  "universal/include/userver/utils/statistics/rate_counter.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/rate_counter.hpp",
+  "universal/include/userver/utils/statistics/request.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/request.hpp",
+  "universal/include/userver/utils/statistics/writer.hpp":"taxi/uservices/userver/universal/include/userver/utils/statistics/writer.hpp",
   "universal/include/userver/utils/str_icase.hpp":"taxi/uservices/userver/universal/include/userver/utils/str_icase.hpp",
   "universal/include/userver/utils/str_icase_containers.hpp":"taxi/uservices/userver/universal/include/userver/utils/str_icase_containers.hpp",
   "universal/include/userver/utils/strerror.hpp":"taxi/uservices/userver/universal/include/userver/utils/strerror.hpp",
@@ -5652,6 +5649,11 @@
   "universal/src/utils/small_string_benchmark.cpp":"taxi/uservices/userver/universal/src/utils/small_string_benchmark.cpp",
   "universal/src/utils/small_string_test.cpp":"taxi/uservices/userver/universal/src/utils/small_string_test.cpp",
   "universal/src/utils/span_test.cpp":"taxi/uservices/userver/universal/src/utils/span_test.cpp",
+  "universal/src/utils/statistics/rate.cpp":"taxi/uservices/userver/universal/src/utils/statistics/rate.cpp",
+  "universal/src/utils/statistics/rate_counter.cpp":"taxi/uservices/userver/universal/src/utils/statistics/rate_counter.cpp",
+  "universal/src/utils/statistics/request.cpp":"taxi/uservices/userver/universal/src/utils/statistics/request.cpp",
+  "universal/src/utils/statistics/writer.cpp":"taxi/uservices/userver/universal/src/utils/statistics/writer.cpp",
+  "universal/src/utils/statistics/writer_state.hpp":"taxi/uservices/userver/universal/src/utils/statistics/writer_state.hpp",
   "universal/src/utils/str_icase.cpp":"taxi/uservices/userver/universal/src/utils/str_icase.cpp",
   "universal/src/utils/str_icase_benchmark.cpp":"taxi/uservices/userver/universal/src/utils/str_icase_benchmark.cpp",
   "universal/src/utils/str_icase_containers_test.cpp":"taxi/uservices/userver/universal/src/utils/str_icase_containers_test.cpp",

core/include/userver/utils/statistics/storage.hpp

@@ -5,18 +5,15 @@
 
 #include <atomic>
 #include <functional>
-#include <initializer_list>
 #include <list>
 #include <string>
-#include <unordered_map>
-#include <variant>
 #include <vector>
 
 #include <userver/engine/shared_mutex.hpp>
 #include <userver/formats/json/value_builder.hpp>
 #include <userver/utils/assert.hpp>
 #include <userver/utils/statistics/entry.hpp>
-#include <userver/utils/statistics/metric_value.hpp>
+#include <userver/utils/statistics/request.hpp>
 #include <userver/utils/statistics/writer.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -26,69 +23,6 @@ namespace utils::statistics {
 /// @brief Used in legacy statistics extenders
 struct StatisticsRequest final {};
 
-/// @brief Class describing the request for metrics data.
-///
-/// Metric path and metric name are the same thing. For example for code like
-///
-/// @code
-/// writer["a"]["b"]["c"] = 42;
-/// @endcode
-///
-/// the metric name is "a.b.c" and in Prometheus format it would be escaped like
-/// "a_b_c{} 42".
-///
-/// @note `add_labels` should not match labels from Storage, otherwise the
-/// returned metrics may not be read by metrics server.
-class Request final {
-public:
-    using AddLabels = std::unordered_map<std::string, std::string>;
-
-    /// Default request without parameters. Equivalent to requesting all the
-    /// metrics without adding or requiring any labels.
-    Request() = default;
-
-    /// Makes request for metrics whose path starts with the `prefix`.
-    static Request MakeWithPrefix(
-        const std::string& prefix,
-        AddLabels add_labels = {},
-        std::vector<Label> require_labels = {}
-    );
-
-    /// Makes request for metrics whose path is `path`.
-    static Request MakeWithPath(
-        const std::string& path,
-        AddLabels add_labels = {},
-        std::vector<Label> require_labels = {}
-    );
-
-    /// Return metrics whose path matches with this `prefix`
-    const std::string prefix{};
-
-    /// Enum for different match types of the `prefix`
-    enum class PrefixMatch {
-        kNoop,        ///< Do not match, the `prefix` is empty
-        kExact,       ///< `prefix` equal to path
-        kStartsWith,  ///< Metric path starts with `prefix`
-    };
-
-    /// Match type of the `prefix`
-    const PrefixMatch prefix_match_type = PrefixMatch::kNoop;
-
-    /// Require those labels in the metric
-    const std::vector<Label> require_labels{};
-
-    /// Add those labels to each returned metric
-    const AddLabels add_labels{};
-
-private:
-    Request(
-        std::string prefix_in,
-        PrefixMatch path_match_type_in,
-        std::vector<Label> require_labels_in,
-        AddLabels add_labels_in
-    );
-};
-
 using ExtenderFunc = std::function<formats::json::ValueBuilder(const StatisticsRequest&)>;
 
 using WriterFunc = std::function<void(Writer&)>;
@@ -111,13 +45,6 @@ inline constexpr bool kCheckSubscriptionUB = utils::impl::kEnableAssert;
 
 }  // namespace impl
 
-class BaseFormatBuilder {
-public:
-    virtual ~BaseFormatBuilder();
-
-    virtual void HandleMetric(std::string_view path, LabelsSpan labels, const MetricValue& value) = 0;
-};
-
 /// @ingroup userver_clients
 ///
 /// Storage of metrics, usually retrieved from components::StatisticsStorage.

core/src/utils/statistics/storage.cpp

@@ -1,6 +1,5 @@
 #include <userver/utils/statistics/storage.hpp>
 
-#include <algorithm>
 #include <utility>
 
 #include <boost/container/small_vector.hpp>
@@ -24,20 +23,6 @@ namespace {
 const std::string kVersionField = "$version";
 constexpr int kVersion = 2;
 
-void RemoveAddedLabels(std::vector<Label>& labels, const Request::AddLabels& add_labels) {
-    labels.erase(
-        std::remove_if(
-            labels.begin(),
-            labels.end(),
-            [&add_labels](const auto& label) {
-                auto it = add_labels.find(label.Name());
-                return it != add_labels.end() && it->second == label.Value();
-            }
-        ),
-        labels.end()
-    );
-}
-
 class FakeFormatBuilder final : public BaseFormatBuilder {
 public:
     void HandleMetric(std::string_view, LabelsSpan, const MetricValue&) override {}
@@ -90,36 +75,6 @@ void WriteWithFakeFormat(impl::MetricsSource& source)
 
 }  // namespace
 
-Request Request::MakeWithPrefix(const std::string& prefix, AddLabels add_labels, std::vector<Label> require_labels) {
-    RemoveAddedLabels(require_labels, add_labels);
-    return {
-        prefix,
-        prefix.empty() ? PrefixMatch::kNoop : PrefixMatch::kStartsWith,
-        std::move(require_labels),
-        std::move(add_labels)
-    };
-}
-
-Request Request::MakeWithPath(const std::string& path, AddLabels add_labels, std::vector<Label> require_labels) {
-    RemoveAddedLabels(require_labels, add_labels);
-    UASSERT(!path.empty());
-    return {path, PrefixMatch::kExact, std::move(require_labels), std::move(add_labels)};
-}
-
-Request::Request(
-    std::string prefix_in,
-    PrefixMatch path_match_type_in,
-    std::vector<Label> require_labels_in,
-    AddLabels add_labels_in
-)
-    : prefix(std::move(prefix_in)),
-      prefix_match_type(path_match_type_in),
-      require_labels(std::move(require_labels_in)),
-      add_labels(std::move(add_labels_in))
-{}
-
-BaseFormatBuilder::~BaseFormatBuilder() = default;
-
 Storage::Storage()
     : may_register_extenders_(true)
 {}

…rver/utils/statistics/histogram_view.hpp …rver/utils/statistics/histogram_view.hppcore/include/userver/utils/statistics/histogram_view.hpp renamed to universal/include/userver/utils/statistics/histogram_view.hpp core/include/userver/utils/statistics/histogram_view.hpp renamed to universal/include/userver/utils/statistics/histogram_view.hpp

@@ -5,13 +5,14 @@
 
 #include <atomic>
 
-#include <userver/utils/statistics/fwd.hpp>
 #include <userver/utils/statistics/rate.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
 namespace utils::statistics {
 
+class Writer;
+
 /// @brief Atomic counter of type Rate with relaxed memory ordering
 ///
 /// This class is represented as Rate metric when serializing to statistics.

…lude/userver/utils/statistics/labels.hpp …lude/userver/utils/statistics/labels.hppcore/include/userver/utils/statistics/labels.hpp renamed to universal/include/userver/utils/statistics/labels.hpp core/include/userver/utils/statistics/labels.hpp renamed to universal/include/userver/utils/statistics/labels.hpp

@@ -0,0 +1,89 @@
+#pragma once
+
+/// @file userver/utils/statistics/request.hpp
+/// @brief @copybrief utils::statistics::Request
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <userver/utils/statistics/labels.hpp>
+#include <userver/utils/statistics/metric_value.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace utils::statistics {
+
+/// @brief Class describing the request for metrics data.
+///
+/// Metric path and metric name are the same thing. For example for code like
+///
+/// @code
+/// writer["a"]["b"]["c"] = 42;
+/// @endcode
+///
+/// the metric name is "a.b.c" and in Prometheus format it would be escaped like
+/// "a_b_c{} 42".
+///
+/// @note `add_labels` should not match labels from Storage, otherwise the
+/// returned metrics may not be read by metrics server.
+class Request final {
+public:
+    using AddLabels = std::unordered_map<std::string, std::string>;
+
+    /// Default request without parameters. Equivalent to requesting all the
+    /// metrics without adding or requiring any labels.
+    Request() = default;
+
+    /// Makes request for metrics whose path starts with the `prefix`.
+    static Request MakeWithPrefix(
+        const std::string& prefix,
+        AddLabels add_labels = {},
+        std::vector<Label> require_labels = {}
+    );
+
+    /// Makes request for metrics whose path is `path`.
+    static Request MakeWithPath(
+        const std::string& path,
+        AddLabels add_labels = {},
+        std::vector<Label> require_labels = {}
+    );
+
+    /// Return metrics whose path matches with this `prefix`
+    const std::string prefix{};
+
+    /// Enum for different match types of the `prefix`
+    enum class PrefixMatch {
+        kNoop,        ///< Do not match, the `prefix` is empty
+        kExact,       ///< `prefix` equal to path
+        kStartsWith,  ///< Metric path starts with `prefix`
+    };
+
+    /// Match type of the `prefix`
+    const PrefixMatch prefix_match_type = PrefixMatch::kNoop;
+
+    /// Require those labels in the metric
+    const std::vector<Label> require_labels{};
+
+    /// Add those labels to each returned metric
+    const AddLabels add_labels{};
+
+private:
+    Request(
+        std::string prefix_in,
+        PrefixMatch path_match_type_in,
+        std::vector<Label> require_labels_in,
+        AddLabels add_labels_in
+    );
+};
+
+class BaseFormatBuilder {
+public:
+    virtual ~BaseFormatBuilder();
+
+    virtual void HandleMetric(std::string_view path, LabelsSpan labels, const MetricValue& value) = 0;
+};
+
+}  // namespace utils::statistics
+
+USERVER_NAMESPACE_END