kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the duration error message more specific (#5761) 

* Make the duration error message more specific
This commit is contained in:
Hoshea Jiang 2020-10-31 17:56:45 +08:00 committed by GitHub
parent ac481e1bbb
commit 7e67358f56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java
View File

@ -30,6 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
public enum DurationUtils {
INSTANCE;
private static final int MAX_TIME_RANGE = 500;
private static final DateTimeFormatter YYYY_MM_DD = DateTimeFormat.forPattern("yyyy-MM-dd");
private static final DateTimeFormatter YYYY_MM_DD_HH = DateTimeFormat.forPattern("yyyy-MM-dd HH");
private static final DateTimeFormatter YYYY_MM_DD_HHMM = DateTimeFormat.forPattern("yyyy-MM-dd HHmm");
@ -119,9 +121,13 @@ public enum DurationUtils {
break;
}
i++;
if (i > 500) {
throw new UnexpectedException(
"Duration data error, step: " + step.name() + ", start: " + startTimeBucket + ", end: " + endTimeBucket);
if (i > MAX_TIME_RANGE) {
// days, hours, minutes or seconds
String stepStr = step.name().toLowerCase() + "s";
String errorMsg = String.format(
"Duration data error, the range between the start time and the end time can't exceed %d %s",
MAX_TIME_RANGE, stepStr);
throw new UnexpectedException(errorMsg);
}
}
while (endTimeBucket != durations.get(durations.size() - 1).getPoint());