From 97dfc6241187bd0bbc1bb2bd127a1fdd465fea88 Mon Sep 17 00:00:00 2001
From: Devaspati Krishnatri <devaspati.krishnatri@cloudera.com>
Date: Tue, 15 Jul 2025 18:01:24 +0530
Subject: [PATCH 1/2] HIVE-28236:Upgrade Dropwizard to 4.2.0

---
 pom.xml                                       | 22 ++++++++++++++++++-
 standalone-metastore/metastore-common/pom.xml |  4 ++++
 .../metrics/metrics2/JmxMetricsReporter.java  |  2 +-
 .../hive/metastore/metrics/Metrics.java       |  2 +-
 standalone-metastore/pom.xml                  |  7 +++++-
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b34da788fcac..daad14f4aef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
     <commons-dbcp2.version>2.12.0</commons-dbcp2.version>
     <commons-text.version>1.10.0</commons-text.version>
     <derby.version>10.14.2.0</derby.version>
-    <dropwizard.version>3.1.0</dropwizard.version>
+    <dropwizard.version>4.2.0</dropwizard.version>
     <dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
     <druid.version>0.17.1</druid.version>
     <esri.version>2.2.4</esri.version>
@@ -404,6 +404,26 @@
         <artifactId>commons-dbcp2</artifactId>
         <version>${commons-dbcp2.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-jmx</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-jvm</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-json</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math3</artifactId>
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index b94419674647..e8d228e8969a 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -100,6 +100,10 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-json</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jmx</artifactId>
+    </dependency>
     <dependency>
       <groupId>javolution</groupId>
       <artifactId>javolution</artifactId>
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/metrics/metrics2/JmxMetricsReporter.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/metrics/metrics2/JmxMetricsReporter.java
index 5bd55dc715a9..21c4a6c0a926 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/metrics/metrics2/JmxMetricsReporter.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/common/metrics/metrics2/JmxMetricsReporter.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hive.common.metrics.metrics2;
 
-import com.codahale.metrics.JmxReporter;
+import com.codahale.metrics.jmx.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
 import java.util.concurrent.TimeUnit;
 
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java
index 61732ed9ee61..f66d033fa09f 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metrics/Metrics.java
@@ -28,7 +28,7 @@
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.JmxReporter;
+import com.codahale.metrics.jmx.JmxReporter;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.MetricSet;
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 7cdd8f5b31f5..5211fa5bc2da 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -80,7 +80,7 @@
     <oracle.version>21.3.0.0</oracle.version>
     <dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2
     </dropwizard-metrics-hadoop-metrics2-reporter.version>
-    <dropwizard.version>3.1.0</dropwizard.version>
+    <dropwizard.version>4.2.0</dropwizard.version>
     <guava.version>22.0</guava.version>
     <hadoop.version>3.4.1</hadoop.version>
     <hikaricp.version>4.0.3</hikaricp.version>
@@ -177,6 +177,11 @@
         <artifactId>metrics-json</artifactId>
         <version>${dropwizard.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-jmx</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
       <dependency>
         <groupId>javolution</groupId>
         <artifactId>javolution</artifactId>

From f47d125bb5a437b4b5223b6c8d9dd09abb378a5f Mon Sep 17 00:00:00 2001
From: Devaspati Krishnatri <devaspati.krishnatri@cloudera.com>
Date: Wed, 16 Jul 2025 12:18:06 +0530
Subject: [PATCH 2/2] HIVE-28236:Upgrade Dropwizard to 4.2.0

---
 standalone-metastore/metastore-server/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index cd447a517461..5c62d8b07190 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -112,6 +112,10 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-json</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jmx</artifactId>
+    </dependency>
     <dependency>
       <groupId>javolution</groupId>
       <artifactId>javolution</artifactId>