Skip to content

[manager] bugfix: fix incorrect status page date calculation #3962

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
tomsun28 merged 13 commits into from
Jan 17, 2026
+260 −58
Merged

[manager] bugfix: fix incorrect status page date calculation #3962

Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2fffea0
[manager] bugfix: fix incorrect status page date calculation
BhanuNidumolu Jan 12, 2026
e850fc3
Merge branch 'master' into fix-status-page-date
Duansg Jan 13, 2026
a2121af
Merge branch 'master' into fix-status-page-date
tomsun28 Jan 14, 2026
7730fd5
fix(status-page): resolve midnight race, DST and timestamp sorting
BhanuNidumolu Jan 14, 2026
e0785cd
Merge branch 'master' into fix-status-page-date
tomsun28 Jan 15, 2026
0657a6e
Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…
tomsun28 Jan 15, 2026
b823871
Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…
tomsun28 Jan 15, 2026
023b735
Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…
tomsun28 Jan 15, 2026
c9dfb8a
Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/s…
tomsun28 Jan 15, 2026
967fbdd
test(status-page): add DST, midnight and history window coverage
BhanuNidumolu Jan 15, 2026
1cf91d8
Merge branch 'master' into fix-status-page-date
tomsun28 Jan 16, 2026
f3fd174
test(status-page): add ASF license header
BhanuNidumolu Jan 16, 2026
0cdae89
Merge branch 'master' into fix-status-page-date
Duansg Jan 16, 2026
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
179 changes: 121 additions & 58 deletions ...anager/src/main/java/org/apache/hertzbeat/manager/service/impl/StatusPageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
package org.apache.hertzbeat.manager.service.impl;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -131,45 +130,71 @@ public List<ComponentStatus> queryComponentsStatus() {
componentStatus.setInfo(component);
List<StatusPageHistory> histories = new LinkedList<>();
// query today status
LocalDateTime nowTime = LocalDateTime.now();
LocalDateTime todayStartTime = nowTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
ZoneOffset zoneOffset = ZoneId.systemDefault().getRules().getOffset(Instant.now());
long nowTimestamp = nowTime.toInstant(zoneOffset).toEpochMilli();
long todayStartTimestamp = todayStartTime.toInstant(zoneOffset).toEpochMilli();
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();


Comment thread
tomsun28 marked this conversation as resolved.
Outdated
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);
}
Comment on lines +133 to 195

Copilot AI Jan 15, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.

componentStatus.setHistory(histories);
componentStatusList.add(componentStatus);
}
Expand Down Expand Up @@ -215,50 +240,88 @@ private StatusPageHistory combineOneDayStatusPageHistory(List<StatusPageHistory>

@Override
public ComponentStatus queryComponentStatus(long id) {
StatusPageComponent component = statusPageComponentDao.findById(id).orElseThrow(() -> new IllegalArgumentException("component not found"));
StatusPageComponent component = statusPageComponentDao.findById(id)
.orElseThrow(() -> new IllegalArgumentException("component not found"));

ComponentStatus componentStatus = new ComponentStatus();
componentStatus.setInfo(component);
List<StatusPageHistory> histories = new LinkedList<>();
// query today status
LocalDateTime nowTime = LocalDateTime.now();
LocalDateTime todayStartTime = nowTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
ZoneOffset zoneOffset = ZoneId.systemDefault().getRules().getOffset(Instant.now());
long nowTimestamp = nowTime.toInstant(zoneOffset).toEpochMilli();
long todayStartTimestamp = todayStartTime.toInstant(zoneOffset).toEpochMilli();
List<StatusPageHistory> todayStatusPageHistoryList = statusPageHistoryDao
.findStatusPageHistoriesByComponentIdAndTimestampBetween(component.getId(), todayStartTimestamp, nowTimestamp);
StatusPageHistory todayStatus = combineOneDayStatusPageHistory(todayStatusPageHistoryList, component, nowTimestamp);

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
Comment thread
tomsun28 marked this conversation as resolved.
Outdated
long preTimestamp = now
.atZone(zoneId)
.toLocalDate()
.minusDays(HISTORY_SPAN_DAYS)
.atStartOfDay(zoneId)
.toInstant()
.toEpochMilli();


Comment thread
tomsun28 marked this conversation as resolved.
Outdated
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);
}
Comment on lines +249 to 320

Copilot AI Jan 15, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copilot uses AI. Check for mistakes.


Comment thread
tomsun28 marked this conversation as resolved.
Outdated
componentStatus.setHistory(histories);
return componentStatus;
}
Expand Down
Loading