Skip to content

fix: bug scheduling delay was missed #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kishansairam9 merged 3 commits into from
Oct 18, 2023
+11 −11
Merged

fix: bug scheduling delay was missed #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
202b90a
fix: bug in proactive rescheduling not accounting for future timeout
Oct 18, 2023
5c6f27f
update
Oct 18, 2023
718bd8a
update
Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ hypertrace-entity-service = "0.8.78"
hypertrace-config-service = "0.1.54"
hypertrace-grpc-utils = "0.12.4"
hypertrace-serviceFramework = "0.1.60"
hypertrace-kafkaStreams = "0.4.1"
hypertrace-kafkaStreams = "0.4.2"
hypertrace-view-generator = "0.4.19"
grpc = "1.57.2"

Expand Down
8 changes: 4 additions & 4 deletions ...aw-spans-grouper/src/main/java/org/hypertrace/core/rawspansgrouper/RawSpansProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ public void process(Record<TraceIdentity, RawSpan> record) {
.setTraceId(traceId)
.setSpanIds(List.of(spanId))
.build();
traceEmitPunctuator.scheduleTask(currentTimeMs, key);
traceEmitPunctuator.scheduleTask(currentTimeMs + groupingWindowTimeoutMs, key);
} else {
traceState.getSpanIds().add(spanId);
long prevScheduleTimestamp = traceState.getTraceEndTimestamp() + groupingWindowTimeoutMs;
traceState.setTraceEndTimestamp(currentTimeMs);
if (!traceEmitPunctuator.rescheduleTask(
prevScheduleTimestamp, currentTimeMs + groupingWindowTimeoutMs, key)) {
logger.debug(
"Failed to proactively reschedule task on getting span for trace key {}, schedule already dropped!",
key);
logger.warn(
"Failed to proactively reschedule task on getting span for trace id {}, schedule already dropped!",
HexUtils.getHex(traceState.getTraceId()));
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...-spans-grouper/src/test/java/org/hypertrace/core/rawspansgrouper/RawSpansGrouperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,8 @@ public void whenRawSpansAreReceivedWithInactivityExpectTraceToBeOutput(@TempDir
messageTime = advanceAndSyncClockMock(messageTime, clock, 35_000);
inputTopic.pipeInput(dummyTraceIdentity, dummySpan, messageTime);

// trace2 should have 1 span span3
StructuredTrace trace = outputTopic.readValue();
assertEquals(1, trace.getEventList().size());
assertEquals("event-4", new String(trace.getEventList().get(0).getEventId().array()));

// trace1 should have 2 span span1, span2
trace = outputTopic.readValue();
StructuredTrace trace = outputTopic.readValue();
assertEquals(2, trace.getEventList().size());
Set<String> traceEventIds =
trace.getEventList().stream()
Expand All @@ -246,6 +241,11 @@ public void whenRawSpansAreReceivedWithInactivityExpectTraceToBeOutput(@TempDir
assertTrue(traceEventIds.contains("event-1"));
assertTrue(traceEventIds.contains("event-2"));

// trace2 should have 1 span span3
trace = outputTopic.readValue();
assertEquals(1, trace.getEventList().size());
assertEquals("event-4", new String(trace.getEventList().get(0).getEventId().array()));

inputTopic.pipeInput(createTraceIdentity(tenantId, "trace-1"), span3, messageTime);
messageTime = advanceAndSyncClockMock(messageTime, clock, 45_000);
inputTopic.pipeInput(createTraceIdentity(tenantId, "trace-2"), span5, messageTime);
Expand Down