[HUDI-2213] Remove unnecessary parameter for HoodieMetrics constructor and fix NPE in UT (#3333)

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/AbstractHoodieWriteClient.java

@@ -130,7 +130,7 @@ public abstract class AbstractHoodieWriteClient<T extends HoodieRecordPayload, I
   public AbstractHoodieWriteClient(HoodieEngineContext context, HoodieWriteConfig writeConfig,
                                    Option<EmbeddedTimelineService> timelineService) {
     super(context, writeConfig, timelineService);
-    this.metrics = new HoodieMetrics(config, config.getTableName());
+    this.metrics = new HoodieMetrics(config);
     this.index = createIndex(writeConfig);
     this.txnManager = new TransactionManager(config, fs);
   }

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java

@@ -54,9 +54,9 @@ public class HoodieMetrics {
   private Timer clusteringTimer = null;
   private Timer indexTimer = null;
 
-  public HoodieMetrics(HoodieWriteConfig config, String tableName) {
+  public HoodieMetrics(HoodieWriteConfig config) {
     this.config = config;
-    this.tableName = tableName;
+    this.tableName = config.getTableName();
     if (config.isMetricsOn()) {
       Metrics.init(config);
       this.rollbackTimerName = getMetricsName("timer", HoodieTimeline.ROLLBACK_ACTION);

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java

@@ -53,9 +53,7 @@ public class Metrics {
     }
     reporter.start();
 
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+    Runtime.getRuntime().addShutdownHook(new Thread(this::reportAndCloseReporter));
-      reportAndCloseReporter();
-    }));
   }
 
   private void reportAndCloseReporter() {

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/MetricsReporterFactory.java

@@ -41,20 +41,20 @@ public class MetricsReporterFactory {
   private static final Logger LOG = LogManager.getLogger(MetricsReporterFactory.class);
 
   public static MetricsReporter createReporter(HoodieWriteConfig config, MetricRegistry registry) {
-    MetricsReporterType type = config.getMetricsReporterType();
+    String reporterClassName = config.getMetricReporterClassName();
-    MetricsReporter reporter = null;
 
-    if (!StringUtils.isNullOrEmpty(config.getMetricReporterClassName())) {
+    if (!StringUtils.isNullOrEmpty(reporterClassName)) {
-      Object instance = ReflectionUtils
+      Object instance = ReflectionUtils.loadClass(
-              .loadClass(config.getMetricReporterClassName(),
+          reporterClassName, new Class<?>[] {Properties.class, MetricRegistry.class}, config.getProps(), registry);
-                      new Class<?>[] {Properties.class, MetricRegistry.class}, config.getProps(), registry);
       if (!(instance instanceof AbstractUserDefinedMetricsReporter)) {
         throw new HoodieException(config.getMetricReporterClassName()
-                + " is not a subclass of AbstractUserDefinedMetricsReporter");
+            + " is not a subclass of AbstractUserDefinedMetricsReporter");
       }
       return (MetricsReporter) instance;
     }
 
+    MetricsReporterType type = config.getMetricsReporterType();
+    MetricsReporter reporter = null;
     switch (type) {
       case GRAPHITE:
         reporter = new MetricsGraphiteReporter(config, registry);

hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metrics/TestHoodieConsoleMetrics.java

@@ -41,7 +41,7 @@ public class TestHoodieConsoleMetrics {
     when(config.getTableName()).thenReturn("console_metrics_test");
     when(config.isMetricsOn()).thenReturn(true);
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.CONSOLE);
-    new HoodieMetrics(config, "raw_table");
+    new HoodieMetrics(config);
   }
 
   @AfterEach

hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metrics/TestHoodieJmxMetrics.java

@@ -52,7 +52,7 @@ public class TestHoodieJmxMetrics {
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.JMX);
     when(config.getJmxHost()).thenReturn("localhost");
     when(config.getJmxPort()).thenReturn(String.valueOf(NetworkTestUtils.nextFreePort()));
-    new HoodieMetrics(config, "raw_table");
+    new HoodieMetrics(config);
     registerGauge("jmx_metric1", 123L);
     assertEquals("123", Metrics.getInstance().getRegistry().getGauges()
         .get("jmx_metric1").getValue().toString());
@@ -65,7 +65,7 @@ public class TestHoodieJmxMetrics {
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.JMX);
     when(config.getJmxHost()).thenReturn("localhost");
     when(config.getJmxPort()).thenReturn(String.valueOf(NetworkTestUtils.nextFreePort()));
-    new HoodieMetrics(config, "raw_table");
+    new HoodieMetrics(config);
     registerGauge("jmx_metric2", 123L);
     assertEquals("123", Metrics.getInstance().getRegistry().getGauges()
         .get("jmx_metric2").getValue().toString());

hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metrics/TestHoodieMetrics.java

@@ -50,8 +50,9 @@ public class TestHoodieMetrics {
   @BeforeEach
   void setUp() {
     when(config.isMetricsOn()).thenReturn(true);
+    when(config.getTableName()).thenReturn("raw_table");
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.INMEMORY);
-    metrics = new HoodieMetrics(config, "raw_table");
+    metrics = new HoodieMetrics(config);
   }
 
   @AfterEach

hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metrics/prometheus/TestPrometheusReporter.java

@@ -46,10 +46,11 @@ public class TestPrometheusReporter {
   @Test
   public void testRegisterGauge() {
     when(config.isMetricsOn()).thenReturn(true);
+    when(config.getTableName()).thenReturn("foo");
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.PROMETHEUS);
     when(config.getPrometheusPort()).thenReturn(9090);
     assertDoesNotThrow(() -> {
-      new HoodieMetrics(config, "raw_table");
+      new HoodieMetrics(config);
     });
   }
 }

hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metrics/prometheus/TestPushGateWayReporter.java

@@ -48,6 +48,7 @@ public class TestPushGateWayReporter {
   @Test
   public void testRegisterGauge() {
     when(config.isMetricsOn()).thenReturn(true);
+    when(config.getTableName()).thenReturn("foo");
     when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.PROMETHEUS_PUSHGATEWAY);
     when(config.getPushGatewayHost()).thenReturn("localhost");
     when(config.getPushGatewayPort()).thenReturn(9091);
@@ -57,7 +58,7 @@ public class TestPushGateWayReporter {
     when(config.getPushGatewayRandomJobNameSuffix()).thenReturn(false);
 
     assertDoesNotThrow(() -> {
-      new HoodieMetrics(config, "raw_table");
+      new HoodieMetrics(config);
     });
 
     registerGauge("pushGateWayReporter_metric", 123L);