From ddf4fca0ee9373ec7b20560d95be8d8d120c5346 Mon Sep 17 00:00:00 2001 From: "bakhtiyar.issakhmetov" Date: Fri, 19 Sep 2025 16:25:18 +0500 Subject: [PATCH 1/4] chore: Improve asserting error message --- src/Storage/RedisStorage/HistogramRedisStorage.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Storage/RedisStorage/HistogramRedisStorage.php b/src/Storage/RedisStorage/HistogramRedisStorage.php index 28d197e..5aa2151 100644 --- a/src/Storage/RedisStorage/HistogramRedisStorage.php +++ b/src/Storage/RedisStorage/HistogramRedisStorage.php @@ -111,7 +111,14 @@ public function fetchHistograms(): iterable ); } - Assert::notEmpty($bucketsWithValues); + Assert::notEmpty( + $bucketsWithValues, + sprintf( + 'Buckets with values is empty for [%s] metric with [%s] labels', + $keyWithLabels->metricName, + implode(', ', $keyWithLabels->labels) + ) + ); $bucketsWithValues = array_map('floatval', $bucketsWithValues); yield new HistogramMetricValue( From 3f0ada93642943c0bbba588f975e825e013b0587 Mon Sep 17 00:00:00 2001 From: "bakhtiyar.issakhmetov" Date: Fri, 19 Sep 2025 16:33:35 +0500 Subject: [PATCH 2/4] chore: Improve asserting error message --- src/Storage/RedisStorage/HistogramRedisStorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/RedisStorage/HistogramRedisStorage.php b/src/Storage/RedisStorage/HistogramRedisStorage.php index 5aa2151..12d6cba 100644 --- a/src/Storage/RedisStorage/HistogramRedisStorage.php +++ b/src/Storage/RedisStorage/HistogramRedisStorage.php @@ -116,7 +116,7 @@ public function fetchHistograms(): iterable sprintf( 'Buckets with values is empty for [%s] metric with [%s] labels', $keyWithLabels->metricName, - implode(', ', $keyWithLabels->labels) + json_encode($keyWithLabels->labels) ) ); $bucketsWithValues = array_map('floatval', $bucketsWithValues); From f4c44937133b6b5889cd90ced74cea0d9cff9938 Mon Sep 17 00:00:00 2001 From: "bakhtiyar.issakhmetov" Date: Fri, 19 Sep 2025 16:35:16 +0500 Subject: [PATCH 3/4] chore: Typo --- src/Storage/RedisStorage/HistogramRedisStorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/RedisStorage/HistogramRedisStorage.php b/src/Storage/RedisStorage/HistogramRedisStorage.php index 12d6cba..da8ba36 100644 --- a/src/Storage/RedisStorage/HistogramRedisStorage.php +++ b/src/Storage/RedisStorage/HistogramRedisStorage.php @@ -114,7 +114,7 @@ public function fetchHistograms(): iterable Assert::notEmpty( $bucketsWithValues, sprintf( - 'Buckets with values is empty for [%s] metric with [%s] labels', + 'Buckets with values are empty for [%s] metric with [%s] labels', $keyWithLabels->metricName, json_encode($keyWithLabels->labels) ) From ffb56dd5a943c00d983ee23490ce8edf391e1c82 Mon Sep 17 00:00:00 2001 From: "bakhtiyar.issakhmetov" Date: Fri, 19 Sep 2025 16:47:04 +0500 Subject: [PATCH 4/4] fix: Change message labels serializing --- src/Storage/RedisStorage/HistogramRedisStorage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Storage/RedisStorage/HistogramRedisStorage.php b/src/Storage/RedisStorage/HistogramRedisStorage.php index da8ba36..a7371c8 100644 --- a/src/Storage/RedisStorage/HistogramRedisStorage.php +++ b/src/Storage/RedisStorage/HistogramRedisStorage.php @@ -114,9 +114,9 @@ public function fetchHistograms(): iterable Assert::notEmpty( $bucketsWithValues, sprintf( - 'Buckets with values are empty for [%s] metric with [%s] labels', + 'Buckets with values are empty for [%s] metric with key [%s]', $keyWithLabels->metricName, - json_encode($keyWithLabels->labels) + $this->metricKeySerializer->serialize($keyWithLabels), ) ); $bucketsWithValues = array_map('floatval', $bucketsWithValues);