Merge branch 'master' into fix/match-failed
This commit is contained in:
Xin,Zhang
GitHub
commit
a086804753
|
|
@ -30,7 +30,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.
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
||||
- 调用链查询
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</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>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</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>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</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>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</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>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<artifactId>apm</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>apm-application-toolkit</artifactId>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-grpc</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>collector-agent-grpc-define</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-grpc</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -41,4 +41,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-jetty</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>collector-agent-jetty-define</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-jetty</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -41,4 +41,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-stream</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -37,4 +37,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-agent-stream</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -52,4 +52,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class CpuMetricPersistenceWorker extends PersistenceWorker<CpuMetric, Cpu
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 115;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMet
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 112;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance,
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return InstHeartBeatPersistenceWorker.class.hashCode();
|
||||
return 113;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetri
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 119;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class GlobalTracePersistenceWorker extends PersistenceWorker<GlobalTrace,
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 120;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class InstPerformancePersistenceWorker extends PersistenceWorker<InstPerf
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return InstPerformancePersistenceWorker.class.hashCode();
|
||||
return 118;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class NodeComponentAggregationWorker extends AggregationWorker<NodeCompon
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeComponentAggregationWorker.class.hashCode();
|
||||
return 104;
|
||||
}
|
||||
|
||||
public static class Factory extends AbstractLocalAsyncWorkerProvider<NodeComponent, NodeComponent, NodeComponentAggregationWorker> {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class NodeComponentPersistenceWorker extends PersistenceWorker<NodeCompon
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeComponentPersistenceWorker.class.hashCode();
|
||||
return 111;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class NodeComponentRemoteWorker extends AbstractRemoteWorker<NodeComponen
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeComponentRemoteWorker.class.hashCode();
|
||||
return 10004;
|
||||
}
|
||||
|
||||
@Override protected void onWork(NodeComponent nodeComponent) throws WorkerException {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class NodeMappingAggregationWorker extends AggregationWorker<NodeMapping,
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeMappingAggregationWorker.class.hashCode();
|
||||
return 105;
|
||||
}
|
||||
|
||||
public static class Factory extends AbstractLocalAsyncWorkerProvider<NodeMapping, NodeMapping, NodeMappingAggregationWorker> {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class NodeMappingPersistenceWorker extends PersistenceWorker<NodeMapping,
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeMappingPersistenceWorker.class.hashCode();
|
||||
return 114;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class NodeMappingRemoteWorker extends AbstractRemoteWorker<NodeMapping, N
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeMappingRemoteWorker.class.hashCode();
|
||||
return 10007;
|
||||
}
|
||||
|
||||
@Override protected void onWork(NodeMapping nodeMapping) throws WorkerException {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class NodeReferenceAggregationWorker extends AggregationWorker<NodeRefere
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeReferenceAggregationWorker.class.hashCode();
|
||||
return 106;
|
||||
}
|
||||
|
||||
public static class Factory extends AbstractLocalAsyncWorkerProvider<NodeReference, NodeReference, NodeReferenceAggregationWorker> {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class NodeReferencePersistenceWorker extends PersistenceWorker<NodeRefere
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 116;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class NodeReferenceRemoteWorker extends AbstractRemoteWorker<NodeReferenc
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return NodeReferenceRemoteWorker.class.hashCode();
|
||||
return 10002;
|
||||
}
|
||||
|
||||
@Override protected void onWork(NodeReference nodeReference) throws WorkerException {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class SegmentCostPersistenceWorker extends PersistenceWorker<SegmentCost,
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return SegmentCostPersistenceWorker.class.hashCode();
|
||||
return 110;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class SegmentPersistenceWorker extends PersistenceWorker<Segment, Segment
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 117;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -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> {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class ServiceEntryPersistenceWorker extends PersistenceWorker<ServiceEntr
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 121;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class ServiceReferenceAggregationWorker extends AggregationWorker<Service
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return ServiceReferenceAggregationWorker.class.hashCode();
|
||||
return 107;
|
||||
}
|
||||
|
||||
public static class Factory extends AbstractLocalAsyncWorkerProvider<ServiceReference, ServiceReference, ServiceReferenceAggregationWorker> {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class ServiceReferencePersistenceWorker extends PersistenceWorker<Service
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return 0;
|
||||
return 109;
|
||||
}
|
||||
|
||||
@Override protected boolean needMergeDBData() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class ServiceReferenceRemoteWorker extends AbstractRemoteWorker<ServiceRe
|
|||
}
|
||||
|
||||
@Override public int id() {
|
||||
return ServiceReferenceRemoteWorker.class.hashCode();
|
||||
return 10005;
|
||||
}
|
||||
|
||||
@Override protected void onWork(ServiceReference serviceReference) throws WorkerException {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -41,4 +41,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-baseline</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>collector-baseline-computing-define</artifactId>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-baseline</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -41,4 +41,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-baseline</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>collector-baseline-scheduler-define</artifactId>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -42,4 +42,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cache</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>collector-cache-define</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cache</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -42,4 +42,4 @@
|
|||
<version>19.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cluster</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cluster</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cluster</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-cluster</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -30,4 +30,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-component</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-component</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -103,10 +103,12 @@ public class BootstrapFlow {
|
|||
if (isAllRequiredModuleStarted) {
|
||||
startupSequence.add(provider);
|
||||
allProviders.remove(i);
|
||||
i--;
|
||||
}
|
||||
} else {
|
||||
startupSequence.add(provider);
|
||||
allProviders.remove(i);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-grpc-manager</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-grpc-manager</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-jetty-manager</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-jetty-manager</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-naming</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-naming</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-queue</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-queue</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-queue</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -42,4 +42,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-remote</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-remote</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-remote</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -39,4 +39,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-storage</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-storage</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@
|
|||
package org.skywalking.apm.collector.storage.es;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.skywalking.apm.collector.core.module.ModuleManager;
|
||||
import org.skywalking.apm.collector.storage.StorageModule;
|
||||
import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;
|
||||
|
|
@ -55,7 +53,8 @@ public class DataTTLKeeperTimer {
|
|||
}
|
||||
|
||||
public void start() {
|
||||
Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::delete, 1, 8, TimeUnit.HOURS);
|
||||
//TODO: Don't release auto delete feature, yet
|
||||
//Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::delete, 1, 8, TimeUnit.HOURS);
|
||||
}
|
||||
|
||||
private void delete() {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-storage</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -34,4 +34,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -57,4 +57,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-ui</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector-ui</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -62,4 +62,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-collector</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -23,4 +23,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-commons</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<artifactId>apm-commons</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<artifactId>apm</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<artifactId>apm</artifactId>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -31,7 +31,8 @@
|
|||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.7.0</grpc.version>
|
||||
<grpc.version>1.8.0</grpc.version>
|
||||
<netty.version>4.1.17.Final</netty.version>
|
||||
<compiler.version>1.6</compiler.version>
|
||||
</properties>
|
||||
|
||||
|
|
@ -40,6 +41,20 @@
|
|||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-netty</artifactId>
|
||||
<version>${grpc.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-codec-http2</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-transport-native-epoll</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-handler-proxy</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
|
|
@ -51,6 +66,21 @@
|
|||
<artifactId>grpc-stub</artifactId>
|
||||
<version>${grpc.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-codec-http2</artifactId>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-handler-proxy</artifactId>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-transport-native-epoll</artifactId>
|
||||
<version>${netty.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
@ -58,7 +88,7 @@
|
|||
<extension>
|
||||
<groupId>kr.motd.maven</groupId>
|
||||
<artifactId>os-maven-plugin</artifactId>
|
||||
<version>1.4.1.Final</version>
|
||||
<version>1.5.0.Final</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
<plugins>
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<groupId>org.skywalking</groupId>
|
||||
<artifactId>apm-sniffer</artifactId>
|
||||
<version>3.3.0-2017</version>
|
||||
<version>3.2.6-2017</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>apm-agent-core</artifactId>
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<jetty.version>9.4.2.v20170220</jetty.version>
|
||||
<grpc.version>1.7.0</grpc.version>
|
||||
<grpc.version>1.8.0</grpc.version>
|
||||
<bytebuddy.version>1.7.6</bytebuddy.version>
|
||||
|
||||
<shade.package>org.skywalking.apm.dependencies</shade.package>
|
||||
|
|
@ -50,6 +50,8 @@
|
|||
<shade.io.grpc.target>${shade.package}.${shade.io.grpc.source}</shade.io.grpc.target>
|
||||
<shade.io.netty.source>io.netty</shade.io.netty.source>
|
||||
<shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
|
||||
<shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
|
||||
<shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -176,6 +178,10 @@
|
|||
<pattern>${shade.io.netty.source}</pattern>
|
||||
<shadedPattern>${shade.io.netty.target}</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>${shade.io.opencensus.source}</pattern>
|
||||
<shadedPattern>${shade.io.opencensus.target}</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
<filters>
|
||||
<filter>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue