Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix][broker] PIP-399: Fix Metric Name for Delayed Queue #23712

Merged
merged 2 commits into from
Jan 14, 2025
Merged

[fix][broker] PIP-399: Fix Metric Name for Delayed Queue #23712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93276eb
fix.
thetumbled Dec 11, 2024
068e088
fix test code.
thetumbled Jan 13, 2025
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
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public static void printTopicStats(PrometheusMetricStreams stream, TopicStats st
writeSubscriptionMetric(stream, "pulsar_subscription_filter_rescheduled_msg_count",
subsStats.filterRescheduledMsgCount, cluster, namespace, topic, sub,
splitTopicAndPartitionIndexLabel);
writeSubscriptionMetric(stream, "pulsar_delayed_message_index_size_bytes",
writeSubscriptionMetric(stream, "pulsar_subscription_delayed_message_index_size_bytes",
subsStats.delayedMessageIndexSizeInBytes, cluster, namespace, topic, sub,
splitTopicAndPartitionIndexLabel);

Expand Down
23 changes: 18 additions & 5 deletions ...broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,11 @@ public void testDelayedDeliveryTrackerMemoryUsageMetric(String topic, boolean ex

@Cleanup
Producer<String> producer = client.newProducer(Schema.STRING).topic(topic).enableBatching(false).create();
String subName = "test_sub";
@Cleanup
Consumer<String> consumer = client.newConsumer(Schema.STRING)
.topic(topic)
.subscriptionName("test_sub")
.subscriptionName(subName)
.subscriptionType(SubscriptionType.Shared)
.messageListener((MessageListener<String>) (consumer1, msg) -> {
try {
Expand All @@ -453,7 +454,13 @@ public void testDelayedDeliveryTrackerMemoryUsageMetric(String topic, boolean ex

Multimap<String, Metric> metricsMap = parseMetrics(metricsStr);
Collection<Metric> metrics = metricsMap.get("pulsar_delayed_message_index_size_bytes");
Assert.assertTrue(metrics.size() > 0);
Collection<Metric> subMetrics = metricsMap.get("pulsar_subscription_delayed_message_index_size_bytes");
assertFalse(metrics.isEmpty());
if (exposeTopicLevelMetrics) {
assertFalse(subMetrics.isEmpty());
} else {
assertTrue(subMetrics.isEmpty());
}

int topicLevelNum = 0;
int namespaceLevelNum = 0;
Expand All @@ -462,14 +469,20 @@ public void testDelayedDeliveryTrackerMemoryUsageMetric(String topic, boolean ex
if (exposeTopicLevelMetrics && metric.tags.get("topic").equals(topic)) {
Assert.assertTrue(metric.value > 0);
topicLevelNum++;
if ("test_sub".equals(metric.tags.get("subscription"))) {
subscriptionLevelNum++;
}
} else if (!exposeTopicLevelMetrics && metric.tags.get("namespace").equals(namespace)) {
Assert.assertTrue(metric.value > 0);
namespaceLevelNum++;
}
}
if (exposeTopicLevelMetrics) {
for (Metric metric : subMetrics) {
if (metric.tags.get("topic").equals(topic) &&
subName.equals(metric.tags.get("subscription"))) {
Assert.assertTrue(metric.value > 0);
subscriptionLevelNum++;
}
}
}

if (exposeTopicLevelMetrics) {
Assert.assertTrue(topicLevelNum > 0);
Expand Down
Loading