Merge branch 'rightlib' into mergelibs-241004-1110

4 files changed, 8 insertions, 8 deletions

diff --git a/library/cpp/monlib/encode/json/json_encoder.cpp b/library/cpp/monlib/encode/json/json_encoder.cpp
index 20d2bb6283..69da5170f0 100644
--- a/library/cpp/monlib/encode/json/json_encoder.cpp
+++ b/library/cpp/monlib/encode/json/json_encoder.cpp
@@ -198,7 +198,7 @@ namespace NMonitoring {
                 if (Style_ != EJsonStyle::Cloud) {
                     return;
                 }
-                if (CurrentMetricName_.Empty()) {
+                if (CurrentMetricName_.empty()) {
                     ythrow yexception() << "label '" << MetricNameLabel_ << "' is not defined";
                 }
                 Buf_.WriteKey("name");
diff --git a/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp b/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp
index 313651ba8f..16a08f4781 100644
--- a/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp
+++ b/library/cpp/monlib/encode/prometheus/prometheus_decoder.cpp
@@ -219,7 +219,7 @@ namespace NMonitoring {
 
         private:
             bool HasRemaining() const noexcept {
-                return CurrentPos_ < Data_.Size();
+                return CurrentPos_ < Data_.size();
             }
 
             // # 'TYPE' metric_name {counter|gauge|histogram|summary|untyped}
@@ -234,7 +234,7 @@ namespace NMonitoring {
                     SkipSpaces();
 
                     TStringBuf nextName = ReadTokenAsMetricName();
-                    Y_PARSER_ENSURE(!nextName.Empty(), "invalid metric name");
+                    Y_PARSER_ENSURE(!nextName.empty(), "invalid metric name");
 
                     SkipSpaces();
                     EPrometheusMetricType nextType = ReadType();
diff --git a/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp b/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp
index fc482a4570..0c6c23c466 100644
--- a/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp
+++ b/library/cpp/monlib/encode/prometheus/prometheus_encoder.cpp
@@ -106,7 +106,7 @@ namespace NMonitoring {
         private:
             // will replace invalid chars with '_'
             void WriteMetricName(TStringBuf name) {
-                Y_ENSURE(!name.Empty(), "trying to write metric with empty name");
+                Y_ENSURE(!name.empty(), "trying to write metric with empty name");
 
                 char ch = name[0];
                 if (!NPrometheus::IsValidMetricNameStart(ch)) {
@@ -131,7 +131,7 @@ namespace NMonitoring {
                     WriteLabelValue(l.Value());
                     Out_->Write(", "); // trailign comma is supported in parsers
                 }
-                if (!addLabelKey.Empty() && !addLabelValue.Empty()) {
+                if (!addLabelKey.empty() && !addLabelValue.empty()) {
                     Out_->Write(addLabelKey);
                     Out_->Write('=');
                     WriteLabelValue(addLabelValue);
@@ -162,12 +162,12 @@ namespace NMonitoring {
             {
                 // (1) name
                 WriteMetricName(name);
-                if (!suffix.Empty()) {
+                if (!suffix.empty()) {
                     Out_->Write(suffix);
                 }
 
                 // (2) labels
-                if (!labels.Empty() || !addLabelKey.Empty()) {
+                if (!labels.Empty() || !addLabelKey.empty()) {
                     WriteLabels(labels, addLabelKey, addLabelValue);
                 }
                 Out_->Write(' ');
diff --git a/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp b/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp
index a2b0bb5f50..7e13c3292b 100644
--- a/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp
+++ b/library/cpp/monlib/encode/spack/spack_v1_encoder.cpp
@@ -312,7 +312,7 @@ namespace NMonitoring {
         EMetricsMergingMode mergingMode,
         TStringBuf metricNameLabel
     ) {
-        Y_ENSURE(!metricNameLabel.Empty(), "metricNameLabel can't be empty");
+        Y_ENSURE(!metricNameLabel.empty(), "metricNameLabel can't be empty");
         return MakeHolder<TEncoderSpackV1>(out, timePrecision, compression, mergingMode, SV1_02, metricNameLabel);
     }
 }