aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/monlib/encode/legacy_protobuf
diff options
context:
space:
mode:
authorSergey Polovko <sergey@polovko.me>2022-02-10 16:47:02 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:02 +0300
commit3e0b762a82514bac89c1dd6ea7211e381d8aa248 (patch)
treec2d1b379ecaf05ca8f11ed0b5da9d1a950e6e554 /library/cpp/monlib/encode/legacy_protobuf
parentab3783171cc30e262243a0227c86118f7080c896 (diff)
downloadydb-3e0b762a82514bac89c1dd6ea7211e381d8aa248.tar.gz
Restoring authorship annotation for Sergey Polovko <sergey@polovko.me>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/monlib/encode/legacy_protobuf')
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/legacy_proto_decoder.cpp108
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf.h4
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp58
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto28
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/protos/python/ya.make2
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/protos/ya.make2
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.proto50
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/ut/ya.make6
-rw-r--r--library/cpp/monlib/encode/legacy_protobuf/ya.make2
9 files changed, 130 insertions, 130 deletions
diff --git a/library/cpp/monlib/encode/legacy_protobuf/legacy_proto_decoder.cpp b/library/cpp/monlib/encode/legacy_protobuf/legacy_proto_decoder.cpp
index f87a2d7e8f..4a305152e3 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/legacy_proto_decoder.cpp
+++ b/library/cpp/monlib/encode/legacy_protobuf/legacy_proto_decoder.cpp
@@ -1,8 +1,8 @@
#include "legacy_protobuf.h"
-#include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h>
-#include <library/cpp/monlib/metrics/metric_consumer.h>
-#include <library/cpp/monlib/metrics/labels.h>
+#include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h>
+#include <library/cpp/monlib/metrics/metric_consumer.h>
+#include <library/cpp/monlib/metrics/labels.h>
#include <util/generic/yexception.h>
#include <util/generic/maybe.h>
@@ -22,7 +22,7 @@
namespace NMonitoring {
namespace {
- using TMaybeMeta = TMaybe<NMonProto::TMetricMeta>;
+ using TMaybeMeta = TMaybe<NMonProto::TMetricMeta>;
TString ReadLabelValue(const NProtoBuf::Message& msg, const NProtoBuf::FieldDescriptor* d, const NProtoBuf::Reflection& r) {
using namespace NProtoBuf;
@@ -137,8 +137,8 @@ namespace NMonitoring {
}
TMaybeMeta MaybeGetMeta(const NProtoBuf::FieldOptions& opts) {
- if (opts.HasExtension(NMonProto::Metric)) {
- return opts.GetExtension(NMonProto::Metric);
+ if (opts.HasExtension(NMonProto::Metric)) {
+ return opts.GetExtension(NMonProto::Metric);
}
return Nothing();
@@ -218,37 +218,37 @@ namespace NMonitoring {
Reflection_ = nullptr;
}
- TDecoderContext CreateChildFromMeta(const NMonProto::TMetricMeta& metricMeta, const TString& name, i64 repeatedIdx = -1) {
+ TDecoderContext CreateChildFromMeta(const NMonProto::TMetricMeta& metricMeta, const TString& name, i64 repeatedIdx = -1) {
TDecoderContext child{*this};
child.Clear();
- if (metricMeta.HasCustomPath()) {
- if (const auto& nodePath = metricMeta.GetCustomPath()) {
+ if (metricMeta.HasCustomPath()) {
+ if (const auto& nodePath = metricMeta.GetCustomPath()) {
child.AppendPath(nodePath);
}
- } else if (metricMeta.GetPath()) {
+ } else if (metricMeta.GetPath()) {
child.AppendPath(name);
}
- if (metricMeta.HasKeys()) {
- child.ParseKeys(metricMeta.GetKeys(), repeatedIdx);
+ if (metricMeta.HasKeys()) {
+ child.ParseKeys(metricMeta.GetKeys(), repeatedIdx);
}
return child;
}
- TDecoderContext CreateChildFromRepeatedScalar(const NMonProto::TMetricMeta& metricMeta, i64 repeatedIdx = -1) {
+ TDecoderContext CreateChildFromRepeatedScalar(const NMonProto::TMetricMeta& metricMeta, i64 repeatedIdx = -1) {
TDecoderContext child{*this};
child.Clear();
- if (metricMeta.HasKeys()) {
- child.ParseKeys(metricMeta.GetKeys(), repeatedIdx);
+ if (metricMeta.HasKeys()) {
+ child.ParseKeys(metricMeta.GetKeys(), repeatedIdx);
}
return child;
}
- TDecoderContext CreateChildFromEls(const TString& name, const NMonProto::TExtraLabelMetrics& metrics, size_t idx, TMaybeMeta maybeMeta) {
+ TDecoderContext CreateChildFromEls(const TString& name, const NMonProto::TExtraLabelMetrics& metrics, size_t idx, TMaybeMeta maybeMeta) {
TDecoderContext child{*this};
child.Clear();
@@ -261,8 +261,8 @@ namespace NMonitoring {
}
child.Labels_.push_back(::MakeIntrusive<TLazyLabel>(
- [ labelName = metrics.GetlabelName(), idx, &metrics ](const auto&) {
- const auto& val = metrics.Getvalues(idx);
+ [ labelName = metrics.GetlabelName(), idx, &metrics ](const auto&) {
+ const auto& val = metrics.Getvalues(idx);
TString labelVal;
const auto uintLabel = val.GetlabelValueUint();
@@ -356,7 +356,7 @@ namespace NMonitoring {
class TDecoder {
public:
- TDecoder(IMetricConsumer* consumer, const NProtoBuf::Message& message, TInstant timestamp)
+ TDecoder(IMetricConsumer* consumer, const NProtoBuf::Message& message, TInstant timestamp)
: Consumer_{consumer}
, Message_{message}
, Timestamp_{timestamp}
@@ -374,12 +374,12 @@ namespace NMonitoring {
}
private:
- static const NMonProto::TExtraLabelMetrics& ExtractExtraMetrics(TDecoderContext& ctx, const NProtoBuf::FieldDescriptor& f) {
+ static const NMonProto::TExtraLabelMetrics& ExtractExtraMetrics(TDecoderContext& ctx, const NProtoBuf::FieldDescriptor& f) {
const auto& parent = ctx.Message();
const auto& reflection = ctx.Reflection();
auto& subMessage = reflection.GetMessage(parent, &f);
- return dynamic_cast<const NMonProto::TExtraLabelMetrics&>(subMessage);
+ return dynamic_cast<const NMonProto::TExtraLabelMetrics&>(subMessage);
}
void DecodeImpl(const NProtoBuf::Message& msg, TDecoderContext ctx) const {
@@ -394,68 +394,68 @@ namespace NMonitoring {
const auto& opts = f->options();
const auto isMessage = f->type() == NProtoBuf::FieldDescriptor::TYPE_MESSAGE;
- const auto isExtraLabelMetrics = isMessage && f->message_type()->full_name() == "NMonProto.TExtraLabelMetrics";
+ const auto isExtraLabelMetrics = isMessage && f->message_type()->full_name() == "NMonProto.TExtraLabelMetrics";
const auto maybeMeta = MaybeGetMeta(opts);
- if (!(maybeMeta || isExtraLabelMetrics)) {
+ if (!(maybeMeta || isExtraLabelMetrics)) {
continue;
}
- if (isExtraLabelMetrics) {
- const auto& extra = ExtractExtraMetrics(ctx, *f);
- RecurseExtraLabelMetrics(ctx, extra, f->name(), maybeMeta);
+ if (isExtraLabelMetrics) {
+ const auto& extra = ExtractExtraMetrics(ctx, *f);
+ RecurseExtraLabelMetrics(ctx, extra, f->name(), maybeMeta);
} else if (isMessage) {
RecurseMessage(ctx, *maybeMeta, *f);
} else if (f->is_repeated()) {
RecurseRepeatedScalar(ctx, *maybeMeta, *f);
- } else if (maybeMeta->HasType()) {
+ } else if (maybeMeta->HasType()) {
const auto val = ReadFieldAsDouble(msg, f, ctx.Reflection());
- const bool isRate = maybeMeta->GetType() == NMonProto::EMetricType::RATE;
- WriteMetric(val, ctx, f->name(), isRate);
+ const bool isRate = maybeMeta->GetType() == NMonProto::EMetricType::RATE;
+ WriteMetric(val, ctx, f->name(), isRate);
}
}
}
- void RecurseRepeatedScalar(TDecoderContext ctx, const NMonProto::TMetricMeta& meta, const NProtoBuf::FieldDescriptor& f) const {
+ void RecurseRepeatedScalar(TDecoderContext ctx, const NMonProto::TMetricMeta& meta, const NProtoBuf::FieldDescriptor& f) const {
auto&& msg = ctx.Message();
auto&& reflection = ctx.Reflection();
- const bool isRate = meta.GetType() == NMonProto::EMetricType::RATE;
+ const bool isRate = meta.GetType() == NMonProto::EMetricType::RATE;
- // this is a repeated scalar field, which makes metric only if it's indexing
+ // this is a repeated scalar field, which makes metric only if it's indexing
for (auto i = 0; i < reflection.FieldSize(msg, &f); ++i) {
auto subCtx = ctx.CreateChildFromRepeatedScalar(meta, i);
subCtx.Init(&msg);
auto val = ReadRepeatedAsDouble(msg, &f, reflection, i);
- WriteMetric(val, subCtx, f.name(), isRate);
+ WriteMetric(val, subCtx, f.name(), isRate);
}
}
- void RecurseExtraLabelMetrics(TDecoderContext ctx, const NMonProto::TExtraLabelMetrics& msg, const TString& name, const TMaybeMeta& meta) const {
+ void RecurseExtraLabelMetrics(TDecoderContext ctx, const NMonProto::TExtraLabelMetrics& msg, const TString& name, const TMaybeMeta& meta) const {
auto i = 0;
for (const auto& val : msg.Getvalues()) {
auto subCtx = ctx.CreateChildFromEls(name, msg, i++, meta);
subCtx.Init(&val);
- const bool isRate = val.Hastype()
- ? val.Gettype() == NMonProto::EMetricType::RATE
- : meta->GetType() == NMonProto::EMetricType::RATE;
+ const bool isRate = val.Hastype()
+ ? val.Gettype() == NMonProto::EMetricType::RATE
+ : meta->GetType() == NMonProto::EMetricType::RATE;
- double metricVal{0};
- if (isRate) {
- metricVal = val.GetlongValue();
+ double metricVal{0};
+ if (isRate) {
+ metricVal = val.GetlongValue();
} else {
- metricVal = val.GetdoubleValue();
+ metricVal = val.GetdoubleValue();
}
- WriteMetric(metricVal, subCtx, "", isRate);
+ WriteMetric(metricVal, subCtx, "", isRate);
for (const auto& child : val.Getchildren()) {
- RecurseExtraLabelMetrics(subCtx, child, "", meta);
+ RecurseExtraLabelMetrics(subCtx, child, "", meta);
}
}
}
- void RecurseMessage(TDecoderContext ctx, const NMonProto::TMetricMeta& metricMeta, const NProtoBuf::FieldDescriptor& f) const {
+ void RecurseMessage(TDecoderContext ctx, const NMonProto::TMetricMeta& metricMeta, const NProtoBuf::FieldDescriptor& f) const {
const auto& msg = ctx.Message();
const auto& reflection = ctx.Reflection();
@@ -463,12 +463,12 @@ namespace NMonitoring {
TRACE("recurse into repeated message " << f.name());
for (auto i = 0; i < reflection.FieldSize(msg, &f); ++i) {
auto& subMessage = reflection.GetRepeatedMessage(msg, &f, i);
- DecodeImpl(subMessage, ctx.CreateChildFromMeta(metricMeta, f.name(), i));
+ DecodeImpl(subMessage, ctx.CreateChildFromMeta(metricMeta, f.name(), i));
}
} else {
TRACE("recurse into message " << f.name());
auto& subMessage = reflection.GetMessage(msg, &f);
- DecodeImpl(subMessage, ctx.CreateChildFromMeta(metricMeta, f.name()));
+ DecodeImpl(subMessage, ctx.CreateChildFromMeta(metricMeta, f.name()));
}
}
@@ -480,12 +480,12 @@ namespace NMonitoring {
Consumer_->OnDouble(Timestamp_, value);
}
- void WriteMetric(double value, const TDecoderContext& ctx, const TString& name, bool isRate) const {
- if (isRate) {
- Consumer_->OnMetricBegin(EMetricType::RATE);
+ void WriteMetric(double value, const TDecoderContext& ctx, const TString& name, bool isRate) const {
+ if (isRate) {
+ Consumer_->OnMetricBegin(EMetricType::RATE);
WriteValue(static_cast<ui64>(value));
} else {
- Consumer_->OnMetricBegin(EMetricType::GAUGE);
+ Consumer_->OnMetricBegin(EMetricType::GAUGE);
WriteValue(static_cast<double>(value));
}
@@ -504,23 +504,23 @@ namespace NMonitoring {
}
Consumer_->OnLabelsEnd();
- Consumer_->OnMetricEnd();
+ Consumer_->OnMetricEnd();
}
private:
- IMetricConsumer* Consumer_{nullptr};
+ IMetricConsumer* Consumer_{nullptr};
const NProtoBuf::Message& Message_;
TInstant Timestamp_;
};
}
- void DecodeLegacyProto(const NProtoBuf::Message& data, IMetricConsumer* consumer, TInstant ts) {
+ void DecodeLegacyProto(const NProtoBuf::Message& data, IMetricConsumer* consumer, TInstant ts) {
Y_ENSURE(consumer);
TDecoder(consumer, data, ts).Decode();
}
- void DecodeLegacyProtoToStream(const NProtoBuf::Message& data, IMetricConsumer* consumer, TInstant ts) {
+ void DecodeLegacyProtoToStream(const NProtoBuf::Message& data, IMetricConsumer* consumer, TInstant ts) {
Y_ENSURE(consumer);
TDecoder(consumer, data, ts).DecodeToStream();
}
diff --git a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf.h b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf.h
index 7cf8985d65..50f65bf2c8 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf.h
+++ b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf.h
@@ -9,8 +9,8 @@ namespace NMonitoring {
// - memOnly;
// - dropHost/ignorePath
- void DecodeLegacyProto(const NProtoBuf::Message& data, class IMetricConsumer* c, TInstant ts = TInstant::Zero());
+ void DecodeLegacyProto(const NProtoBuf::Message& data, class IMetricConsumer* c, TInstant ts = TInstant::Zero());
/// Does not open/close consumer stream unlike the above function.
- void DecodeLegacyProtoToStream(const NProtoBuf::Message& data, class IMetricConsumer* c, TInstant ts = TInstant::Zero());
+ void DecodeLegacyProtoToStream(const NProtoBuf::Message& data, class IMetricConsumer* c, TInstant ts = TInstant::Zero());
}
diff --git a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
index 53683cb39c..a751f8fb14 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
+++ b/library/cpp/monlib/encode/legacy_protobuf/legacy_protobuf_ut.cpp
@@ -2,12 +2,12 @@
#include <library/cpp/testing/unittest/registar.h>
-#include <library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.pb.h>
-#include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h>
+#include <library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.pb.h>
+#include <library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.pb.h>
-#include <library/cpp/monlib/encode/protobuf/protobuf.h>
-#include <library/cpp/monlib/encode/text/text.h>
-#include <library/cpp/monlib/metrics/labels.h>
+#include <library/cpp/monlib/encode/protobuf/protobuf.h>
+#include <library/cpp/monlib/encode/text/text.h>
+#include <library/cpp/monlib/metrics/labels.h>
#include <util/generic/algorithm.h>
#include <util/generic/hash_set.h>
@@ -24,7 +24,7 @@ TSimple MakeSimpleMessage() {
return msg;
}
-IMetricEncoderPtr debugPrinter = EncoderText(&Cerr);
+IMetricEncoderPtr debugPrinter = EncoderText(&Cerr);
namespace NMonitoring {
inline bool operator<(const TLabel& lhs, const TLabel& rhs) {
@@ -34,20 +34,20 @@ namespace NMonitoring {
}
-void SetLabelValue(NMonProto::TExtraLabelMetrics::TValue& val, TString s) {
+void SetLabelValue(NMonProto::TExtraLabelMetrics::TValue& val, TString s) {
val.SetlabelValue(s);
}
-void SetLabelValue(NMonProto::TExtraLabelMetrics::TValue& val, ui64 u) {
+void SetLabelValue(NMonProto::TExtraLabelMetrics::TValue& val, ui64 u) {
val.SetlabelValueUint(u);
}
template <typename T, typename V>
-NMonProto::TExtraLabelMetrics MakeExtra(TString labelName, V labelValue, T value, bool isDeriv) {
- NMonProto::TExtraLabelMetrics metric;
- auto* val = metric.Addvalues();
+NMonProto::TExtraLabelMetrics MakeExtra(TString labelName, V labelValue, T value, bool isDeriv) {
+ NMonProto::TExtraLabelMetrics metric;
+ auto* val = metric.Addvalues();
- metric.SetlabelName(labelName);
+ metric.SetlabelName(labelName);
SetLabelValue(*val, labelValue);
if (isDeriv) {
@@ -56,7 +56,7 @@ NMonProto::TExtraLabelMetrics MakeExtra(TString labelName, V labelValue, T value
val->SetdoubleValue(value);
}
- return metric;
+ return metric;
}
void AssertLabels(const TLabels& expected, const NProto::TMultiSample& actual) {
@@ -100,13 +100,13 @@ void AssertSimpleMessage(const NProto::TMultiSamplesList& samples, TString pathP
UNIT_ASSERT(expectedValues.contains(labelVal));
if (labelVal == pathPrefix + "Foo") {
- UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::GAUGE);
+ UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::GAUGE);
UNIT_ASSERT_DOUBLES_EQUAL(s.GetPoints(0).GetFloat64(), 1, 1e-6);
} else if (labelVal == pathPrefix + "Bar") {
- UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::GAUGE);
+ UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::GAUGE);
UNIT_ASSERT_DOUBLES_EQUAL(s.GetPoints(0).GetFloat64(), 2, 1e-6);
} else if (labelVal == pathPrefix + "Baz") {
- UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::RATE);
+ UNIT_ASSERT_EQUAL(s.GetMetricType(), NProto::RATE);
UNIT_ASSERT_EQUAL(s.GetPoints(0).GetUint64(), 42);
}
}
@@ -115,7 +115,7 @@ void AssertSimpleMessage(const NProto::TMultiSamplesList& samples, TString pathP
Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(SimpleProto) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto msg = MakeSimpleMessage();
DecodeLegacyProto(msg, e.Get());
@@ -125,7 +125,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(RepeatedProto) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
TRepeated msg;
@@ -138,7 +138,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(RepeatedProtoWithPath) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
TRepeatedWithPath msg;
@@ -151,7 +151,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(DeepNesting) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
TRepeatedWithPath internal;
@@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(Keys) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
simple.SetLabel("my_label_value");
@@ -206,7 +206,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(NonStringKeys) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
TNonStringKeys msg;
msg.SetFoo(42);
@@ -241,7 +241,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(KeysFromNonLeafNodes) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
simple.SetLabel("label_value");
@@ -260,7 +260,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(SpacesAreGetReplaced) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
auto simple = MakeSimpleMessage();
simple.SetLabel("my label_value");
@@ -288,7 +288,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(ExtraLabels) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
TExtraLabels msg;
msg.MutableExtraAsIs()->CopyFrom(MakeExtra("label", "foo", 42, false));
@@ -318,14 +318,14 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(NestedExtraLabels) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
TExtraLabels msg;
auto extra = MakeExtra("label", "foo", 42, false);
auto* val = extra.Mutablevalues(0);
{
auto child = MakeExtra("child1", "label1", 24, true);
- child.Mutablevalues(0)->Settype(NMonProto::EMetricType::RATE);
+ child.Mutablevalues(0)->Settype(NMonProto::EMetricType::RATE);
val->Addchildren()->CopyFrom(child);
}
@@ -368,7 +368,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(RobotLabels) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
TNamedCounter responses;
responses.SetName("responses");
@@ -397,7 +397,7 @@ Y_UNIT_TEST_SUITE(TLegacyProtoDecoderTest) {
Y_UNIT_TEST(ZoraLabels) {
NProto::TMultiSamplesList samples;
- IMetricEncoderPtr e = EncoderProtobuf(&samples);
+ IMetricEncoderPtr e = EncoderProtobuf(&samples);
TTimeLogHist hist;
hist.AddBuckets(42);
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto b/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto
index fd23eb372b..a8c5a2b93d 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto
@@ -1,23 +1,23 @@
import "google/protobuf/descriptor.proto";
-package NMonProto;
+package NMonProto;
-option java_package = "ru.yandex.monlib.proto";
-option java_outer_classname = "MetricMetaProto";
+option java_package = "ru.yandex.monlib.proto";
+option java_outer_classname = "MetricMetaProto";
-enum EMetricType {
- GAUGE = 1;
- RATE = 2;
+enum EMetricType {
+ GAUGE = 1;
+ RATE = 2;
}
-enum EMemOnly {
+enum EMemOnly {
DEFAULT = 0;
STORE = 1;
MEM_ONLY = 2;
}
-message TMetricMeta {
- optional EMetricType Type = 1;
+message TMetricMeta {
+ optional EMetricType Type = 1;
optional bool Path = 2;
optional string Keys = 3;
optional bool MemOnly = 4;
@@ -45,7 +45,7 @@ message THistogram {
}
// field of this type is recognized by Solomon
-message TExtraLabelMetrics {
+message TExtraLabelMetrics {
optional string labelName = 1;
message TValue {
@@ -57,17 +57,17 @@ message TExtraLabelMetrics {
optional double doubleValue = 3;
optional THistogram histogramValue = 4;
- optional EMetricType type = 7;
- optional EMemOnly memOnly = 8;
+ optional EMetricType type = 7;
+ optional EMemOnly memOnly = 8;
optional bool dropHost = 9;
- repeated TExtraLabelMetrics children = 17;
+ repeated TExtraLabelMetrics children = 17;
}
repeated TValue values = 2;
}
extend google.protobuf.FieldOptions {
- optional TMetricMeta Metric = 1719;
+ optional TMetricMeta Metric = 1719;
}
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/python/ya.make b/library/cpp/monlib/encode/legacy_protobuf/protos/python/ya.make
index 095b307b01..ea96eaa950 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/python/ya.make
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/python/ya.make
@@ -1,3 +1,3 @@
OWNER(g:solomon)
-PY_PROTOS_FOR(library/cpp/monlib/encode/legacy_protobuf/protos)
+PY_PROTOS_FOR(library/cpp/monlib/encode/legacy_protobuf/protos)
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/ya.make b/library/cpp/monlib/encode/legacy_protobuf/protos/ya.make
index 489f361ab1..b5f1098a48 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/ya.make
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/ya.make
@@ -3,7 +3,7 @@ PROTO_LIBRARY()
OWNER(g:solomon)
SRCS(
- metric_meta.proto
+ metric_meta.proto
)
IF (NOT PY_PROTOS_FOR)
diff --git a/library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.proto b/library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.proto
index 37e901de48..c51d870e07 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.proto
+++ b/library/cpp/monlib/encode/legacy_protobuf/ut/test_cases.proto
@@ -1,26 +1,26 @@
-import "library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto";
+import "library/cpp/monlib/encode/legacy_protobuf/protos/metric_meta.proto";
message TSimple {
- optional uint64 Foo = 1 [ (NMonProto.Metric).Type = GAUGE ];
- optional double Bar = 2 [ (NMonProto.Metric).Type = GAUGE ];
- optional double Baz = 3 [ (NMonProto.Metric).Type = RATE ];
+ optional uint64 Foo = 1 [ (NMonProto.Metric).Type = GAUGE ];
+ optional double Bar = 2 [ (NMonProto.Metric).Type = GAUGE ];
+ optional double Baz = 3 [ (NMonProto.Metric).Type = RATE ];
optional string Label = 4;
}
message TRepeated {
- repeated TSimple Messages = 1 [ (NMonProto.Metric).Path = false ];
+ repeated TSimple Messages = 1 [ (NMonProto.Metric).Path = false ];
};
message TRepeatedWithPath {
- repeated TSimple Namespace = 1 [ (NMonProto.Metric).Path = true ];
+ repeated TSimple Namespace = 1 [ (NMonProto.Metric).Path = true ];
};
message TNestedWithKeys {
- repeated TSimple Namespace = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "my_label:Label fixed_label=fixed_value numbered:#" ];
+ repeated TSimple Namespace = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "my_label:Label fixed_label=fixed_value numbered:#" ];
};
message TDeepNesting {
- optional TRepeatedWithPath Nested = 1 [ (NMonProto.Metric).Path = false ];
+ optional TRepeatedWithPath Nested = 1 [ (NMonProto.Metric).Path = false ];
};
enum EEnum {
@@ -29,43 +29,43 @@ enum EEnum {
};
message TNonStringKeys {
- optional uint32 Foo = 1 [ (NMonProto.Metric).Type = GAUGE ];
+ optional uint32 Foo = 1 [ (NMonProto.Metric).Type = GAUGE ];
optional EEnum Enum = 2;
optional uint32 Int = 3;
};
message TRepeatedNonStringKeys {
- repeated TNonStringKeys Nested = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "enum:Enum int:Int" ];
+ repeated TNonStringKeys Nested = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "enum:Enum int:Int" ];
};
message TExtraLabels {
- optional NMonProto.TExtraLabelMetrics ExtraAsIs = 1 [ (NMonProto.Metric).Type = GAUGE ];
- optional NMonProto.TExtraLabelMetrics ExtraDeriv = 2 [ (NMonProto.Metric).Type = RATE ];
+ optional NMonProto.TExtraLabelMetrics ExtraAsIs = 1 [ (NMonProto.Metric).Type = GAUGE ];
+ optional NMonProto.TExtraLabelMetrics ExtraDeriv = 2 [ (NMonProto.Metric).Type = RATE ];
};
message TRepeatedWithName {
optional string Name = 1;
- repeated TSimple Nested = 2 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "my_label:Label" ];
+ repeated TSimple Nested = 2 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "my_label:Label" ];
};
message TKeysFromNonLeaf {
- repeated TRepeatedWithName Nested = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "name:Name" ];
+ repeated TRepeatedWithName Nested = 1 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "name:Name" ];
};
message TNamedCounter {
optional string Name = 1;
- optional uint64 Count = 2 [ (NMonProto.Metric).Type = RATE ];
+ optional uint64 Count = 2 [ (NMonProto.Metric).Type = RATE ];
}
message TCrawlerCounters {
message TStatusCounters {
- repeated TNamedCounter ZoraResponses = 3 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "ZoraResponse:Name" ];
- repeated TNamedCounter FetcherResponses = 4 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SpiderResponse:Name" ];
- repeated TNamedCounter RotorResponses = 5 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SpiderResponse:Name" ];
- repeated TNamedCounter PDFetchResponses = 6 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "PDFetchResponse:Name" ];
- repeated TNamedCounter CalcResponses = 7 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "CalcResponse:Name" ];
- repeated TNamedCounter Responses = 8 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "AggregatedResponse:Name" ];
+ repeated TNamedCounter ZoraResponses = 3 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "ZoraResponse:Name" ];
+ repeated TNamedCounter FetcherResponses = 4 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SpiderResponse:Name" ];
+ repeated TNamedCounter RotorResponses = 5 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SpiderResponse:Name" ];
+ repeated TNamedCounter PDFetchResponses = 6 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "PDFetchResponse:Name" ];
+ repeated TNamedCounter CalcResponses = 7 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "CalcResponse:Name" ];
+ repeated TNamedCounter Responses = 8 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "AggregatedResponse:Name" ];
}
message TPolicyCounters {
@@ -73,18 +73,18 @@ message TCrawlerCounters {
optional string Name = 2;
optional string Zone = 3;
- optional TStatusCounters StatusCounters = 4 [ (NMonProto.Metric).Path = true ];
+ optional TStatusCounters StatusCounters = 4 [ (NMonProto.Metric).Path = true ];
}
optional string Component = 1;
- repeated TPolicyCounters PoliciesCounters = 3 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SubComponent:SubComponent Policy:Name Zone:Zone" ];
+ repeated TPolicyCounters PoliciesCounters = 3 [ (NMonProto.Metric).Path = true, (NMonProto.Metric).Keys = "SubComponent:SubComponent Policy:Name Zone:Zone" ];
}
message TTimeLogHist {
optional uint32 MinBucketMillisec = 1;
- repeated uint64 Buckets = 2 [ (NMonProto.Metric).Type = RATE, (NMonProto.Metric).Keys = "slot:#" ];
+ repeated uint64 Buckets = 2 [ (NMonProto.Metric).Type = RATE, (NMonProto.Metric).Keys = "slot:#" ];
}
message TKiwiCounters {
- optional TTimeLogHist Times = 22 [ (NMonProto.Metric).Path = true ];
+ optional TTimeLogHist Times = 22 [ (NMonProto.Metric).Path = true ];
}
diff --git a/library/cpp/monlib/encode/legacy_protobuf/ut/ya.make b/library/cpp/monlib/encode/legacy_protobuf/ut/ya.make
index 479a0c46c9..fa9b4ebb1a 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/ut/ya.make
+++ b/library/cpp/monlib/encode/legacy_protobuf/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(library/cpp/monlib/encode/legacy_protobuf)
+UNITTEST_FOR(library/cpp/monlib/encode/legacy_protobuf)
OWNER(
g:solomon
@@ -11,8 +11,8 @@ SRCS(
)
PEERDIR(
- library/cpp/monlib/encode/protobuf
- library/cpp/monlib/encode/text
+ library/cpp/monlib/encode/protobuf
+ library/cpp/monlib/encode/text
)
END()
diff --git a/library/cpp/monlib/encode/legacy_protobuf/ya.make b/library/cpp/monlib/encode/legacy_protobuf/ya.make
index 74c82aac93..5750032537 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/ya.make
+++ b/library/cpp/monlib/encode/legacy_protobuf/ya.make
@@ -10,7 +10,7 @@ SRCS(
)
PEERDIR(
- library/cpp/monlib/encode/legacy_protobuf/protos
+ library/cpp/monlib/encode/legacy_protobuf/protos
)
END()