[GitHub] [storm] agresch commented on a change in pull request #3404: [STORM-3782] Refactor KafkaOffsetMetric to use V2 metrics

[GitBox <gi...@apache.org>]

agresch commented on a change in pull request #3404:
URL: https://github.com/apache/storm/pull/3404#discussion_r684334280



##########
File path: external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
##########
@@ -53,7 +53,7 @@
 import org.apache.storm.kafka.spout.internal.ConsumerFactoryDefault;
 import org.apache.storm.kafka.spout.internal.OffsetManager;
 import org.apache.storm.kafka.spout.internal.Timer;
-import org.apache.storm.kafka.spout.metrics.KafkaOffsetMetric;

Review comment:
       can KafkaOffsetMetric.java be deleted?

##########
File path: external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/metrics2/KafkaOffsetMetricManager.java
##########
@@ -0,0 +1,85 @@
+/**
+ * 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.storm.kafka.spout.metrics2;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.storm.kafka.spout.internal.OffsetManager;
+import org.apache.storm.task.TopologyContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class is used to manage both the partition and topic level offset metrics.
+ */
+public class KafkaOffsetMetricManager<K, V> {
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaOffsetMetricManager.class);
+    private final Supplier<Map<TopicPartition, OffsetManager>> offsetManagerSupplier;
+    private final Supplier<Consumer<K, V>> consumerSupplier;
+    private TopologyContext topologyContext;
+
+    private Map<String, KafkaOffsetTopicMetrics> topicMetricsMap;
+    private Map<TopicPartition, KafkaOffsetPartitionMetrics> topicPartitionMetricsMap;
+
+    public KafkaOffsetMetricManager(Supplier<Map<TopicPartition, OffsetManager>> offsetManagerSupplier,
+                                    Supplier<Consumer<K, V>> consumerSupplier,
+                                    TopologyContext topologyContext) {
+        this.offsetManagerSupplier = offsetManagerSupplier;
+        this.consumerSupplier = consumerSupplier;
+        this.topologyContext = topologyContext;
+
+        this.topicMetricsMap = new HashMap<>();
+        this.topicPartitionMetricsMap = new HashMap<>();
+        LOG.info("Running KafkaOffsetMetricManager");
+    }
+
+    public void registerMetricsForNewTopicPartitions(Set<TopicPartition> newAssignment) {
+        for (TopicPartition topicPartition : newAssignment) {
+            if (!topicPartitionMetricsMap.containsKey(topicPartition)) {
+                LOG.info("Registering metric for topicPartition: {}", topicPartition);
+                // create topic level metrics for given topic if absent
+                String topic = topicPartition.topic();
+                KafkaOffsetTopicMetrics topicMetrics = topicMetricsMap.get(topic);
+                if (topicMetrics == null) {
+                    topicMetrics = new KafkaOffsetTopicMetrics(topic);
+                    topicMetricsMap.put(topic, topicMetrics);
+                }
+                topologyContext.registerMetricSet("kafkaOffset", topicMetrics);

Review comment:
       shouldn't this register the kafkaOffset set only if creating a new KafkaOffsetTopicMetrics()?  Do we also need to create/register topicPartitionMetricSet if topicMetrics already exists?




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscribe@storm.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org