You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2022/08/16 09:18:34 UTC
[inlong] branch master updated: [INLONG-5567][TubeMQ] Master start failed with NullPointerException (#5569)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new d610dbc45 [INLONG-5567][TubeMQ] Master start failed with NullPointerException (#5569)
d610dbc45 is described below
commit d610dbc45ee2480c176cd9fb41e61577eb1150dc
Author: Goson Zhang <46...@qq.com>
AuthorDate: Tue Aug 16 17:18:29 2022 +0800
[INLONG-5567][TubeMQ] Master start failed with NullPointerException (#5569)
---
.../server/broker/stats/prometheus/BrokerPromMetricService.java | 6 +++---
.../server/master/stats/prometheus/MasterPromMetricService.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/stats/prometheus/BrokerPromMetricService.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/stats/prometheus/BrokerPromMetricService.java
index 59274a20c..96a711611 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/stats/prometheus/BrokerPromMetricService.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/stats/prometheus/BrokerPromMetricService.java
@@ -65,13 +65,13 @@ public class BrokerPromMetricService extends Collector {
@Override
public List<MetricFamilySamples> collect() {
+ final List<MetricFamilySamples> mfs = new ArrayList<>();
if (!started) {
- return null;
+ return mfs;
}
- final List<MetricFamilySamples> mfs = new ArrayList<>();
- StringBuilder strBuff = new StringBuilder(512);
// service status metric data
Map<String, Long> statsMap = new LinkedHashMap<>();
+ StringBuilder strBuff = new StringBuilder(512);
CounterMetricFamily srvStatusCounter =
new CounterMetricFamily(strBuff.append(promConfig.getPromClusterName())
.append("&group=serviceStatus").toString(),
diff --git a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/stats/prometheus/MasterPromMetricService.java b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/stats/prometheus/MasterPromMetricService.java
index 5b2437d9c..531f3546a 100644
--- a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/stats/prometheus/MasterPromMetricService.java
+++ b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/stats/prometheus/MasterPromMetricService.java
@@ -59,13 +59,13 @@ public class MasterPromMetricService extends Collector {
@Override
public List<MetricFamilySamples> collect() {
+ final List<MetricFamilySamples> mfs = new ArrayList<>();
if (!started) {
- return null;
+ return mfs;
}
- final List<MetricFamilySamples> mfs = new ArrayList<>();
- StringBuilder strBuff = new StringBuilder(512);
// service status metric data
Map<String, Long> statsMap = new LinkedHashMap<>();
+ StringBuilder strBuff = new StringBuilder(512);
CounterMetricFamily srvStatusCounter =
new CounterMetricFamily(strBuff.append(promConfig.getPromClusterName())
.append("&group=serviceStatus").toString(),