Merge branch 'master' into feature/alerting

# Conflicts:
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java
#	apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java

README.md

 Sky Walking | [中文](README_ZH.md)
 ==========
 
+# Announcement:
+## SkyWalking has been accepted as an incubator project by Apache Foundation. All pull requests can't be accepted until Apache/SkyWalking repository established.
+
 <img src="https://skywalkingtest.github.io/page-resources/3.0/skywalking.png" alt="Sky Walking logo" height="90px" align="right" />
 
 **SkyWalking 3**: APM for Distributed Systems, also known Distributed Tracing System. 
@@ -30,7 +33,7 @@ Sky Walking | [中文](README_ZH.md)
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.
 
 # Screenshots
-- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan).
+- Discovery topological graph of application clusters automatically.
 <img src="https://skywalkingtest.github.io/page-resources/3.2.1/topological_graph_test_project.png"/>
 
 - Trace query.

README_ZH.md

@@ -19,7 +19,7 @@ Sky Walking | [English](README.md)
   * 使用 [**@Trace**](docs/cn/Application-toolkit-trace-CN.md) 标注追踪业务方法
   * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
 * 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 
-  * [如何将探针的Metric和Trace数据上传到Collector？]()
+  * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)
 * UI工程请查看 [skywalking-ui](https://github.com/OpenSkywalking/skywalking-ui)
 * 中文QQ群：392443393
 
@@ -33,7 +33,7 @@ Sky Walking | [English](README.md)
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.
 
 # Screenshots
-- 追踪基于 dubbox 和 [motan](https://github.com/weibocom/motan)的分布式系统，生成的拓扑截图
+- 分布式系统拓扑图自动发现
 <img src="https://skywalkingtest.github.io/page-resources/3.2.1/topological_graph_test_project.png?forceUpdate=0"/>
 
 - 调用链查询

apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,6 +49,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>none</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>

apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,6 +49,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>none</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>

apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,6 +49,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>none</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>

apm-application-toolkit/apm-toolkit-opentracing/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-application-toolkit/apm-toolkit-trace/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apm-application-toolkit</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,6 +41,7 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>none</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>

apm-application-toolkit/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apm</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apm-application-toolkit</artifactId>

apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <artifactId>apm-collector-agent-grpc</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>collector-agent-grpc-define</artifactId>
     <packaging>jar</packaging>
 
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-agent-grpc</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-agent-grpc/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,4 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <artifactId>apm-collector-agent-jetty</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>collector-agent-jetty-define</artifactId>
     <packaging>jar</packaging>
 
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-agent-jetty</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-agent-jetty/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,4 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-agent-stream</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,4 +37,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-agent-stream</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -57,4 +57,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java

@@ -42,7 +42,7 @@ public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker<Segme
     }
 
     @Override public int id() {
-        return SegmentStandardizationWorker.class.hashCode();
+        return 108;
     }
 
     @Override protected void onWork(SegmentStandardization segmentStandardization) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class CpuMetricPersistenceWorker extends PersistenceWorker<CpuMetric, Cpu
     }
 
     @Override public int id() {
-        return 0;
+        return 115;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMet
     }
 
     @Override public int id() {
-        return 0;
+        return 112;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java

@@ -37,7 +37,7 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance,
     }
 
     @Override public int id() {
-        return InstHeartBeatPersistenceWorker.class.hashCode();
+        return 113;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetri
     }
 
     @Override public int id() {
-        return 0;
+        return 119;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java

@@ -33,7 +33,7 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
 public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker<MemoryPoolMetric, MemoryPoolMetric> {
 
     @Override public int id() {
-        return 0;
+        return 122;
     }
 
     public MemoryPoolMetricPersistenceWorker(ModuleManager moduleManager) {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java

@@ -40,7 +40,7 @@ public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker<Applic
     }
 
     @Override public int id() {
-        return ApplicationRegisterRemoteWorker.class.hashCode();
+        return 10006;
     }
 
     @Override protected void onWork(Application message) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java

@@ -50,7 +50,7 @@ public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker<Ap
     }
 
     @Override public int id() {
-        return ApplicationRegisterSerialWorker.class.hashCode();
+        return 101;
     }
 
     @Override protected void onWork(Application application) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java

@@ -36,7 +36,7 @@ public class InstanceRegisterRemoteWorker extends AbstractRemoteWorker<Instance,
     private final Logger logger = LoggerFactory.getLogger(InstanceRegisterRemoteWorker.class);
 
     @Override public int id() {
-        return InstanceRegisterRemoteWorker.class.hashCode();
+        return 10001;
     }
 
     InstanceRegisterRemoteWorker(ModuleManager moduleManager) {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java

@@ -48,7 +48,7 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Insta
     }
 
     @Override public int id() {
-        return InstanceRegisterSerialWorker.class.hashCode();
+        return 102;
     }
 
     @Override protected void onWork(Instance instance) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java

@@ -40,7 +40,7 @@ public class ServiceNameRegisterRemoteWorker extends AbstractRemoteWorker<Servic
     }
 
     @Override public int id() {
-        return ServiceNameRegisterRemoteWorker.class.hashCode();
+        return 10000;
     }
 
     @Override protected void onWork(ServiceName serviceName) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java

@@ -50,7 +50,7 @@ public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker<Se
     }
 
     @Override public int id() {
-        return ServiceNameRegisterSerialWorker.class.hashCode();
+        return 100;
     }
 
     @Override protected void onWork(ServiceName serviceName) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java

@@ -34,7 +34,7 @@ public class ApplicationComponentAggregationWorker extends AggregationWorker<App
     }
 
     @Override public int id() {
-        return ApplicationComponentAggregationWorker.class.hashCode();
+        return 104;
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<ApplicationComponent, ApplicationComponent, ApplicationComponentAggregationWorker> {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java

@@ -36,7 +36,7 @@ public class ApplicationComponentRemoteWorker extends AbstractRemoteWorker<Appli
     }
 
     @Override public int id() {
-        return ApplicationComponentRemoteWorker.class.hashCode();
+        return 10005;
     }
 
     @Override protected void onWork(ApplicationComponent applicationComponent) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java

@@ -34,7 +34,7 @@ public class ApplicationMappingAggregationWorker extends AggregationWorker<Appli
     }
 
     @Override public int id() {
-        return ApplicationMappingAggregationWorker.class.hashCode();
+        return 105;
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<ApplicationMapping, ApplicationMapping, ApplicationMappingAggregationWorker> {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java

@@ -36,7 +36,7 @@ public class ApplicationMappingRemoteWorker extends AbstractRemoteWorker<Applica
     }
 
     @Override public int id() {
-        return ApplicationMappingRemoteWorker.class.hashCode();
+        return 10007;
     }
 
     @Override protected void onWork(ApplicationMapping applicationMapping) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class ApplicationMetricPersistenceWorker extends PersistenceWorker<Applic
     }
 
     @Override public int id() {
-        return ApplicationMetricPersistenceWorker.class.hashCode();
+        return 111;
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricRemoteWorker.java

@@ -36,7 +36,7 @@ public class ApplicationMetricRemoteWorker extends AbstractRemoteWorker<Applicat
     }
 
     @Override public int id() {
-        return ApplicationMetricRemoteWorker.class.hashCode();
+        return 10002;
     }
 
     @Override protected void onWork(ApplicationMetric applicationMetric) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java

@@ -37,7 +37,7 @@ public class GlobalTracePersistenceWorker extends PersistenceWorker<GlobalTrace,
     }
 
     @Override public int id() {
-        return 0;
+        return 120;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class InstanceMetricPersistenceWorker extends PersistenceWorker<InstanceM
     }
 
     @Override public int id() {
-        return InstanceMetricPersistenceWorker.class.hashCode();
+        return 118;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostPersistenceWorker.java

@@ -37,7 +37,7 @@ public class SegmentCostPersistenceWorker extends PersistenceWorker<SegmentCost,
     }
 
     @Override public int id() {
-        return SegmentCostPersistenceWorker.class.hashCode();
+        return 110;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentPersistenceWorker.java

@@ -37,7 +37,7 @@ public class SegmentPersistenceWorker extends PersistenceWorker<Segment, Segment
     }
 
     @Override public int id() {
-        return 0;
+        return 117;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryAggregationWorker.java

@@ -34,7 +34,7 @@ public class ServiceEntryAggregationWorker extends AggregationWorker<ServiceEntr
     }
 
     @Override public int id() {
-        return ServiceEntryAggregationWorker.class.hashCode();
+        return 103;
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<ServiceEntry, ServiceEntry, ServiceEntryAggregationWorker> {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryPersistenceWorker.java

@@ -37,7 +37,7 @@ public class ServiceEntryPersistenceWorker extends PersistenceWorker<ServiceEntr
     }
 
     @Override public int id() {
-        return 0;
+        return 121;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryRemoteWorker.java

@@ -36,7 +36,7 @@ public class ServiceEntryRemoteWorker extends AbstractRemoteWorker<ServiceEntry,
     }
 
     @Override public int id() {
-        return ServiceEntryRemoteWorker.class.hashCode();
+        return 10003;
     }
 
     @Override protected void onWork(ServiceEntry serviceEntry) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricPersistenceWorker.java

@@ -37,7 +37,7 @@ public class ServiceMetricPersistenceWorker extends PersistenceWorker<ServiceMet
     }
 
     @Override public int id() {
-        return ServiceMetricPersistenceWorker.class.hashCode();
+        return 116;
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricRemoteWorker.java

@@ -36,7 +36,7 @@ public class ServiceMetricRemoteWorker extends AbstractRemoteWorker<ServiceMetri
     }
 
     @Override public int id() {
-        return ServiceMetricRemoteWorker.class.hashCode();
+        return 10004;
     }
 
     @Override protected void onWork(ServiceMetric serviceMetric) throws WorkerException {

apm-collector/apm-collector-agent-stream/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,4 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java

@@ -37,7 +37,7 @@ public class AlertingListPersistenceWorker extends PersistenceWorker<AlertingLis
     }
 
     @Override public int id() {
-        return 0;
+        return 114;
     }
 
     @Override protected boolean needMergeDBData() {

apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <artifactId>apm-collector-baseline</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>collector-baseline-computing-define</artifactId>
 
 
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-baseline</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,4 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <artifactId>apm-collector-baseline</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>collector-baseline-scheduler-define</artifactId>
 
 
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-baseline/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,4 +42,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-boot/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cache/collector-cache-define/pom.xml

@@ -23,11 +23,11 @@
     <parent>
         <artifactId>apm-collector-cache</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>collector-cache-define</artifactId>
     <packaging>jar</packaging>
 
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-cache</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,4 +42,4 @@
             <version>19.0</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-cluster</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-cluster</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-cluster</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-cluster</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-cluster/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,4 +30,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-component/client-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector-component</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-component/server-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector-component</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/graph/GraphNodeFinder.java

@@ -30,25 +30,6 @@ public class GraphNodeFinder {
         this.graph = graph;
     }
 
-    /**
-     * Find an exist node to build the graph.
-     *
-     * @param handlerId of specific node in graph.
-     * @param outputClass of the found node
-     * @param <NODEOUTPUT> type of given output class
-     * @return Node instance.
-     */
-    public <NODEOUTPUT> Node<?, NODEOUTPUT> findNode(int handlerId, Class<NODEOUTPUT> outputClass) {
-        ConcurrentHashMap<Integer, Node> graphNodeIndex = graph.getNodeIndex();
-        Node node = graphNodeIndex.get(handlerId);
-        if (node == null) {
-            throw new NodeNotFoundException("Can't find node with handlerId="
-                + handlerId
-                + " in graph[" + graph.getId() + "]");
-        }
-        return node;
-    }
-
     public Next findNext(int handlerId) {
         ConcurrentHashMap<Integer, Node> graphNodeIndex = graph.getNodeIndex();
         Node node = graphNodeIndex.get(handlerId);

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/BootstrapFlow.java

@@ -103,10 +103,12 @@ public class BootstrapFlow {
                     if (isAllRequiredModuleStarted) {
                         startupSequence.add(provider);
                         allProviders.remove(i);
+                        i--;
                     }
                 } else {
                     startupSequence.add(provider);
                     allProviders.remove(i);
+                    i--;
                 }
             }
 

apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/graph/GraphManagerTest.java

@@ -105,15 +105,6 @@ public class GraphManagerTest {
         Next next = GraphManager.INSTANCE.findGraph(5).toFinder().findNext(3);
     }
 
-    @Test
-    public void testFindNode() {
-        Graph<String> graph = GraphManager.INSTANCE.createIfAbsent(6, String.class);
-        graph.addNode(new Node1Processor()).addNext(new Node2Processor());
-
-        Node<?, Integer> foundNode = GraphManager.INSTANCE.findGraph(6).toFinder().findNode(2, Integer.class);
-        foundNode.addNext(new Node4Processor());
-    }
-
     @Test
     public void testDeadEndWay() {
         Graph<String> graph = GraphManager.INSTANCE.createIfAbsent(7, String.class);

apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-grpc-manager</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-grpc-manager</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-grpc-manager/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-instrument/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-jetty-manager</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-jetty-manager</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-jetty-manager/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-naming/collector-naming-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-naming</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-naming</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-naming/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-queue</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-queue/collector-queue-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-queue</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-queue</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-queue/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,4 +42,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-remote/collector-remote-define/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector-remote</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-remote</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-remote</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-remote/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,4 +39,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-storage/collector-storage-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-storage</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-storage</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-storage</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,4 +34,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-stream/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -57,4 +57,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-ui/collector-ui-define/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-ui</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-collector-ui</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -62,4 +62,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/apm-collector-ui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-collector</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,4 +23,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

apm-collector/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-commons/apm-datacarrier/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm-commons</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-commons/apm-util/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apm-commons</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-commons/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apm</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-network/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apm</artifactId>
         <groupId>org.skywalking</groupId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

apm-network/src/main/java/org/skywalking/apm/network/trace/component/ComponentsDefine.java

@@ -71,6 +71,11 @@ public class ComponentsDefine {
 
     public static final OfficialComponent GRPC = new OfficialComponent(23, "GRPC");
 
+    public static final OfficialComponent ELASTIC_JOB = new OfficialComponent(24, "ElasticJob");
+  
+    public static final OfficialComponent ROCKET_MQ = new OfficialComponent(25, "RocketMQ");
+
+
     private static ComponentsDefine instance = new ComponentsDefine();
 
     private String[] components;
@@ -80,7 +85,7 @@ public class ComponentsDefine {
     }
 
     public ComponentsDefine() {
-        components = new String[24];
+        components = new String[26];
         addComponent(TOMCAT);
         addComponent(HTTPCLIENT);
         addComponent(DUBBO);
@@ -104,6 +109,8 @@ public class ComponentsDefine {
         addComponent(SHARDING_JDBC);
         addComponent(POSTGRESQL);
         addComponent(GRPC);
+        addComponent(ELASTIC_JOB);
+        addComponent(ROCKET_MQ);
     }
 
     private void addComponent(OfficialComponent component) {

apm-sniffer/apm-agent-core/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.skywalking</groupId>
         <artifactId>apm-sniffer</artifactId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
 
     <artifactId>apm-agent-core</artifactId>

apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java

@@ -72,7 +72,9 @@ public class HierarchyMatch implements IndirectMatch {
             matchHierarchyClass(implInterface, parentTypes);
         }
 
-        matchHierarchyClass(typeDescription.getSuperClass(), parentTypes);
+        if (typeDescription.getSuperClass() != null) {
+            matchHierarchyClass(typeDescription.getSuperClass(), parentTypes);
+        }
 
         if (parentTypes.size() == 0) {
             return true;

apm-sniffer/apm-agent/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.skywalking</groupId>
         <artifactId>apm-sniffer</artifactId>
-        <version>3.3.0-2017</version>
+        <version>5.0-2018-preview</version>
     </parent>
 
     <artifactId>apm-agent</artifactId>