diff --git a/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java b/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java index bcb13bdd79..b53bd31957 100644 --- a/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java +++ b/agents/drivers/kafka/src/main/java/com/dbx/agent/kafka/KafkaAgent.java @@ -753,7 +753,17 @@ public final class KafkaAgent { TopicPartition tp = new TopicPartition(topic, partition); try (KafkaConsumer consumer = new KafkaConsumer<>(props)) { consumer.assign(Collections.singletonList(tp)); - consumer.seek(tp, offset); + Map beginningOffsets = + consumer.beginningOffsets(Collections.singletonList(tp), Duration.ofSeconds(5)); + Map endOffsets = + consumer.endOffsets(Collections.singletonList(tp), Duration.ofSeconds(5)); + long beginningOffset = beginningOffsets.getOrDefault(tp, 0L); + long endOffset = endOffsets.getOrDefault(tp, beginningOffset); + Long seekOffset = normalizePeekOffset(offset, beginningOffset, endOffset); + if (seekOffset == null) { + return Collections.singletonMap("messages", Collections.emptyList()); + } + consumer.seek(tp, seekOffset); List> messages = new ArrayList<>(); ConsumerRecords records = consumer.poll(Duration.ofSeconds(5)); @@ -1124,6 +1134,19 @@ public final class KafkaAgent { return null; } + static Long normalizePeekOffset(long requestedOffset, long beginningOffset, long endOffset) { + if (endOffset <= beginningOffset) { + return null; + } + if (requestedOffset < beginningOffset) { + return beginningOffset; + } + if (requestedOffset >= endOffset) { + return null; + } + return requestedOffset; + } + private static String stringOrNull(JsonObject object, String key) { JsonElement element = object.get(key); return element == null || element.isJsonNull() ? null : element.getAsString(); diff --git a/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java b/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java new file mode 100644 index 0000000000..876a789694 --- /dev/null +++ b/agents/drivers/kafka/src/test/java/com/dbx/agent/kafka/KafkaAgentTest.java @@ -0,0 +1,33 @@ +package com.dbx.agent.kafka; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; + +class KafkaAgentTest { + @Test + void normalizesPeekOffsetToEarliestAvailableOffset() { + assertEquals(5L, KafkaAgent.normalizePeekOffset(0, 5, 10)); + } + + @Test + void normalizesNegativePeekOffsetToEarliestAvailableOffset() { + assertEquals(0L, KafkaAgent.normalizePeekOffset(-1, 0, 10)); + } + + @Test + void keepsPeekOffsetWhenItIsWithinAvailableRange() { + assertEquals(7L, KafkaAgent.normalizePeekOffset(7, 5, 10)); + } + + @Test + void returnsNoSeekOffsetWhenRequestedOffsetIsAtOrAfterEnd() { + assertNull(KafkaAgent.normalizePeekOffset(10, 5, 10)); + } + + @Test + void returnsNoSeekOffsetWhenTopicHasNoReadableMessages() { + assertNull(KafkaAgent.normalizePeekOffset(0, 5, 5)); + } +}