Skip to content

Commit 30ac5db

Browse files
authored
YMQ: Use "name" label name instead of "sensor" for queue.total_count time series (25-1) (#16263)
1 parent b2fba1a commit 30ac5db

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ydb/core/ymq/base/counters.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ void TFolderCounters::InitCounters() {
537537
InsertCounters();
538538
if (UserCounters.YmqCounters) {
539539
total_count.Init(
540-
FolderCounters.YmqCounters, ELifetime::Expiring, EValueType::Absolute, DEFAULT_COUNTER_NAME,
540+
FolderCounters.YmqCounters, ELifetime::Expiring, EValueType::Absolute, DEFAULT_YMQ_COUNTER_NAME,
541541
"queue.total_count",
542542
ELaziness::OnStart
543543
);
@@ -985,7 +985,7 @@ void TCloudAuthCounters::InitCounters(TIntrusivePtr<::NMonitoring::TDynamicCount
985985
for (size_t credentialType = 0; credentialType < NCloudAuth::ECredentialType::CredentialTypesCount; ++credentialType) {
986986
const auto credentialTypeStr = ToString(static_cast<NCloudAuth::ECredentialType>(credentialType));
987987
const auto actionAndCredentialCounters = actionCounters->GetSubgroup("credential_type", credentialTypeStr);
988-
988+
989989
if (actionType == NCloudAuth::EActionType::Authorize) {
990990
INIT_COUNTER_WITH_NAME(actionAndCredentialCounters, AuthorizeSuccess[credentialType], "Ok", ELifetime::Persistent, EValueType::Derivative, Lazy(*Cfg));
991991
INIT_COUNTER_WITH_NAME(actionAndCredentialCounters, AuthorizeError[credentialType], "PermissionDenied", ELifetime::Persistent, EValueType::Derivative, Lazy(*Cfg));
@@ -1017,11 +1017,11 @@ void TMonitoringCounters::InitCounters() {
10171017
INIT_COUNTER(MonitoringCounters, CleanupRemovedQueuesDone, ELifetime::Persistent, EValueType::Derivative, Lazy(Config));
10181018
INIT_COUNTER(MonitoringCounters, CleanupRemovedQueuesRows, ELifetime::Persistent, EValueType::Derivative, Lazy(Config));
10191019
INIT_COUNTER(MonitoringCounters, CleanupRemovedQueuesErrors, ELifetime::Persistent, EValueType::Derivative, Lazy(Config));
1020-
1021-
1020+
1021+
10221022
INIT_COUNTER(MonitoringCounters, LocalLeaderStartInflight, ELifetime::Persistent, EValueType::Derivative, Lazy(Config));
10231023
INIT_COUNTER(MonitoringCounters, LocalLeaderStartQueue, ELifetime::Persistent, EValueType::Derivative, Lazy(Config));
1024-
1024+
10251025
INIT_HISTOGRAM_COUNTER(MonitoringCounters, LocalLeaderStartAwaitMs, ELifetime::Expiring, DurationBucketsMs, ELaziness::OnDemand);
10261026
}
10271027

ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def check_counter(labels, expected):
357357
)
358358

359359
def check_total_count(expected):
360-
return check_counter({"sensor": "queue.total_count"}, expected)
360+
return check_counter({"name": "queue.total_count"}, expected)
361361

362362
def check_messages_sent(q_name, expected):
363363
return check_counter({"name": "queue.messages.sent_count_per_second", "queue": q_name}, expected)

0 commit comments

Comments
 (0)