Verbesserungen aus 'stored-offsets' nach 'stored-state' gemerged

[demos/kafka/training] / src / main / java / de / juplo / kafka / KeyCountingRebalanceListener.java

diff --git a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
index 4a2c036..636ff86 100644 (file)
--- a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
@@ -2,7 +2,6 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
 import java.time.Clock;
@@ -19,10 +18,8 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
   private final KeyCountingRecordHandler handler;
   private final PartitionStatisticsRepository repository;
   private final String id;
-  private final String topic;
   private final Clock clock;
   private final Duration commitInterval;
-  private final Consumer<String, Long> consumer;
 
   private Instant lastCommit = Instant.EPOCH;
 
@@ -32,18 +29,11 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
-      Long offset = consumer.position(tp);
-      log.info("{} - adding partition: {}, offset={}", id, partition, offset);
+      log.info("{} - adding partition: {}", id, partition);
       StatisticsDocument document =
           repository
               .findById(Integer.toString(partition))
               .orElse(new StatisticsDocument(partition));
-      if (document.offset >= 0)
-      {
-        // Only seek, if a stored offset was found
-        // Otherwise: Use initial offset, generated by Kafka
-        consumer.seek(tp, document.offset);
-      }
       handler.addPartition(partition, document.statistics);
     });
   }
@@ -54,14 +44,18 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
-      Long newOffset = consumer.position(tp);
-      log.info(
-          "{} - removing partition: {}, offset of next message {})",
-          id,
-          partition,
-          newOffset);
+      log.info("{} - removing partition: {}", id, partition);
       Map<String, Long> removed = handler.removePartition(partition);
-      repository.save(new StatisticsDocument(partition, removed, consumer.position(tp)));
+      for (String key : removed.keySet())
+      {
+        log.info(
+            "{} - Seen {} messages for partition={}|key={}",
+            id,
+            removed.get(key),
+            partition,
+            key);
+      }
+      repository.save(new StatisticsDocument(partition, removed));
     });
   }
 
@@ -71,12 +65,11 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
   {
     if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
     {
-      log.debug("Storing data and offsets, last commit: {}", lastCommit);
+      log.debug("Storing data, last commit: {}", lastCommit);
       handler.getSeen().forEach((partiton, statistics) -> repository.save(
           new StatisticsDocument(
               partiton,
-              statistics,
-              consumer.position(new TopicPartition(topic, partiton)))));
+              statistics)));
       lastCommit = clock.instant();
     }
   }