From f28900f91656fc8b68a9e33e5e193435ebc2143e Mon Sep 17 00:00:00 2001 From: Andre Kurait Date: Thu, 8 Feb 2024 08:34:39 -0600 Subject: [PATCH 1/2] Fix typo in TimeShifter comments Signed-off-by: Andre Kurait --- .../opensearch/migrations/replay/TimeShifter.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java index 562d7e885..28d66ff11 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java @@ -41,11 +41,11 @@ public void setFirstTimestamp(Instant sourceTime) { } Instant transformSourceTimeToRealTime(Instant sourceTime) { - // realtime = systemTimeStart + rateMultiplier * (sourceTime-sourceTimeStart) - if (sourceTimeStart.get() == null) { - throw new IllegalStateException("setFirstTimestamp has not yet been called"); - } - return systemTimeStart.get() + if (sourceTimeStart.get() == null) { + throw new IllegalStateException("setFirstTimestamp has not yet been called"); + } + // realtime = systemTimeStart + ((sourceTime-sourceTimeStart) / rateMultiplier) + return systemTimeStart.get() .plus(Duration.ofMillis((long) (Duration.between(sourceTimeStart.get(), sourceTime).toMillis() / rateMultiplier))); } @@ -53,8 +53,7 @@ Instant transformSourceTimeToRealTime(Instant sourceTime) { Optional transformRealTimeToSourceTime(Instant realTime) { return Optional.ofNullable(sourceTimeStart.get()) .map(start -> - // sourceTime = realTime - systemTimeStart + sourceTimeStart - // sourceTime = sourceTimeStart + (realTime-systemTimeStart) / rateMultiplier + // sourceTime = sourceTimeStart + (realTime-systemTimeStart) * rateMultiplier start.plus(Duration.ofMillis((long) (Duration.between(systemTimeStart.get(), realTime).toMillis() * rateMultiplier)))); } From 023840af777d806c841a4dcda8f8d6ba839288c1 Mon Sep 17 00:00:00 2001 From: Andre Kurait Date: Tue, 13 Feb 2024 22:51:47 -0600 Subject: [PATCH 2/2] Address Comments for spacing Signed-off-by: Andre Kurait --- .../migrations/replay/TimeShifter.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java index 28d66ff11..90fc33b26 100644 --- a/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java +++ b/TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TimeShifter.java @@ -36,26 +36,26 @@ public void setFirstTimestamp(Instant sourceTime) { assert didSetSystemStart : "expected to always start systemTimeStart immediately after sourceTimeStart "; } log.atLevel(didSet ? Level.INFO : Level.TRACE) - .setMessage("Set baseline source timestamp for all future interactions to {}") - .addArgument(sourceTime).log(); + .setMessage("Set baseline source timestamp for all future interactions to {}") + .addArgument(sourceTime).log(); } Instant transformSourceTimeToRealTime(Instant sourceTime) { - if (sourceTimeStart.get() == null) { - throw new IllegalStateException("setFirstTimestamp has not yet been called"); - } - // realtime = systemTimeStart + ((sourceTime-sourceTimeStart) / rateMultiplier) - return systemTimeStart.get() - .plus(Duration.ofMillis((long) - (Duration.between(sourceTimeStart.get(), sourceTime).toMillis() / rateMultiplier))); + if (sourceTimeStart.get() == null) { + throw new IllegalStateException("setFirstTimestamp has not yet been called"); + } + // realtime = systemTimeStart + ((sourceTime-sourceTimeStart) / rateMultiplier) + return systemTimeStart.get() + .plus(Duration.ofMillis((long) + (Duration.between(sourceTimeStart.get(), sourceTime).toMillis() / rateMultiplier))); } Optional transformRealTimeToSourceTime(Instant realTime) { return Optional.ofNullable(sourceTimeStart.get()) - .map(start -> - // sourceTime = sourceTimeStart + (realTime-systemTimeStart) * rateMultiplier - start.plus(Duration.ofMillis((long) - (Duration.between(systemTimeStart.get(), realTime).toMillis() * rateMultiplier)))); + .map(start -> + // sourceTime = sourceTimeStart + (realTime-systemTimeStart) * rateMultiplier + start.plus(Duration.ofMillis((long) + (Duration.between(systemTimeStart.get(), realTime).toMillis() * rateMultiplier)))); } public double maxRateMultiplier() {