Skip to content

fix core: convert SystemStatisticsCollector to PIMPL #1275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seriouscoder43 wants to merge 1 commit into
base: develop
Choose a base branch
from
+47 −25
Open

fix core: convert SystemStatisticsCollector to PIMPL #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions core/include/userver/utils/statistics/system_statistics_collector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
/// @file userver/utils/statistics/system_statistics_collector.hpp
/// @brief @copybrief components::SystemStatisticsCollector

#include <memory>

#include <userver/components/component_base.hpp>
#include <userver/components/component_fwd.hpp>
#include <userver/concurrent/variable.hpp>
#include <userver/engine/task/task_processor_fwd.hpp>
#include <userver/utils/periodic_task.hpp>
#include <utils/statistics/system_statistics.hpp>

USERVER_NAMESPACE_BEGIN

namespace utils::statistics {

class Writer;

} // namespace utils::statistics

namespace components {

/// @ingroup userver_components
Expand All @@ -36,6 +40,7 @@ class SystemStatisticsCollector final : public ComponentBase {
static constexpr std::string_view kName = "system-statistics-collector";

SystemStatisticsCollector(const ComponentConfig&, const ComponentContext&);
~SystemStatisticsCollector() override;

static yaml_config::Schema GetStaticConfigSchema();

Expand All @@ -44,15 +49,8 @@ class SystemStatisticsCollector final : public ComponentBase {

void ProcessTimer();

struct Data {
utils::statistics::impl::SystemStats last_stats{};
utils::statistics::impl::SystemStats last_nginx_stats{};
};

const bool with_nginx_;
engine::TaskProcessor& fs_task_processor_;
concurrent::Variable<Data> data_;
utils::PeriodicTask periodic_;
struct Impl;
std::unique_ptr<Impl> impl_;
};

template <>
Expand Down
48 changes: 36 additions & 12 deletions core/src/utils/statistics/system_statistics_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
#include <userver/utils/statistics/system_statistics_collector.hpp>

#include <memory>

#include <userver/components/component.hpp>
#include <userver/components/statistics_storage.hpp>
#include <userver/concurrent/variable.hpp>
#include <userver/engine/async.hpp>
#include <userver/utils/periodic_task.hpp>
#include <userver/yaml_config/merge_schemas.hpp>

#include <utils/statistics/system_statistics.hpp>

#ifndef ARCADIA_ROOT
#include "generated/src/utils/statistics/system_statistics_collector.yaml.hpp" // Y_IGNORE
#endif
Expand All @@ -13,40 +19,58 @@ USERVER_NAMESPACE_BEGIN

namespace components {

struct SystemStatisticsCollector::Impl {
struct Data {
utils::statistics::impl::SystemStats last_stats{};
utils::statistics::impl::SystemStats last_nginx_stats{};
};

Impl(SystemStatisticsCollector& owner, const ComponentConfig& config, const ComponentContext& context)
: with_nginx(config["with-nginx"].As<bool>(false)),
fs_task_processor(GetFsTaskProcessor(config, context)),
periodic(
"system_statistics_collector",
{std::chrono::seconds(10), {utils::PeriodicTask::Flags::kNow}},
[&owner] { owner.ProcessTimer(); }
)
{}

const bool with_nginx;
engine::TaskProcessor& fs_task_processor;
concurrent::Variable<Data> data;
utils::PeriodicTask periodic;
};

SystemStatisticsCollector::SystemStatisticsCollector(const ComponentConfig& config, const ComponentContext& context)
: ComponentBase(config, context),
with_nginx_(config["with-nginx"].As<bool>(false)),
fs_task_processor_(GetFsTaskProcessor(config, context)),
periodic_(
"system_statistics_collector",
{std::chrono::seconds(10), {utils::PeriodicTask::Flags::kNow}},
[this] { ProcessTimer(); }
)
impl_(std::make_unique<Impl>(*this, config, context))
{
utils::statistics::RegisterWriterScope(context, "", [this](utils::statistics::Writer& writer) {
ExtendStatistics(writer);
});
}

SystemStatisticsCollector::~SystemStatisticsCollector() = default;

void SystemStatisticsCollector::ProcessTimer() {
engine::CriticalAsyncNoTracing(fs_task_processor_, [&] {
engine::CriticalAsyncNoTracing(impl_->fs_task_processor, [&] {
auto self = utils::statistics::impl::GetSelfSystemStatistics();
utils::statistics::impl::SystemStats nginx;
if (with_nginx_) {
if (impl_->with_nginx) {
nginx = utils::statistics::impl::GetSystemStatisticsByExeName("nginx");
}

auto data = data_.UniqueLock();
auto data = impl_->data.UniqueLock();
data->last_stats = self;
data->last_nginx_stats = nginx;
}).Get();
}

void SystemStatisticsCollector::ExtendStatistics(utils::statistics::Writer& writer) {
auto data = data_.Lock();
auto data = impl_->data.Lock();

DumpMetric(writer, data->last_stats);
if (with_nginx_) {
if (impl_->with_nginx) {
writer.ValueWithLabels(data->last_nginx_stats, {"application", "nginx"});
}
}
Expand Down
Loading