This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new a530ab230bd [cherry-pick][branch-2.10]wrong metrics text generated
when label_cluster specified (#17704) (#18919)
a530ab230bd is described below
commit a530ab230bd1b6fdb9d42e2216fa73f217a8782d
Author: Xiangying Meng <[email protected]>
AuthorDate: Thu Dec 15 09:16:32 2022 +0800
[cherry-pick][branch-2.10]wrong metrics text generated when label_cluster
specified (#17704) (#18919)
Co-authored-by: fengyubiao <[email protected]>
---
.../PrometheusMetricsGeneratorUtils.java | 13 ++-
.../PrometheusMetricsGeneratorUtilsTest.java | 105 +++++++++++++++++++++
.../broker/stats/prometheus/package-info.java | 19 ++++
3 files changed, 134 insertions(+), 3 deletions(-)
diff --git
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java
index dfa5fb720c1..4bf741c0f94 100644
---
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java
+++
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtils.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.List;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
import org.apache.pulsar.common.util.SimpleTextOutputStream;
@@ -65,16 +66,22 @@ public class PrometheusMetricsGeneratorUtils {
for (int i = 0; i < metricFamily.samples.size(); i++) {
Collector.MetricFamilySamples.Sample sample =
metricFamily.samples.get(i);
stream.write(sample.name);
+ stream.write("{");
if (!sample.labelNames.contains("cluster")) {
- stream.write("{cluster=\"").write(cluster).write('"');
+ stream.write("cluster=\"").write(cluster).write('"');
+ // If label is empty, should not append ','.
+ if (!CollectionUtils.isEmpty(sample.labelNames)){
+ stream.write(",");
+ }
}
for (int j = 0; j < sample.labelNames.size(); j++) {
String labelValue = sample.labelValues.get(j);
if (labelValue != null) {
labelValue = labelValue.replace("\"", "\\\"");
}
-
- stream.write(",");
+ if (j > 0) {
+ stream.write(",");
+ }
stream.write(sample.labelNames.get(j));
stream.write("=\"");
stream.write(labelValue);
diff --git
a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java
b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java
new file mode 100644
index 00000000000..b84636dc72a
--- /dev/null
+++
b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGeneratorUtilsTest.java
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.stats.prometheus;
+
+import static org.testng.Assert.*;
+import io.prometheus.client.CollectorRegistry;
+import io.prometheus.client.Counter;
+import java.io.ByteArrayOutputStream;
+import java.util.Collections;
+import java.util.UUID;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker")
+public class PrometheusMetricsGeneratorUtilsTest {
+
+ private static final String LABEL_NAME_CLUSTER = "cluster";
+
+ @Test
+ public void testGenerateSystemMetricsWithSpecifyCluster() throws Exception
{
+ String defaultClusterValue = "cluster_test";
+ String specifyClusterValue = "lb_x";
+ String metricsName = "label_contains_cluster" + randomString();
+ Counter counter = new Counter.Builder()
+ .name(metricsName)
+ .labelNames(LABEL_NAME_CLUSTER)
+ .help("x")
+ .register(CollectorRegistry.defaultRegistry);
+ counter.labels(specifyClusterValue).inc();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrometheusMetricsGeneratorUtils.generate(defaultClusterValue, out,
Collections.emptyList());
+ System.out.println(("metrics 1 :" + out.toString()));
+ assertTrue(out.toString().contains(
+ String.format("%s{cluster=\"%s\"} 1.0", metricsName,
specifyClusterValue)
+ ));
+ // cleanup
+ out.close();
+ CollectorRegistry.defaultRegistry.unregister(counter);
+ }
+
+ @Test
+ public void testGenerateSystemMetricsWithDefaultCluster() throws Exception
{
+ String defaultClusterValue = "cluster_test";
+ String labelName = "lb_name";
+ String labelValue = "lb_value";
+ // default cluster.
+ String metricsName = "label_use_default_cluster" + randomString();
+ Counter counter = new Counter.Builder()
+ .name(metricsName)
+ .labelNames(labelName)
+ .help("x")
+ .register(CollectorRegistry.defaultRegistry);
+ counter.labels(labelValue).inc();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrometheusMetricsGeneratorUtils.generate(defaultClusterValue, out,
Collections.emptyList());
+ System.out.println(("metrics 1 :" + out.toString()));
+ assertTrue(out.toString().contains(
+ String.format("%s{cluster=\"%s\",%s=\"%s\"} 1.0",
+ metricsName, defaultClusterValue, labelName,
labelValue)
+ ));
+ // cleanup
+ out.close();
+ CollectorRegistry.defaultRegistry.unregister(counter);
+ }
+
+ @Test
+ public void testGenerateSystemMetricsWithoutCustomizedLabel() throws
Exception {
+ String defaultClusterValue = "cluster_test";
+ // default cluster.
+ String metricsName = "label_without_customized_label" + randomString();
+ Counter counter = new Counter.Builder()
+ .name(metricsName)
+ .help("x")
+ .register(CollectorRegistry.defaultRegistry);
+ counter.inc();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrometheusMetricsGeneratorUtils.generate(defaultClusterValue, out,
Collections.emptyList());
+ System.out.println(("metrics 1 :" + out.toString()));
+ assertTrue(out.toString().contains(
+ String.format("%s{cluster=\"%s\"} 1.0", metricsName,
defaultClusterValue)
+ ));
+ // cleanup
+ out.close();
+ CollectorRegistry.defaultRegistry.unregister(counter);
+ }
+
+ private static String randomString(){
+ return UUID.randomUUID().toString().replaceAll("-", "");
+ }
+}
diff --git
a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java
b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java
new file mode 100644
index 00000000000..3723fb4ff5c
--- /dev/null
+++
b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/stats/prometheus/package-info.java
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.stats.prometheus;
