Merge pull request #13575 from vespa-engine/jonmv/log-server-handler-fix

Fix date

1 files changed, 7 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
index 13c96cd3ada..09330542bea 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java
@@ -19,6 +19,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -157,12 +158,13 @@ class LogReader {
             return ZonedDateTime.of(Integer.parseInt(matcher.group(1)),
                                     Integer.parseInt(matcher.group(2)),
                                     Integer.parseInt(matcher.group(3)),
-                                    Integer.parseInt(matcher.group(4)) + 1, // timestamp is start of hour range of the log file
+                                    Integer.parseInt(matcher.group(4)),
                                     0,
                                     0,
                                     0,
                                     ZoneId.of("UTC"))
-                                .toInstant();
+                                .toInstant()
+                                .plus(Duration.ofHours(1));
         }
         matcher = vespaLogPathPattern.matcher(relativePath);
         if (matcher.matches()) {
@@ -174,10 +176,11 @@ class LogReader {
                                     Integer.parseInt(matcher.group(3)),
                                     Integer.parseInt(matcher.group(4)),
                                     Integer.parseInt(matcher.group(5)),
-                                    Integer.parseInt(matcher.group(6)) + 1, // timestamp is that of the last entry, truncated to second accuracy
+                                    Integer.parseInt(matcher.group(6)),
                                     0,
                                     ZoneId.of("UTC"))
-                                .toInstant();
+                                .toInstant()
+                                .plus(Duration.ofSeconds(1));
         }
         throw new IllegalArgumentException("Unrecognized file pattern for file at '" + path + "'");
     }