From 146837fe73b8e3e1542e9af3a2e94366956a6c57 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 22 Jul 2025 11:11:39 -0700 Subject: [PATCH] Fix swapped storage metrics names --- src/storage/Backend.cc | 10 +++++----- .../scripts.base.frameworks.storage.redis-async/out | 4 ++-- .../out | 4 ++-- .../scripts.base.frameworks.storage.redis-sync/out | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/storage/Backend.cc b/src/storage/Backend.cc index 8545f0e8c0..01d1a4ef64 100644 --- a/src/storage/Backend.cc +++ b/src/storage/Backend.cc @@ -260,12 +260,12 @@ void Backend::InitMetrics() { erase_metrics = std::make_unique(results_family, latency_family, "erase", Tag(), metrics_config); - bytes_read_metric = telemetry_mgr->CounterInstance("zeek", "storage_backend_data_written", - {{"type", Tag()}, {"config", metrics_config}}, - "Storage data written to backend", "bytes"); - bytes_written_metric = telemetry_mgr->CounterInstance("zeek", "storage_backend_data_read", + bytes_written_metric = telemetry_mgr->CounterInstance("zeek", "storage_backend_data_written", {{"type", Tag()}, {"config", metrics_config}}, - "Storage data read from backend", "bytes"); + "Storage data written to backend", "bytes"); + bytes_read_metric = telemetry_mgr->CounterInstance("zeek", "storage_backend_data_read", + {{"type", Tag()}, {"config", metrics_config}}, + "Storage data read from backend", "bytes"); expired_entries_metric = telemetry_mgr->CounterInstance("zeek", "storage_backend_expired_entries", {{"type", Tag()}, {"config", metrics_config}}, diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-async/out b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-async/out index be7bf2fe10..8cdc11afa6 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-async/out +++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-async/out @@ -6,7 +6,7 @@ get result same as inserted, T Post-operation metrics: Telemetry::COUNTER, zeek, zeek_storage_backends_opened_total, [], [], 1.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 34.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 18.0 Telemetry::COUNTER, zeek, zeek_storage_backend_expired_entries_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, error, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, fail, Storage::STORAGE_BACKEND_REDIS], 0.0 @@ -20,6 +20,6 @@ Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, fail, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, success, Storage::STORAGE_BACKEND_REDIS], 1.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, timeout, Storage::STORAGE_BACKEND_REDIS], 0.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 18.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 34.0 close result, [code=Storage::SUCCESS, error_str=, value=] diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-forced-sync/out b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-forced-sync/out index 96d4a9da72..f7e1d5d496 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-forced-sync/out +++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-forced-sync/out @@ -9,7 +9,7 @@ outer open done Post-operation metrics: Telemetry::COUNTER, zeek, zeek_storage_backends_opened_total, [], [], 1.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 34.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 18.0 Telemetry::COUNTER, zeek, zeek_storage_backend_expired_entries_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, error, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, fail, Storage::STORAGE_BACKEND_REDIS], 0.0 @@ -23,6 +23,6 @@ Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, fail, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, success, Storage::STORAGE_BACKEND_REDIS], 1.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, timeout, Storage::STORAGE_BACKEND_REDIS], 0.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 18.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 34.0 close result, [code=Storage::SUCCESS, error_str=, value=] diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out index bf33393768..970967a8bc 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out +++ b/testing/btest/Baseline/scripts.base.frameworks.storage.redis-sync/out @@ -14,7 +14,7 @@ Storage::backend_opened, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::ST Post-operation metrics: Telemetry::COUNTER, zeek, zeek_storage_backends_opened_total, [], [], 1.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 102.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_read_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 54.0 Telemetry::COUNTER, zeek, zeek_storage_backend_expired_entries_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, error, Storage::STORAGE_BACKEND_REDIS], 0.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, erase, fail, Storage::STORAGE_BACKEND_REDIS], 0.0 @@ -28,6 +28,6 @@ Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, fail, Storage::STORAGE_BACKEND_REDIS], 1.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, success, Storage::STORAGE_BACKEND_REDIS], 2.0 Telemetry::COUNTER, zeek, zeek_storage_backend_operation_results_total, [config, operation, result, type], [server_addr-testing, put, timeout, Storage::STORAGE_BACKEND_REDIS], 0.0 -Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 54.0 +Telemetry::COUNTER, zeek, zeek_storage_backend_data_written_bytes_total, [config, type], [server_addr-testing, Storage::STORAGE_BACKEND_REDIS], 102.0 Storage::backend_lost, Storage::STORAGE_BACKEND_REDIS, [serializer=Storage::STORAGE_SERIALIZER_JSON, forced_sync=F, redis=[server_host=127.0.0.1, server_port=XXXX/tcp, server_unix_socket=, key_prefix=testing, connect_timeout=5.0 secs, operation_timeout=5.0 secs, username=, password=]], Client disconnected