[rocketmq] branch develop updated: [ISSUE #5511]Fix Proxy start up throw NullPointerException (#5514)

[lizhanhui]

This is an automated email from the ASF dual-hosted git repository.

lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 14cff19f1 [ISSUE #5511]Fix Proxy start up throw NullPointerException 
(#5514)
14cff19f1 is described below

commit 14cff19f1515b8d8d71aa5db4d54599d59f0df6c
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Mon Nov 14 17:38:07 2022 +0800

    [ISSUE #5511]Fix Proxy start up throw NullPointerException (#5514)
    
    * [ISSUE #5511]Fix Proxy start up throw NullPointerException
    
    * do not init exporter when disable
    
    do not init exporter when disable
    
    * remove unused import
    
    remove unused import
    
    Co-authored-by: lizhimins <707364...@qq.com>
---
 .../java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java  | 1 +
 proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java        | 2 +-
 .../java/org/apache/rocketmq/proxy/metrics/ProxyMetricsManager.java    | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
index 1ccfde165..15ef11045 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
@@ -516,4 +516,5 @@ public class BrokerMetricsManager {
             prometheusHttpServer.shutdown();
         }
     }
+
 }
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java 
b/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java
index c5222a004..8c96cdc9d 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java
@@ -134,7 +134,7 @@ public class ProxyStartup {
     }
 
     private static Options buildCommandlineOptions() {
-        Options options =  ServerUtil.buildCommandlineOptions(new Options());
+        Options options = ServerUtil.buildCommandlineOptions(new Options());
 
         Option opt = new Option("bc", "brokerConfigPath", true, "Broker config 
file path for local mode");
         opt.setRequired(false);
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/metrics/ProxyMetricsManager.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/metrics/ProxyMetricsManager.java
index 3d27220a2..ae014adc2 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/metrics/ProxyMetricsManager.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/metrics/ProxyMetricsManager.java
@@ -69,6 +69,9 @@ public class ProxyMetricsManager implements StartAndShutdown {
     public static ObservableLongGauge proxyUp = null;
 
     public static void initLocalMode(BrokerMetricsManager 
brokerMetricsManager, ProxyConfig proxyConfig) {
+        if (proxyConfig.getMetricsExporterType() == 
BrokerConfig.MetricsExporterType.DISABLE) {
+            return;
+        }
         ProxyMetricsManager.proxyConfig = proxyConfig;
         LABEL_MAP.put(LABEL_NODE_TYPE, NODE_TYPE_PROXY);
         LABEL_MAP.put(LABEL_CLUSTER_NAME, proxyConfig.getProxyClusterName());