KAFKA-17749: Fix Throttler metrics name

Reviewers: Colin P. McCabe <[email protected]>
apache · Oct 10, 2024 · 44f15cc · 44f15cc
1 parent 4878174
commit 44f15cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/upgrade.html b/docs/upgrade.html
@@ -41,6 +41,9 @@ <h5><a id="upgrade_390_notable" href="#upgrade_390_notable">Notable changes in 3
                     See <a href="https://cwiki.apache.org/confluence/display/KAFKA/KIP-956+Tiered+Storage+Quotas">KIP-956</a> for more details.</li>
             </ul>
         </li>
+        <li>In 3.8.0 the <code>kafka.utils.Thottler</code> metric was accidentally renamed to <code>org.apache.kafka.storage.internals.utils.Throttler</code>.
+            This change has been reverted and the metric is now named <code>kafka.utils.Thottler</code> again.
+        </li>
     </ul>
 
 <h4><a id="upgrade_3_8_0" href="#upgrade_3_8_0">Upgrading to 3.8.0 from any version 0.8.x through 3.7.x</a></h4>

diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/utils/Throttler.java b/storage/src/main/java/org/apache/kafka/storage/internals/utils/Throttler.java
@@ -62,7 +62,8 @@ public Throttler(double desiredRatePerSec,
                      Time time) {
         this.desiredRatePerSec = desiredRatePerSec;
         this.checkIntervalNs = TimeUnit.MILLISECONDS.toNanos(checkIntervalMs);
-        this.meter = new KafkaMetricsGroup(Throttler.class).newMeter(metricName, units, TimeUnit.SECONDS);
+        // For compatibility - this metrics group was previously defined within a Scala class named `kafka.utils.Throttler`
+        this.meter = new KafkaMetricsGroup("kafka.utils", "Throttler").newMeter(metricName, units, TimeUnit.SECONDS);
         this.time = time;
         this.periodStartNs = time.nanoseconds();
     }