This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 7674a8f Removing # TYPE comment from topic metrics in Prometheus
(#4136)
7674a8f is described below
commit 7674a8f16379f757dcded66b1ce3665ad57f65bd
Author: Matteo Merli <[email protected]>
AuthorDate: Fri Apr 26 09:07:47 2019 -0700
Removing # TYPE comment from topic metrics in Prometheus (#4136)
---
.../broker/stats/prometheus/NamespaceStatsAggregator.java | 4 ----
.../org/apache/pulsar/broker/stats/prometheus/TopicStats.java | 10 ----------
2 files changed, 14 deletions(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
index 2e7836b..91ceadf 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
@@ -248,7 +248,6 @@ public class NamespaceStatsAggregator {
private static void metric(SimpleTextOutputStream stream, String cluster,
String name,
long value) {
- TopicStats.metricType(stream, name);
stream.write(name)
.write("{cluster=\"").write(cluster).write("\"} ")
.write(value).write(' ').write(System.currentTimeMillis())
@@ -257,21 +256,18 @@ public class NamespaceStatsAggregator {
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String name,
long value) {
- TopicStats.metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
}
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String name,
double value) {
- TopicStats.metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
}
private static void metricWithRemoteCluster(SimpleTextOutputStream stream,
String cluster, String namespace,
String name, String
remoteCluster, double value) {
- TopicStats.metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace);
stream.write("\",remote_cluster=\"").write(remoteCluster).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
index 3549820..6658023 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
@@ -144,13 +144,8 @@ class TopicStats {
}
}
- static void metricType(SimpleTextOutputStream stream, String name) {
- stream.write("# TYPE ").write(name).write(" gauge\n");
- }
-
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String topic,
String name, double value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace)
.write("\",topic=\"").write(topic).write("\"} ");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
@@ -158,7 +153,6 @@ class TopicStats {
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String topic, String subscription,
String name, long value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace)
.write("\",topic=\"").write(topic).write("\",subscription=\"").write(subscription).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
@@ -166,7 +160,6 @@ class TopicStats {
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String topic, String subscription,
String name, double value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace)
.write("\",topic=\"").write(topic).write("\",subscription=\"").write(subscription).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
@@ -174,7 +167,6 @@ class TopicStats {
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String topic, String subscription,
String consumerName, long consumerId, String
name, long value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",
namespace=\"").write(namespace)
.write("\",topic=\"").write(topic).write("\",subscription=\"").write(subscription)
.write("\",consumer_name=\"").write(consumerName).write("\",consumer_id=\"").write(consumerId).write("\"}
");
@@ -183,7 +175,6 @@ class TopicStats {
private static void metric(SimpleTextOutputStream stream, String cluster,
String namespace, String topic, String subscription,
String consumerName, long consumerId, String
name, double value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace)
.write("\",topic=\"").write(topic).write("\",subscription=\"").write(subscription)
.write("\",consumer_name=\"").write(consumerName).write("\",consumer_id=\"").write(consumerId).write("\"}
");
@@ -193,7 +184,6 @@ class TopicStats {
private static void metricWithRemoteCluster(SimpleTextOutputStream stream,
String cluster, String namespace,
String topic,
String name, String remoteCluster, double value) {
- metricType(stream, name);
stream.write(name).write("{cluster=\"").write(cluster).write("\",namespace=\"").write(namespace);
stream.write("\",topic=\"").write(topic).write("remote_cluster=\"").write(remoteCluster).write("\"}
");
stream.write(value).write('
').write(System.currentTimeMillis()).write('\n');
