[manager] bugfix: fix incorrect status page date calculation by BhanuNidumolu · Pull Request #3962 · apache/hertzbeat

BhanuNidumolu · 2026-01-12T10:30:46Z

What's changed?

This PR fixes incorrect date calculation on the Status Page (#3076).

Details

Fixed midnight race condition by using a single Instant for both now and todayStart
Replaced LocalDateTime + ZoneOffset logic with Instant + ZoneId
Ensured DST-safe day boundaries using calendar-based date arithmetic
Fixed timestamp sorting using Long.compare to avoid integer overflow

This prevents:

Negative or inverted time ranges at midnight
Incorrect day boundaries on DST (23h / 25h days)
Sorting bugs for long time ranges

Checklist

I have read the Contributing Guide
I have written the necessary comments
I have verified the date logic locally

Add or update API

Not applicable

BhanuNidumolu · 2026-01-12T10:32:55Z

Hi maintainers 👋

This PR fixes the incorrect date calculation on the Status Page (#3076).
The logic now uses Instant + ZoneId based day boundaries instead of LocalDateTime + ZoneOffset, which prevents timezone and DST-related date shifts when aggregating daily status history.

All hertzbeat-manager tests pass locally.
Looking forward to your review — thanks!

delei · 2026-01-12T11:50:47Z

Hi, @BhanuNidumolu Welcome.

This PR seems to handle different issues simultaneously. We recommend that one PR only fix one problem, which will be helpful for code review.

BTW, could you please provide some unit test codes or test screenshots？

BhanuNidumolu · 2026-01-12T16:17:21Z

Thanks for the review and the suggestion!

I will split them into two separate PRs to make review easier:

• This PR (#3962) will only keep the Status Page date bugfix
• I will move the MySQL account expiry metrics into a new PR

Regarding testing:

The Status Page change is covered by existing StatusPageService tests (all passing locally)
For the MySQL template, I will provide SQL test results and screenshots in the new PR

I will update this PR shortly. Thanks for the guidance!

BhanuNidumolu · 2026-01-14T17:06:28Z

Verification – Midnight & DST Boundary

I reproduced the midnight boundary case by inserting two records into the HertzBeat H2 store (HZB_STATUS_PAGE_HISTORY):

2026-01-13 23:59:59 → ABNORMAL
2026-01-14 00:00:01 → NORMAL

This creates a real midnight-crossing outage.

With the new implementation:

A single Instant is used for now and todayStart
Day boundaries are computed via Instant + ZoneId (not minusSeconds)
Sorting uses Long.compare

Result:
Both sliding 24-hour windows correctly include the 300s outage and render consistent uptime on the Status Page (red + green bars).
No inverted ranges or DST errors occur.

SCREENSHOTS:

Clarification: Why two “2026-01-14” bars show different uptime

Although both bars in the screenshots are labeled 2026-01-14, they represent different rolling 24-hour windows, not the same calendar day.

For example:

2026-01-14 10:29 shows the window 2026-01-13 10:29 → 2026-01-14 10:29, which includes only the midnight outage and unknown time → 0% uptime

2026-01-14 21:53 shows the window 2026-01-13 21:53 → 2026-01-14 21:53, which includes the same outage plus many hours of recovery → 98.15% uptime

This confirms the new Instant + ZoneId based boundary logic is working correctly across midnight and DST, and that the same outage is consistently included in all overlapping 24-hour windows.

Copilot

Pull request overview

This PR fixes critical date calculation bugs in the Status Page service that could cause incorrect time ranges at midnight, incorrect day boundaries during DST transitions, and integer overflow in timestamp sorting.

Changes:

Replaced LocalDateTime with Instant and ZonedDateTime for proper timezone handling
Fixed midnight race conditions by capturing a single Instant for all date calculations
Corrected timestamp sorting to use Long.compare() instead of integer casting
Improved code readability with better variable naming and formatting

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-15T15:39:50Z

+            ZoneId zoneId = ZoneId.systemDefault();
+
+            Instant now = Instant.now();
+            long nowTimestamp = now.toEpochMilli();
+
+            long todayStartTimestamp = now
+                .atZone(zoneId)
+                .toLocalDate()
+                .atStartOfDay(zoneId)
+                .toInstant()
+                .toEpochMilli();
+
            List<StatusPageHistory> todayStatusPageHistoryList = statusPageHistoryDao
                    .findStatusPageHistoriesByComponentIdAndTimestampBetween(component.getId(), todayStartTimestamp, nowTimestamp);
            StatusPageHistory todayStatus = combineOneDayStatusPageHistory(todayStatusPageHistoryList, component, nowTimestamp);
            histories.add(todayStatus);
            // query 30d component status history
-            LocalDateTime preTime = todayStartTime.minusDays(HISTORY_SPAN_DAYS);
-            long preTimestamp = preTime.toInstant(zoneOffset).toEpochMilli();
+            long preTimestamp = now
+                .atZone(zoneId)
+                .toLocalDate()
+                .minusDays(HISTORY_SPAN_DAYS)
+                .atStartOfDay(zoneId)
+                .toInstant()
+                .toEpochMilli();
+
+
            List<StatusPageHistory> history = statusPageHistoryDao
                    .findStatusPageHistoriesByComponentIdAndTimestampBetween(component.getId(), preTimestamp, todayStartTimestamp);
            LinkedList<StatusPageHistory> historyList = new LinkedList<>(history);
-            historyList.sort((o1, o2) -> (int) (o1.getTimestamp() - o2.getTimestamp()));
-            LocalDateTime endTime = todayStartTime.minusSeconds(1);
-            LocalDateTime startTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
-            for (int index = 0; index < HISTORY_SPAN_DAYS; index++) {
-                long startTimestamp = startTime.toInstant(zoneOffset).toEpochMilli();
-                long endTimestamp = endTime.toInstant(zoneOffset).toEpochMilli();
-                List<StatusPageHistory> thisDayHistory = historyList.stream().filter(item ->
-                                item.getTimestamp() >= startTimestamp && item.getTimestamp() <= endTimestamp)
-                        .collect(Collectors.toList());
+            historyList.sort((o1, o2) -> Long.compare(o1.getTimestamp(), o2.getTimestamp()));
+            ZonedDateTime end = Instant.ofEpochMilli(todayStartTimestamp)
+                .atZone(zoneId)
+                .minusSeconds(1);   // yesterday 23:59:59 local time
+
+            for (int i = 0; i < HISTORY_SPAN_DAYS; i++) {
+                long endTimestamp = end.toInstant().toEpochMilli();
+
+                long startTimestamp = end.toLocalDate()
+                    .atStartOfDay(zoneId)
+                    .toInstant()
+                    .toEpochMilli();
+
+                List<StatusPageHistory> thisDayHistory = historyList.stream()
+                    .filter(h -> h.getTimestamp() >= startTimestamp && h.getTimestamp() <= endTimestamp)
+                    .collect(Collectors.toList());
+
                if (thisDayHistory.isEmpty()) {
-                    StatusPageHistory statusPageHistory = StatusPageHistory.builder().timestamp(endTimestamp)
-                            .componentId(component.getId()).state(CommonConstants.STATUS_PAGE_COMPONENT_STATE_UNKNOWN).build();
-                    histories.add(statusPageHistory);
+                    histories.add(StatusPageHistory.builder()
+                        .timestamp(endTimestamp)
+                        .componentId(component.getId())
+                        .state(CommonConstants.STATUS_PAGE_COMPONENT_STATE_UNKNOWN)
+                        .build());
                } else if (thisDayHistory.size() == 1) {
                    histories.add(thisDayHistory.get(0));
                } else {
-                    StatusPageHistory statusPageHistory = combineOneDayStatusPageHistory(thisDayHistory, component, endTimestamp);
-                    histories.add(statusPageHistory);
+                    StatusPageHistory merged =
+                        combineOneDayStatusPageHistory(thisDayHistory, component, endTimestamp);
+                    histories.add(merged);
                    statusPageHistoryDao.deleteAll(thisDayHistory);
-                    statusPageHistoryDao.save(statusPageHistory);
+                    statusPageHistoryDao.save(merged);
                }
-                startTime = startTime.minusDays(1);
-                endTime = endTime.minusDays(1);
+
+                end = end.minusDays(1);
            }


The date calculation logic in queryComponentsStatus has been significantly refactored to fix midnight race conditions and DST issues, but there are no unit tests covering this critical logic. Consider adding tests that verify the date calculations work correctly, especially for edge cases like midnight boundaries, DST transitions, and the 29-day history window calculation.

Copilot · 2026-01-15T15:39:50Z

+        ZoneId zoneId = ZoneId.systemDefault();
+
+        Instant now = Instant.now();
+        long nowTimestamp = now.toEpochMilli();
+
+        long todayStartTimestamp = now
+            .atZone(zoneId)
+            .toLocalDate()
+            .atStartOfDay(zoneId)
+            .toInstant()
+            .toEpochMilli();
+
+        // Today
+        List<StatusPageHistory> todayStatusPageHistoryList =
+            statusPageHistoryDao.findStatusPageHistoriesByComponentIdAndTimestampBetween(
+                component.getId(), todayStartTimestamp, nowTimestamp);
+
+        StatusPageHistory todayStatus =
+            combineOneDayStatusPageHistory(todayStatusPageHistoryList, component, nowTimestamp);
+
        histories.add(todayStatus);
-        // query 30d component status history
-        LocalDateTime preTime = todayStartTime.minusDays(HISTORY_SPAN_DAYS);
-        long preTimestamp = preTime.toInstant(zoneOffset).toEpochMilli();
-        List<StatusPageHistory> history = statusPageHistoryDao
-                .findStatusPageHistoriesByComponentIdAndTimestampBetween(component.getId(), preTimestamp, todayStartTimestamp);
+
+        // Previous 29 days
+        long preTimestamp = now
+            .atZone(zoneId)
+            .toLocalDate()
+            .minusDays(HISTORY_SPAN_DAYS)
+            .atStartOfDay(zoneId)
+            .toInstant()
+            .toEpochMilli();
+
+
+        List<StatusPageHistory> history =
+            statusPageHistoryDao.findStatusPageHistoriesByComponentIdAndTimestampBetween(
+                component.getId(), preTimestamp, todayStartTimestamp);
+
        LinkedList<StatusPageHistory> historyList = new LinkedList<>(history);
-        historyList.sort((o1, o2) -> (int) (o1.getTimestamp() - o2.getTimestamp()));
-        LocalDateTime endTime = todayStartTime.minusSeconds(1);
-        LocalDateTime startTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
-        for (int index = 0; index < HISTORY_SPAN_DAYS; index++) {
-            long startTimestamp = startTime.toInstant(zoneOffset).toEpochMilli();
-            long endTimestamp = endTime.toInstant(zoneOffset).toEpochMilli();
-            List<StatusPageHistory> thisDayHistory = historyList.stream().filter(item ->
-                            item.getTimestamp() >= startTimestamp && item.getTimestamp() <= endTimestamp)
-                    .collect(Collectors.toList());
+        historyList.sort((o1, o2) -> Long.compare(o1.getTimestamp(), o2.getTimestamp()));
+
+        ZonedDateTime end = Instant.ofEpochMilli(todayStartTimestamp)
+            .atZone(zoneId)
+            .minusSeconds(1);   // yesterday 23:59:59 local time
+
+        for (int i = 0; i < HISTORY_SPAN_DAYS; i++) {
+            long endTimestamp = end.toInstant().toEpochMilli();
+
+            long startTimestamp = end.toLocalDate()
+                .atStartOfDay(zoneId)
+                .toInstant()
+                .toEpochMilli();
+
+            List<StatusPageHistory> thisDayHistory = historyList.stream()
+                .filter(h -> h.getTimestamp() >= startTimestamp && h.getTimestamp() <= endTimestamp)
+                .collect(Collectors.toList());
+
            if (thisDayHistory.isEmpty()) {
-                StatusPageHistory statusPageHistory = StatusPageHistory.builder().timestamp(endTimestamp)
-                        .componentId(component.getId()).state(CommonConstants.STATUS_PAGE_COMPONENT_STATE_UNKNOWN).build();
-                histories.add(statusPageHistory);
+                histories.add(StatusPageHistory.builder()
+                    .timestamp(endTimestamp)
+                    .componentId(component.getId())
+                    .state(CommonConstants.STATUS_PAGE_COMPONENT_STATE_UNKNOWN)
+                    .build());
            } else if (thisDayHistory.size() == 1) {
                histories.add(thisDayHistory.get(0));
            } else {
-                StatusPageHistory statusPageHistory = combineOneDayStatusPageHistory(thisDayHistory, component, endTimestamp);
-                histories.add(statusPageHistory);
+                StatusPageHistory merged =
+                    combineOneDayStatusPageHistory(thisDayHistory, component, endTimestamp);
+                histories.add(merged);
                statusPageHistoryDao.deleteAll(thisDayHistory);
-                statusPageHistoryDao.save(statusPageHistory);
+                statusPageHistoryDao.save(merged);
            }
-            startTime = startTime.minusDays(1);
-            endTime = endTime.minusDays(1);
+
+            end = end.minusDays(1);
        }


The date calculation logic in queryComponentStatus has been significantly refactored to fix midnight race conditions and DST issues, but there are no unit tests covering this critical logic. Consider adding tests that verify the date calculations work correctly, especially for edge cases like midnight boundaries, DST transitions, and the 29-day history window calculation.

…ervice/impl/StatusPageServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tomsun28 <tomsun28@outlook.com>

tomsun28 · 2026-01-15T15:49:26Z

hi thanks! Can you help to add more unit test for these?

BhanuNidumolu · 2026-01-15T17:01:30Z

Thanks for the review! I will add unit tests to cover:

Midnight boundary cases
DST transitions (23h / 25h days)
29-day history window calculation

I’ll push the tests shortly.

BhanuNidumolu · 2026-01-15T19:15:21Z

Added unit tests covering:

Midnight boundary
DST (23h / 25h days)
29-day history window

All tests pass locally. Thanks for the review!

tomsun28 · 2026-01-16T13:00:07Z

hi LGTM! thanks.
Please add the License Header to fix license check.

BhanuNidumolu · 2026-01-16T13:49:59Z

License header added as requested. All checks should now pass.
Thanks for the review!

tomsun28

LGTM!

[manager] bugfix: fix incorrect status page date calculation

2fffea0

github-actions Bot added backend monitoring-template labels Jan 12, 2026

BhanuNidumolu mentioned this pull request Jan 12, 2026

[Task] Add database account expiry monitoring metrics #3737

Closed

12 tasks

BhanuNidumolu force-pushed the fix-status-page-date branch from 09611da to 2fffea0 Compare January 12, 2026 16:18

github-actions Bot removed the monitoring-template label Jan 12, 2026

Duansg and others added 3 commits January 13, 2026 21:40

Merge branch 'master' into fix-status-page-date

e850fc3

Merge branch 'master' into fix-status-page-date

a2121af

fix(status-page): resolve midnight race, DST and timestamp sorting

7730fd5

Merge branch 'master' into fix-status-page-date

e0785cd

tomsun28 requested a review from Copilot January 15, 2026 15:34

Copilot started reviewing on behalf of tomsun28 January 15, 2026 15:35 View session

Copilot AI reviewed Jan 15, 2026

View reviewed changes

tomsun28 and others added 4 commits January 15, 2026 23:48

Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…

0657a6e

…ervice/impl/StatusPageServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tomsun28 <tomsun28@outlook.com>

Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…

b823871

…ervice/impl/StatusPageServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tomsun28 <tomsun28@outlook.com>

Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…

023b735

…ervice/impl/StatusPageServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tomsun28 <tomsun28@outlook.com>

Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…

c9dfb8a

…ervice/impl/StatusPageServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Tomsun28 <tomsun28@outlook.com>

test(status-page): add DST, midnight and history window coverage

967fbdd

Merge branch 'master' into fix-status-page-date

1cf91d8

test(status-page): add ASF license header

f3fd174

Merge branch 'master' into fix-status-page-date

0cdae89

tomsun28 approved these changes Jan 17, 2026

View reviewed changes

tomsun28 merged commit 8962253 into apache:master Jan 17, 2026
3 checks passed

Uh oh!

Conversation

BhanuNidumolu commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What's changed?

Details

Checklist

Add or update API

Uh oh!

BhanuNidumolu commented Jan 12, 2026

Uh oh!

delei commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BhanuNidumolu commented Jan 12, 2026

Uh oh!

BhanuNidumolu commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Verification – Midnight & DST Boundary

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

tomsun28 commented Jan 15, 2026

Uh oh!

BhanuNidumolu commented Jan 15, 2026

Uh oh!

BhanuNidumolu commented Jan 15, 2026

Uh oh!

tomsun28 commented Jan 16, 2026

Uh oh!

BhanuNidumolu commented Jan 16, 2026

Uh oh!

tomsun28 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

BhanuNidumolu commented Jan 12, 2026 •

edited

Loading

delei commented Jan 12, 2026 •

edited

Loading

BhanuNidumolu commented Jan 14, 2026 •

edited

Loading