Skip to content
Merged
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 @@ -269,7 +269,7 @@ private void updateKafkaPulsarSourceNumPartitions(
try (var restClient = ctx.getRestClusterClient()) {
Pattern partitionRegex =
Pattern.compile(
"^.*\\.KafkaSourceReader\\.topic\\.(?<kafkaTopic>.+)\\.partition\\.(?<kafkaId>\\d+)\\.currentOffset$"
"^.*?(\\.kafkaCluster\\.(?<kafkaCluster>.+))?\\.KafkaSourceReader\\.topic\\.(?<kafkaTopic>.+)\\.partition\\.(?<kafkaId>\\d+)\\.currentOffset$"
+ "|^.*\\.PulsarConsumer\\.(?<pulsarTopic>.+)-partition-(?<pulsarId>\\d+)\\..*\\.numMsgsReceived$");
for (var vertexInfo : topology.getVertexInfos().values()) {
if (vertexInfo.getInputs().isEmpty()) {
Expand All @@ -281,12 +281,18 @@ private void updateKafkaPulsarSourceNumPartitions(
Matcher matcher = partitionRegex.matcher(v);
if (matcher.matches()) {
String kafkaTopic = matcher.group("kafkaTopic");
String kafkaCluster =
matcher.group("kafkaCluster");
String kafkaId = matcher.group("kafkaId");
String pulsarTopic =
matcher.group("pulsarTopic");
String pulsarId = matcher.group("pulsarId");
return kafkaTopic != null
? kafkaTopic + "-" + kafkaId
? kafkaCluster
+ "-"
+ kafkaTopic
+ "-"
+ kafkaId
: pulsarTopic + "-" + pulsarId;
}
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,20 @@ public void testKafkaPulsarNumPartitions() throws Exception {
collectedMetrics = metricsCollector.updateMetrics(context, stateStore);
assertEquals(5, collectedMetrics.getJobTopology().get(source1).getNumSourcePartitions());

metricsCollector.setMetricNames(
Map.of(
source1,
List.of(
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-1.KafkaSourceReader.topic.testTopic.partition.0.currentOffset",
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-1.KafkaSourceReader.topic.anotherTopic.partition.0.currentOffset",
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-2.KafkaSourceReader.topic.testTopic.partition.0.currentOffset",
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-2.KafkaSourceReader.topic.testTopic.partition.1.currentOffset",
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-2.KafkaSourceReader.topic.testTopic.partition.2.currentOffset",
"1.Source__Kafka_Source_(testTopic).kafkaCluster.my-cluster-2.KafkaSourceReader.topic.testTopic.partition.3.currentOffset")));

collectedMetrics = metricsCollector.updateMetrics(context, stateStore);
assertEquals(6, collectedMetrics.getJobTopology().get(source1).getNumSourcePartitions());

metricsCollector.setMetricNames(
Map.of(
source2,
Expand Down