Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@ public static void printTopicStats(PrometheusMetricStreams stream, TopicStats st
splitTopicAndPartitionIndexLabel);
writeMetric(stream, "pulsar_in_messages_total", stats.msgInCounter, cluster, namespace, topic,
splitTopicAndPartitionIndexLabel);
writeMetric(stream, "pulsar_out_bytes_total", stats.bytesOutCounter, cluster, namespace, topic,
splitTopicAndPartitionIndexLabel);
writeMetric(stream, "pulsar_out_messages_total", stats.msgOutCounter, cluster, namespace, topic,
splitTopicAndPartitionIndexLabel);

// Compaction
boolean hasCompaction = compactorMXBean.flatMap(mxBean -> mxBean.getCompactionRecordForTopic(topic))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,17 @@ public void testPerTopicStats() throws Exception {
.subscriptionName("test")
.subscribe();

Consumer<byte[]> c2 = pulsarClient.newConsumer()
Consumer<byte[]> c2a = pulsarClient.newConsumer()
.topic("persistent://my-property/use/my-ns/my-topic2")
.subscriptionName("test")
.subscriptionName("test2a")
.subscribe();

final int messages = 10;
Consumer<byte[]> c2b = pulsarClient.newConsumer()
.topic("persistent://my-property/use/my-ns/my-topic2")
.subscriptionName("test2b")
.subscribe();

final int messages = 5;

for (int i = 0; i < messages; i++) {
String message = "my-message-" + i;
Expand All @@ -283,7 +288,8 @@ public void testPerTopicStats() throws Exception {

for (int i = 0; i < messages; i++) {
c1.acknowledge(c1.receive());
c2.acknowledge(c2.receive());
c2a.acknowledge(c2a.receive());
c2b.acknowledge(c2b.receive());
}

ByteArrayOutputStream statsOut = new ByteArrayOutputStream();
Expand Down Expand Up @@ -329,27 +335,46 @@ public void testPerTopicStats() throws Exception {
assertEquals(cm.get(1).tags.get("namespace"), "my-property/use/my-ns");

cm = (List<Metric>) metrics.get("pulsar_out_bytes_total");
assertEquals(cm.size(), 2);
assertEquals(cm.size(), 5);
assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(0).tags.get("subscription"), "test");
assertEquals(cm.get(1).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(0).tags.get("subscription"), "test2b");
assertEquals(cm.get(1).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(1).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(1).tags.get("subscription"), "test");
assertEquals(cm.get(1).tags.get("subscription"), "test2a");
assertEquals(cm.get(2).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(2).tags.get("namespace"), "my-property/use/my-ns");
assertNull(cm.get(2).tags.get("subscription"));
assertEquals(cm.get(3).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(3).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(3).tags.get("subscription"), "test");
assertEquals(cm.get(4).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(4).tags.get("namespace"), "my-property/use/my-ns");

cm = (List<Metric>) metrics.get("pulsar_out_messages_total");
assertEquals(cm.size(), 2);
assertEquals(cm.size(), 5);
assertEquals(cm.get(0).value, 5);
assertEquals(cm.get(0).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(0).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(0).tags.get("subscription"), "test");
assertEquals(cm.get(1).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(0).tags.get("subscription"), "test2b");
assertEquals(cm.get(1).value, 5);
assertEquals(cm.get(1).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(1).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(1).tags.get("subscription"), "test");
assertEquals(cm.get(1).tags.get("subscription"), "test2a");
assertEquals(cm.get(2).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic2");
assertEquals(cm.get(2).tags.get("namespace"), "my-property/use/my-ns");
assertNull(cm.get(2).tags.get("subscription"));
assertEquals(cm.get(3).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(3).tags.get("namespace"), "my-property/use/my-ns");
assertEquals(cm.get(3).tags.get("subscription"), "test");
assertEquals(cm.get(4).tags.get("topic"), "persistent://my-property/use/my-ns/my-topic1");
assertEquals(cm.get(4).tags.get("namespace"), "my-property/use/my-ns");

p1.close();
p2.close();
c1.close();
c2.close();
c2a.close();
c2b.close();
}

@Test
Expand Down
Loading