diff options
author | a-romanov <a-romanov@yandex-team.ru> | 2022-02-10 16:48:11 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:11 +0300 |
commit | 0f4c5d1e8c0672bf0a1f2f2d8acac5ba24772435 (patch) | |
tree | b222e5ac2e2e98872661c51ccceee5da0d291e13 /library/cpp/monlib/dynamic_counters | |
parent | aa2986a34bde73b2cdcea5080c4443b7cf2ba686 (diff) | |
download | ydb-0f4c5d1e8c0672bf0a1f2f2d8acac5ba24772435.tar.gz |
Restoring authorship annotation for <a-romanov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/monlib/dynamic_counters')
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.cpp | 8 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/counters.h | 4 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/page.cpp | 40 | ||||
-rw-r--r-- | library/cpp/monlib/dynamic_counters/page.h | 6 |
4 files changed, 29 insertions, 29 deletions
diff --git a/library/cpp/monlib/dynamic_counters/counters.cpp b/library/cpp/monlib/dynamic_counters/counters.cpp index 08eb6faa13..3635d87d0d 100644 --- a/library/cpp/monlib/dynamic_counters/counters.cpp +++ b/library/cpp/monlib/dynamic_counters/counters.cpp @@ -157,8 +157,8 @@ void TDynamicCounters::MergeWithSubgroup(const TString& name, const TString& val Counters.erase(it); Counters.merge(subgroup->Resign()); AtomicAdd(ExpiringCount, AtomicSwap(&subgroup->ExpiringCount, 0)); -} - +} + void TDynamicCounters::ResetCounters(bool derivOnly) { TReadGuard g(Lock); for (auto& [key, value] : Counters) { @@ -198,7 +198,7 @@ void TDynamicCounters::EnumerateSubgroups(const std::function<void(const TString output(key.LabelName, key.LabelValue); } } -} +} void TDynamicCounters::OutputPlainText(IOutputStream& os, const TString& indent) const { auto snap = ReadSnapshot(); @@ -206,7 +206,7 @@ void TDynamicCounters::OutputPlainText(IOutputStream& os, const TString& indent) auto outputVisibilityMarker = [] (EVisibility vis) { return vis == EVisibility::Private ? "\t[PRIVATE]" : ""; }; - + for (const auto& [key, value] : snap) { if (const auto counter = AsCounter(value)) { os << indent diff --git a/library/cpp/monlib/dynamic_counters/counters.h b/library/cpp/monlib/dynamic_counters/counters.h index fd8f530854..dc178cfbe0 100644 --- a/library/cpp/monlib/dynamic_counters/counters.h +++ b/library/cpp/monlib/dynamic_counters/counters.h @@ -12,7 +12,7 @@ #include <util/string/cast.h> #include <util/system/rwlock.h> -#include <functional> +#include <functional> namespace NMonitoring { struct TCounterForPtr; @@ -333,7 +333,7 @@ namespace NMonitoring { TIntrusivePtr<TDynamicCounters> FindSubgroup(const TString& name, const TString& value) const; void RemoveSubgroup(const TString& name, const TString& value); void ReplaceSubgroup(const TString& name, const TString& value, TIntrusivePtr<TDynamicCounters> subgroup); - + // Move all counters from specified subgroup and remove the subgroup. void MergeWithSubgroup(const TString& name, const TString& value); // Recursively reset all/deriv counters to 0. diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp index 0dc63f149e..5124a47bb3 100644 --- a/library/cpp/monlib/dynamic_counters/page.cpp +++ b/library/cpp/monlib/dynamic_counters/page.cpp @@ -5,15 +5,15 @@ #include <library/cpp/string_utils/quote/quote.h> #include <util/string/split.h> -#include <util/system/tls.h> +#include <util/system/tls.h> using namespace NMonitoring; namespace { Y_POD_STATIC_THREAD(TDynamicCounters*) currentCounters(nullptr); -} - +} + TMaybe<EFormat> ParseFormat(TStringBuf str) { if (str == TStringBuf("json")) { return EFormat::JSON; @@ -40,38 +40,38 @@ void TDynamicCountersPage::Output(NMonitoring::IMonHttpRequest& request) { .Split('/') .SkipEmpty() .Collect(&parts); - + TMaybe<EFormat> format = !parts.empty() ? ParseFormat(parts.back()) : Nothing(); if (format) { - parts.pop_back(); + parts.pop_back(); } - + if (!parts.empty() && parts.back() == TStringBuf("private")) { visibility = TCountableBase::EVisibility::Private; parts.pop_back(); } - auto counters = Counters; - + auto counters = Counters; + for (const auto& escaped : parts) { const auto part = CGIUnescapeRet(escaped); TVector<TString> labels; StringSplitter(part).Split('=').SkipEmpty().Collect(&labels); - - if (labels.size() != 2U) - return NotFound(request); - + + if (labels.size() != 2U) + return NotFound(request); + if (const auto child = counters->FindSubgroup( labels.front(), labels.back())) { - counters = child; + counters = child; } else { return HandleAbsentSubgroup(request); } - } - + } + if (!format) { currentCounters = counters.Get(); THtmlMonPage::Output(request); @@ -94,7 +94,7 @@ void TDynamicCountersPage::Output(NMonitoring::IMonHttpRequest& request) { counters->Accept(TString(), TString(), *encoder); out.Flush(); } - + void TDynamicCountersPage::HandleAbsentSubgroup(IMonHttpRequest& request) { if (UnknownGroupPolicy == EUnknownGroupPolicy::Error) { NotFound(request); @@ -112,7 +112,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) { out << "<a href='" << request.GetPath() << "/json'>Counters as JSON</a>"; out << " for <a href='https://wiki.yandex-team.ru/solomon/'>Solomon</a>"; } - + H5() { out << "Counters subgroups"; } @@ -125,15 +125,15 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) { } }); } - + H4() { out << "Counters as text"; } } -} +} void TDynamicCountersPage::OutputText(IOutputStream& out, IMonHttpRequest&) { - currentCounters->OutputPlainText(out); + currentCounters->OutputPlainText(out); } void TDynamicCountersPage::SetUnknownGroupPolicy(EUnknownGroupPolicy value) { diff --git a/library/cpp/monlib/dynamic_counters/page.h b/library/cpp/monlib/dynamic_counters/page.h index 61ae703907..1f0ef6a5ea 100644 --- a/library/cpp/monlib/dynamic_counters/page.h +++ b/library/cpp/monlib/dynamic_counters/page.h @@ -19,7 +19,7 @@ namespace NMonitoring { using TOutputCallback = std::function<void()>; private: - const TIntrusivePtr<TDynamicCounters> Counters; + const TIntrusivePtr<TDynamicCounters> Counters; TOutputCallback OutputCallback; EUnknownGroupPolicy UnknownGroupPolicy {EUnknownGroupPolicy::Error}; @@ -40,11 +40,11 @@ namespace NMonitoring { void Output(NMonitoring::IMonHttpRequest& request) override; void BeforePre(NMonitoring::IMonHttpRequest& request) override; - + void OutputText(IOutputStream& out, NMonitoring::IMonHttpRequest&) override; /// If set to Error, responds with 404 if the requested subgroup is not found. This is the default. /// If set to Ignore, responds with 204 if the requested subgroup is not found void SetUnknownGroupPolicy(EUnknownGroupPolicy value); - }; + }; } |