From 202b90a2840eee859b6e58e78385a8db8d42798d Mon Sep 17 00:00:00 2001
From: kishansairam9 <kishan.adapa@traceable.ai>
Date: Wed, 18 Oct 2023 14:09:53 +0530
Subject: [PATCH] fix: bug in proactive rescheduling not accounting for future
 timeout

---
 .../hypertrace/core/rawspansgrouper/RawSpansProcessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/raw-spans-grouper/raw-spans-grouper/src/main/java/org/hypertrace/core/rawspansgrouper/RawSpansProcessor.java b/raw-spans-grouper/raw-spans-grouper/src/main/java/org/hypertrace/core/rawspansgrouper/RawSpansProcessor.java
index 7c457d05d..10e6f8825 100644
--- a/raw-spans-grouper/raw-spans-grouper/src/main/java/org/hypertrace/core/rawspansgrouper/RawSpansProcessor.java
+++ b/raw-spans-grouper/raw-spans-grouper/src/main/java/org/hypertrace/core/rawspansgrouper/RawSpansProcessor.java
@@ -175,12 +175,12 @@ public void process(Record<TraceIdentity, RawSpan> record) {
       traceEmitPunctuator.scheduleTask(currentTimeMs, key);
     } else {
       traceState.getSpanIds().add(spanId);
-      long prevScheduleTimestamp = traceState.getTraceEndTimestamp();
+      long prevScheduleTimestamp = traceState.getTraceEndTimestamp() + groupingWindowTimeoutMs;
       traceState.setTraceEndTimestamp(currentTimeMs);
       if (!traceEmitPunctuator.rescheduleTask(
           prevScheduleTimestamp, currentTimeMs + groupingWindowTimeoutMs, key)) {
         logger.debug(
-            "Failed to reschedule task on getting span for trace key {}, schedule already dropped!",
+            "Failed to proactively reschedule task on getting span for trace key {}, schedule already dropped!",
             key);
       }
     }