From 93c4ef95028cf6573e6d8ca8f386d6bef7d4f952 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Thu, 8 Feb 2018 21:49:09 +0800 Subject: [PATCH 1/2] Fix the docker version is out of date --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 09db04f8e..aeb1328f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.1' services: skywalking-webui: - image: skywalking/skywalking-ui:5.0-2018-preview + image: skywalking/skywalking-ui:5.0.0-alpha expose: - "8080" ports: @@ -15,7 +15,7 @@ services: - COLLECTOR_SERVERS=skywalking-collector:10800 skywalking-collector: - image: skywalking/skywalking-collector:5.0-2018-preview + image: skywalking/skywalking-collector:5.0.0-alpha expose: - "10800" - "11800" From bb0552a4fce4145810dea81117b933a70d94a2d8 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 9 Feb 2018 09:47:19 +0800 Subject: [PATCH 2/2] Create SImpleDateFormat everytime. --- .../apm/collector/core/util/TimeBucketUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java index e7f8501cf..f14c4c677 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java @@ -29,12 +29,8 @@ import org.apache.skywalking.apm.collector.core.UnexpectedException; public enum TimeBucketUtils { INSTANCE; - private final SimpleDateFormat dayDateFormat = new SimpleDateFormat("yyyyMMdd"); - private final SimpleDateFormat hourDateFormat = new SimpleDateFormat("yyyyMMddHH"); - private final SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); - private final SimpleDateFormat secondDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); - public long getMinuteTimeBucket(long time) { + SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); String timeStr = minuteDateFormat.format(calendar.getTime()); @@ -42,6 +38,7 @@ public enum TimeBucketUtils { } public long getSecondTimeBucket(long time) { + SimpleDateFormat secondDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); String timeStr = secondDateFormat.format(calendar.getTime()); @@ -49,6 +46,7 @@ public enum TimeBucketUtils { } public long getHourTimeBucket(long time) { + SimpleDateFormat hourDateFormat = new SimpleDateFormat("yyyyMMddHH"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); String timeStr = hourDateFormat.format(calendar.getTime()) + "00"; @@ -56,6 +54,7 @@ public enum TimeBucketUtils { } public long getDayTimeBucket(long time) { + SimpleDateFormat dayDateFormat = new SimpleDateFormat("yyyyMMdd"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); String timeStr = dayDateFormat.format(calendar.getTime()) + "0000";