diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java index d6743d78cb75ad1c024bbbcadcbe95904779bcf8..6408b6e1e37909df8d88e06e1cf9d4ad2addfdc9 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java @@ -77,7 +77,11 @@ public class ApplicationComponentSpanListener implements EntrySpanListener, Exit @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); } @Override public void build() { diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java index 8f51fdb04fd14a1ba49f8f97c9858f7a3e99d314..c0f2e88033e6a3a324596b71e190a4657cd727f8 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java @@ -77,7 +77,11 @@ public class ApplicationMappingSpanListener implements FirstSpanListener, EntryS @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); } @Override public void build() { diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java index 0bdd4144143bb6485b0c09c9975aa501978ddd86..a13e5e4297dc53cb24a6df6b074bedede357c649 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java @@ -51,8 +51,13 @@ public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceId @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - this.timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); this.segmentId = segmentId; + + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); } @Override public void parseGlobalTraceId(UniqueId uniqueId) { diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java index 3308b3296fd1692779d381a1027661d95d753786..6c7574418c832c488b6d161a73544f4006e430df 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java @@ -64,7 +64,11 @@ public class InstanceMappingSpanListener implements FirstSpanListener, EntrySpan @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); } @Override public void build() { diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java index 07082cf978704361e40672c87d1b0f71ab332acd..9a7a3a2538edead518ab744eac62ca978eb40214 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java @@ -60,7 +60,11 @@ public class SegmentDurationSpanListener implements EntrySpanListener, ExitSpanL @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - timeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(spanDecorator.getStartTime()); + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); SegmentDuration segmentDuration = new SegmentDuration(); segmentDuration.setId(segmentId); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java index 650e62618a5db0bff34010ba6f1f71e07fd85ffb..a1e8d7ac93d09cbc1a51b6b767491d92c387750b 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java @@ -68,7 +68,11 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En @Override public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { - this.timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) { + long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket); + } + timeBucket = spanDecorator.getStartTimeMinuteTimeBucket(); } @Override diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java index d8ed7919eeb6de574a47cf44478b4e09bf9959fb..a504add101c7a211f9732d2360edc57e18ff02a0 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SpanDecorator.java @@ -31,6 +31,7 @@ public class SpanDecorator implements StandardBuilder { private StandardBuilder standardBuilder; private SpanObject spanObject; private SpanObject.Builder spanBuilder; + private long startTimeMinuteTimeBucket = 0; private final ReferenceDecorator[] referenceDecorators; public SpanDecorator(SpanObject spanObject, StandardBuilder standardBuilder) { @@ -94,6 +95,14 @@ public class SpanDecorator implements StandardBuilder { } } + public void setStartTimeMinuteTimeBucket(long startTimeMinuteTimeBucket) { + this.startTimeMinuteTimeBucket = startTimeMinuteTimeBucket; + } + + public long getStartTimeMinuteTimeBucket() { + return startTimeMinuteTimeBucket; + } + public long getStartTime() { if (isOrigin) { return spanObject.getStartTime(); diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java index 5a6736e1dae1913af3bd8943896ff87c096fb15c..516ac89f5b78fc800fb237353813df4868bddb73 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java @@ -153,6 +153,7 @@ public class SegmentParse { if (spanDecorator.getSpanId() == 0) { notifyFirstListener(spanDecorator, applicationId, applicationInstanceId, segmentId); timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); + spanDecorator.setStartTimeMinuteTimeBucket(timeBucket); } if (SpanType.Exit.equals(spanDecorator.getSpanType())) { @@ -193,6 +194,7 @@ public class SegmentParse { spanListeners.forEach(SpanListener::build); } + @GraphComputingMetric(name = "/segment/parse/notifyExitListener") private void notifyExitListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId) { for (SpanListener listener : spanListeners) { @@ -202,6 +204,7 @@ public class SegmentParse { } } + @GraphComputingMetric(name = "/segment/parse/notifyEntryListener") private void notifyEntryListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId) { for (SpanListener listener : spanListeners) { @@ -211,6 +214,7 @@ public class SegmentParse { } } + @GraphComputingMetric(name = "/segment/parse/notifyLocalListener") private void notifyLocalListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId) { for (SpanListener listener : spanListeners) { @@ -220,6 +224,7 @@ public class SegmentParse { } } + @GraphComputingMetric(name = "/segment/parse/notifyFirstListener") private void notifyFirstListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId) { for (SpanListener listener : spanListeners) { @@ -229,6 +234,7 @@ public class SegmentParse { } } + @GraphComputingMetric(name = "/segment/parse/notifyGlobalsListener") private void notifyGlobalsListener(UniqueId uniqueId) { for (SpanListener listener : spanListeners) { if (listener instanceof GlobalTraceIdsListener) { 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 3b3d64edb32ef4c8db02cec1194b1464dfa33db5..02bf416a5724fb192e539651303bf918fc606e3b 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 @@ -22,6 +22,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; /** * @author peng-yongsheng @@ -29,36 +30,33 @@ import java.util.Date; public enum TimeBucketUtils { INSTANCE; + @GraphComputingMetric(name = "/utils/timeBucket/getMinuteTimeBucket") public long getMinuteTimeBucket(long time) { - SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); - String timeStr = minuteDateFormat.format(calendar.getTime()); - return Long.valueOf(timeStr); + + long year = calendar.get(Calendar.YEAR); + long month = calendar.get(Calendar.MONTH) + 1; + long day = calendar.get(Calendar.DAY_OF_MONTH); + long hour = calendar.get(Calendar.HOUR_OF_DAY); + long minute = calendar.get(Calendar.MINUTE); + + return year * 100000000 + month * 1000000 + day * 10000 + hour * 100 + minute; } + @GraphComputingMetric(name = "/utils/timeBucket/getSecondTimeBucket") public long getSecondTimeBucket(long time) { - SimpleDateFormat secondDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); - String timeStr = secondDateFormat.format(calendar.getTime()); - return Long.valueOf(timeStr); - } - public long getHourTimeBucket(long time) { - SimpleDateFormat hourDateFormat = new SimpleDateFormat("yyyyMMddHH"); - Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(time); - String timeStr = hourDateFormat.format(calendar.getTime()) + "00"; - return Long.valueOf(timeStr); - } + long year = calendar.get(Calendar.YEAR); + long month = calendar.get(Calendar.MONTH) + 1; + long day = calendar.get(Calendar.DAY_OF_MONTH); + long hour = calendar.get(Calendar.HOUR_OF_DAY); + long minute = calendar.get(Calendar.MINUTE); + long second = calendar.get(Calendar.SECOND); - public long getDayTimeBucket(long time) { - SimpleDateFormat dayDateFormat = new SimpleDateFormat("yyyyMMdd"); - Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(time); - String timeStr = dayDateFormat.format(calendar.getTime()) + "0000"; - return Long.valueOf(timeStr); + return year * 10000000000L + month * 100000000 + day * 1000000 + hour * 10000 + minute * 100 + second; } public String formatMinuteTimeBucket(long minuteTimeBucket) throws ParseException { diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtilsTest.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtilsTest.java index dcc65998005fd3f65ecf8f4546d26e16ef6c7b5c..f119e3da4436a738b3edb44cac4515ec4e85a44b 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtilsTest.java +++ b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtilsTest.java @@ -18,15 +18,41 @@ package org.apache.skywalking.apm.collector.core.util; -import java.util.TimeZone; -import org.junit.Before; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import org.junit.Assert; +import org.junit.Test; /** - * @author wu-sheng + * @author peng-yongsheng */ public class TimeBucketUtilsTest { - @Before - public void setup() { - TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); + + @Test + public void testGetMinuteTimeBucket() throws ParseException { + SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); + long timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(minuteDateFormat.parse("201803010201").getTime()); + Assert.assertEquals(201803010201L, timeBucket); + } + + @Test + public void testGetSecondTimeBucket() throws ParseException { + SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + long timeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(minuteDateFormat.parse("20180301020102").getTime()); + Assert.assertEquals(20180301020102L, timeBucket); + } + + /** + * Performance tests + * Running with vm option: -javaagent: collector-instrument-agent.jar + * + * @param args + */ + public static void main(String[] args) { + long now = System.currentTimeMillis(); + + for (int i = 0; i < 500000; i++) { + TimeBucketUtils.INSTANCE.getMinuteTimeBucket(now); + } } } diff --git a/apm-collector/apm-collector-core/src/test/resources/log4j2.xml b/apm-collector/apm-collector-core/src/test/resources/log4j2.xml new file mode 100644 index 0000000000000000000000000000000000000000..c9eec4f6e22bc0b68dff05dca8c6151eb68a5f72 --- /dev/null +++ b/apm-collector/apm-collector-core/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + +