From 44e6d51ab29704f4427bafe70a3f4c4c3b2bb92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D0=B0=D1=80=D0=B0=D1=81=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B5=D0=B2=D0=B8=D1=87?=
 <denis.tarasenko@sbermarket.ru>
Date: Mon, 17 Jun 2024 11:08:18 +0000
Subject: [PATCH] [DEX-2306] feat: fix metrics

---
 CHANGELOG.md                                                | 6 ++++++
 .../instrumentation/yabeda_metrics_listener.rb              | 4 ++--
 lib/sbmt/kafka_producer/version.rb                          | 2 +-
 .../instrumentation/yabeda_metrics_listener_spec.rb         | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7432a71..be962fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.2.2] - 2024-06-15
+
+### Fixed
+
+- Fixed display of metrics `kafka_api_calls`  and `kafka_api_errors`
+
 ## [2.2.1] - 2024-06-07
 
 ### Changed
diff --git a/lib/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener.rb b/lib/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener.rb
index 52cf1fa..ebc799d 100644
--- a/lib/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener.rb
+++ b/lib/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener.rb
@@ -71,7 +71,7 @@ def report_broker_stats(brokers)
             }
 
             Yabeda.kafka_api.calls
-              .increment(broker_tags, by: broker_statistics["tx"])
+              .increment(broker_tags, by: broker_statistics["tx_d"])
             Yabeda.kafka_api.latency
               .measure(broker_tags, broker_statistics["rtt"]["avg"])
             Yabeda.kafka_api.request_size
@@ -79,7 +79,7 @@ def report_broker_stats(brokers)
             Yabeda.kafka_api.response_size
               .measure(broker_tags, broker_statistics["rxbytes"])
             Yabeda.kafka_api.errors
-              .increment(broker_tags, by: broker_statistics["txerrs"] + broker_statistics["rxerrs"])
+              .increment(broker_tags, by: broker_statistics["txerrs_d"] + broker_statistics["rxerrs_d"])
           end
         end
       end
diff --git a/lib/sbmt/kafka_producer/version.rb b/lib/sbmt/kafka_producer/version.rb
index 6191b07..fc73253 100644
--- a/lib/sbmt/kafka_producer/version.rb
+++ b/lib/sbmt/kafka_producer/version.rb
@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaProducer
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end
diff --git a/spec/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener_spec.rb b/spec/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener_spec.rb
index ce16e70..660971c 100644
--- a/spec/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener_spec.rb
+++ b/spec/sbmt/kafka_producer/instrumentation/yabeda_metrics_listener_spec.rb
@@ -12,12 +12,12 @@
             "name" => "kafka:9092/1001",
             "nodeid" => 1001,
             "nodename" => "kafka:9092",
-            "tx" => 7,
+            "tx_d" => 7,
             "txbytes" => 338,
-            "txerrs" => 0,
+            "txerrs_d" => 0,
             "rx" => 7,
             "rxbytes" => 827,
-            "rxerrs" => 0,
+            "rxerrs_d" => 0,
             "rtt" => {
               "avg" => 1984
             }