fix: subscriptions use actual initial offset (#3773)

block · Dec 16, 2024 · 602beba · 602beba
1 parent 8803a38
commit 602beba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...testdata/java/subscriber/src/main/java/xyz/block/ftl/java/test/subscriber/Subscriber.java b/...testdata/java/subscriber/src/main/java/xyz/block/ftl/java/test/subscriber/Subscriber.java
@@ -21,7 +21,7 @@ void consume(PubSubEvent event) throws Exception {
     void consumeFromLatest(PubSubEvent event) throws Exception {
     }
 
-    ConsumeFromLatest
+    @Subscription(topic = Topic2Topic.class, from = FromOffset.BEGINNING)
     @Retry(count = 2, minBackoff = "1s", maxBackoff = "1s")
     public void consumeButFailAndRetry(PubSubEvent event) {
         throw new RuntimeException("always error: event " + event.getTime());

diff --git a/...ntime/common/deployment/src/main/java/xyz/block/ftl/deployment/SubscriptionProcessor.java b/...ntime/common/deployment/src/main/java/xyz/block/ftl/deployment/SubscriptionProcessor.java
@@ -85,9 +85,9 @@ public static SubscriptionAnnotation fromJandex(IndexView indexView, AnnotationI
         }
         topicName = annotation.value().asString();
         AnnotationValue moduleValue = annotation.value("module");
-        AnnotationValue deadLetterValue = annotation.value("deadLetter");
+        AnnotationValue deadLetterValue = subscriptions.value("deadLetter");
         boolean deadLetter = deadLetterValue != null && !deadLetterValue.asString().isEmpty() && deadLetterValue.asBoolean();
-        AnnotationValue from = annotation.value("from");
+        AnnotationValue from = subscriptions.value("from");
         FromOffset fromOffset = from == null ? FromOffset.LATEST : FromOffset.valueOf(from.asEnum());
 
         return new SubscriptionAnnotation(