Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
f1fbc287
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f1fbc287
编写于
11月 22, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into feature/alerting
上级
1f484c5b
21cc39c6
变更
116
展开全部
隐藏空白更改
内联
并排
Showing
116 changed file
with
125 addition
and
135 deletion
+125
-135
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
+1
-1
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
+1
-1
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
+1
-1
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
+1
-1
apm-application-toolkit/apm-toolkit-trace/pom.xml
apm-application-toolkit/apm-toolkit-trace/pom.xml
+1
-1
apm-application-toolkit/pom.xml
apm-application-toolkit/pom.xml
+1
-1
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
...-collector-agent-grpc/collector-agent-grpc-define/pom.xml
+1
-1
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
...ollector-agent-grpc/collector-agent-grpc-provider/pom.xml
+1
-1
apm-collector/apm-collector-agent-grpc/pom.xml
apm-collector/apm-collector-agent-grpc/pom.xml
+1
-1
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
...ollector-agent-jetty/collector-agent-jetty-define/pom.xml
+1
-1
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
...lector-agent-jetty/collector-agent-jetty-provider/pom.xml
+1
-1
apm-collector/apm-collector-agent-jetty/pom.xml
apm-collector/apm-collector-agent-jetty/pom.xml
+1
-1
apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml
...lector-agent-stream/collector-agent-stream-define/pom.xml
+1
-1
apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml
...ctor-agent-stream/collector-agent-stream-provider/pom.xml
+1
-1
apm-collector/apm-collector-agent-stream/pom.xml
apm-collector/apm-collector-agent-stream/pom.xml
+1
-1
apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
...ctor-baseline/collector-baseline-computing-define/pom.xml
+1
-1
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
...or-baseline/collector-baseline-computing-provider/pom.xml
+1
-1
apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
...ctor-baseline/collector-baseline-scheduler-define/pom.xml
+1
-1
apm-collector/apm-collector-baseline/pom.xml
apm-collector/apm-collector-baseline/pom.xml
+1
-1
apm-collector/apm-collector-boot/docker/application.yml
apm-collector/apm-collector-boot/docker/application.yml
+1
-1
apm-collector/apm-collector-boot/pom.xml
apm-collector/apm-collector-boot/pom.xml
+1
-1
apm-collector/apm-collector-boot/src/main/resources/application.yml
...tor/apm-collector-boot/src/main/resources/application.yml
+1
-1
apm-collector/apm-collector-cache/collector-cache-define/pom.xml
...lector/apm-collector-cache/collector-cache-define/pom.xml
+1
-1
apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
...pm-collector-cache/collector-cache-guava-provider/pom.xml
+1
-1
apm-collector/apm-collector-cache/pom.xml
apm-collector/apm-collector-cache/pom.xml
+1
-1
apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
...or/apm-collector-cluster/collector-cluster-define/pom.xml
+1
-1
apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
...ollector-cluster/collector-cluster-redis-provider/pom.xml
+1
-1
apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
...tor-cluster/collector-cluster-standalone-provider/pom.xml
+1
-1
apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
...ctor-cluster/collector-cluster-zookeeper-provider/pom.xml
+1
-1
apm-collector/apm-collector-cluster/pom.xml
apm-collector/apm-collector-cluster/pom.xml
+1
-1
apm-collector/apm-collector-component/client-component/pom.xml
...ollector/apm-collector-component/client-component/pom.xml
+1
-1
apm-collector/apm-collector-component/pom.xml
apm-collector/apm-collector-component/pom.xml
+1
-1
apm-collector/apm-collector-component/server-component/pom.xml
...ollector/apm-collector-component/server-component/pom.xml
+1
-1
apm-collector/apm-collector-core/pom.xml
apm-collector/apm-collector-core/pom.xml
+1
-1
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
...lector-grpc-manager/collector-grpc-manager-define/pom.xml
+1
-1
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
...ctor-grpc-manager/collector-grpc-manager-provider/pom.xml
+1
-1
apm-collector/apm-collector-grpc-manager/pom.xml
apm-collector/apm-collector-grpc-manager/pom.xml
+1
-1
apm-collector/apm-collector-instrument/pom.xml
apm-collector/apm-collector-instrument/pom.xml
+1
-1
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
...ctor-jetty-manager/collector-jetty-manager-define/pom.xml
+1
-1
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
...or-jetty-manager/collector-jetty-manager-provider/pom.xml
+1
-1
apm-collector/apm-collector-jetty-manager/pom.xml
apm-collector/apm-collector-jetty-manager/pom.xml
+1
-1
apm-collector/apm-collector-naming/collector-naming-define/pom.xml
...ctor/apm-collector-naming/collector-naming-define/pom.xml
+1
-1
apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
...-collector-naming/collector-naming-jetty-provider/pom.xml
+1
-1
apm-collector/apm-collector-naming/pom.xml
apm-collector/apm-collector-naming/pom.xml
+1
-1
apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml
...lector-queue/collector-queue-datacarrier-provider/pom.xml
+1
-1
apm-collector/apm-collector-queue/collector-queue-define/pom.xml
...lector/apm-collector-queue/collector-queue-define/pom.xml
+1
-1
apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml
...ollector-queue/collector-queue-disruptor-provider/pom.xml
+1
-1
apm-collector/apm-collector-queue/pom.xml
apm-collector/apm-collector-queue/pom.xml
+1
-1
apm-collector/apm-collector-remote/collector-remote-define/pom.xml
...ctor/apm-collector-remote/collector-remote-define/pom.xml
+1
-1
apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
...m-collector-remote/collector-remote-grpc-provider/pom.xml
+1
-1
apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
...-collector-remote/collector-remote-kafka-provider/pom.xml
+1
-1
apm-collector/apm-collector-remote/pom.xml
apm-collector/apm-collector-remote/pom.xml
+1
-1
apm-collector/apm-collector-storage/collector-storage-define/pom.xml
...or/apm-collector-storage/collector-storage-define/pom.xml
+1
-1
apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
...m-collector-storage/collector-storage-es-provider/pom.xml
+1
-1
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
...ywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
+6
-16
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
...ing/apm/collector/storage/es/StorageModuleEsProvider.java
+4
-4
apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
...m-collector-storage/collector-storage-h2-provider/pom.xml
+1
-1
apm-collector/apm-collector-storage/pom.xml
apm-collector/apm-collector-storage/pom.xml
+1
-1
apm-collector/apm-collector-stream/pom.xml
apm-collector/apm-collector-stream/pom.xml
+1
-1
apm-collector/apm-collector-ui/collector-ui-define/pom.xml
apm-collector/apm-collector-ui/collector-ui-define/pom.xml
+1
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
...ctor/apm-collector-ui/collector-ui-jetty-provider/pom.xml
+1
-1
apm-collector/apm-collector-ui/pom.xml
apm-collector/apm-collector-ui/pom.xml
+1
-1
apm-collector/pom.xml
apm-collector/pom.xml
+1
-1
apm-commons/apm-datacarrier/pom.xml
apm-commons/apm-datacarrier/pom.xml
+1
-1
apm-commons/apm-util/pom.xml
apm-commons/apm-util/pom.xml
+1
-1
apm-commons/pom.xml
apm-commons/pom.xml
+1
-1
apm-network/pom.xml
apm-network/pom.xml
+1
-1
apm-sniffer/apm-agent-core/pom.xml
apm-sniffer/apm-agent-core/pom.xml
+1
-1
apm-sniffer/apm-agent/pom.xml
apm-sniffer/apm-agent/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
...ffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
...m-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
...m-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
...iffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
...sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
...sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
...-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
...k-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
...k-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
...sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
...lugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
...oud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
...niffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
+1
-1
apm-sniffer/apm-test-tools/pom.xml
apm-sniffer/apm-test-tools/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
...olkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
...olkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
...kit-activation/apm-toolkit-logback-1.x-activation/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
...kit-activation/apm-toolkit-opentracing-activation/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
...m-toolkit-activation/apm-toolkit-trace-activation/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/pom.xml
apm-sniffer/apm-toolkit-activation/pom.xml
+1
-1
apm-sniffer/pom.xml
apm-sniffer/pom.xml
+1
-1
docker-compose.yml
docker-compose.yml
+2
-2
pom.xml
pom.xml
+1
-1
未找到文件。
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-application-toolkit
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-application-toolkit
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-application-toolkit
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-application-toolkit
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-application-toolkit/apm-toolkit-trace/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -22,7 +22,7 @@
<parent>
<artifactId>
apm-application-toolkit
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-application-toolkit/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apm-application-toolkit
</artifactId>
...
...
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-grpc
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-grpc
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-grpc/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-jetty
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-jetty
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-jetty/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-stream
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-agent-stream
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-agent-stream/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-baseline
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-baseline
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-baseline
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-baseline/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-boot/docker/application.yml
浏览文件 @
f1fbc287
...
...
@@ -37,4 +37,4 @@ storage:
cluster_nodes
:
{
ES_ADDRESSES
}
index_shards_number
:
2
index_replicas_number
:
0
history_delete_before_days
:
3
ttl
:
7
apm-collector/apm-collector-boot/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-boot/src/main/resources/application.yml
浏览文件 @
f1fbc287
...
...
@@ -37,4 +37,4 @@ ui:
# cluster_nodes: localhost:9300
# index_shards_number: 2
# index_replicas_number: 0
# history_delete_before_days: 3
\ No newline at end of file
# ttl: 7
\ No newline at end of file
apm-collector/apm-collector-cache/collector-cache-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cache
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cache
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cache/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cluster
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cluster
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cluster
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-cluster
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-cluster/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-component/client-component/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector-component
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-component/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-component/server-component/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector-component
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-core/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-grpc-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-grpc-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-grpc-manager/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-instrument/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-jetty-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-jetty-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-jetty-manager/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-naming/collector-naming-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-naming
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-naming
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-naming/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-queue
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-queue/collector-queue-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-queue
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-queue
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-queue/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-remote/collector-remote-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector-remote
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-remote
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-remote
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-remote/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-storage/collector-storage-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-storage
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-storage
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/
HistoryDataDelete
Timer.java
→
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/
DataTTLKeeper
Timer.java
浏览文件 @
f1fbc287
...
...
@@ -22,7 +22,6 @@ 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.core.util.CollectionUtils
;
import
org.skywalking.apm.collector.storage.StorageModule
;
import
org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO
;
import
org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO
;
...
...
@@ -40,14 +39,14 @@ import org.skywalking.apm.collector.storage.dao.IServiceReferencePersistenceDAO;
/**
* @author peng-yongsheng
*/
public
class
HistoryDataDelete
Timer
{
public
class
DataTTLKeeper
Timer
{
private
final
ModuleManager
moduleManager
;
private
final
StorageModuleEsNamingListener
namingListener
;
private
final
String
selfAddress
;
private
final
int
daysBefore
;
public
HistoryDataDelete
Timer
(
ModuleManager
moduleManager
,
public
DataTTLKeeper
Timer
(
ModuleManager
moduleManager
,
StorageModuleEsNamingListener
namingListener
,
String
selfAddress
,
int
daysBefore
)
{
this
.
moduleManager
=
moduleManager
;
this
.
namingListener
=
namingListener
;
...
...
@@ -59,15 +58,6 @@ public class HistoryDataDeleteTimer {
Executors
.
newSingleThreadScheduledExecutor
().
scheduleAtFixedRate
(
this
::
delete
,
1
,
8
,
TimeUnit
.
HOURS
);
}
private
void
tryDelete
()
{
if
(
CollectionUtils
.
isNotEmpty
(
namingListener
.
getAddresses
()))
{
String
firstAddress
=
namingListener
.
getAddresses
().
iterator
().
next
();
if
(
firstAddress
.
equals
(
selfAddress
))
{
delete
();
}
}
}
private
void
delete
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTimeInMillis
(
System
.
currentTimeMillis
());
...
...
@@ -82,11 +72,11 @@ public class HistoryDataDeleteTimer {
calendar
.
set
(
Calendar
.
SECOND
,
59
);
long
endTimestamp
=
calendar
.
getTimeInMillis
();
deleteJVM
Metric
Data
(
startTimestamp
,
endTimestamp
);
deleteTrace
Metric
Data
(
startTimestamp
,
endTimestamp
);
deleteJVM
Related
Data
(
startTimestamp
,
endTimestamp
);
deleteTrace
Related
Data
(
startTimestamp
,
endTimestamp
);
}
private
void
deleteJVM
Metric
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
private
void
deleteJVM
Related
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
ICpuMetricPersistenceDAO
cpuMetricPersistenceDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
ICpuMetricPersistenceDAO
.
class
);
cpuMetricPersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
...
...
@@ -100,7 +90,7 @@ public class HistoryDataDeleteTimer {
memoryPoolMetricPersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
}
private
void
deleteTrace
Metric
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
private
void
deleteTrace
Related
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
IGlobalTracePersistenceDAO
globalTracePersistenceDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IGlobalTracePersistenceDAO
.
class
);
globalTracePersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
浏览文件 @
f1fbc287
...
...
@@ -117,10 +117,10 @@ public class StorageModuleEsProvider extends ModuleProvider {
private
static
final
String
CLUSTER_NODES
=
"cluster_nodes"
;
private
static
final
String
INDEX_SHARDS_NUMBER
=
"index_shards_number"
;
private
static
final
String
INDEX_REPLICAS_NUMBER
=
"index_replicas_number"
;
private
static
final
String
HISTORY_DELETE_BEFORE_DAYS
=
"history_delete_before_days
"
;
private
static
final
String
TIME_TO_LIVE_OF_DATA
=
"ttl
"
;
private
ElasticSearchClient
elasticSearchClient
;
private
HistoryDataDelete
Timer
deleteTimer
;
private
DataTTLKeeper
Timer
deleteTimer
;
@Override
public
String
name
()
{
return
NAME
;
...
...
@@ -163,8 +163,8 @@ public class StorageModuleEsProvider extends ModuleProvider {
ModuleListenerService
moduleListenerService
=
getManager
().
find
(
ClusterModule
.
NAME
).
getService
(
ModuleListenerService
.
class
);
moduleListenerService
.
addListener
(
namingListener
);
Integer
beforeDay
=
(
Integer
)
config
.
getOrDefault
(
HISTORY_DELETE_BEFORE_DAYS
,
3
);
deleteTimer
=
new
HistoryDataDelete
Timer
(
getManager
(),
namingListener
,
uuId
+
0
,
beforeDay
);
Integer
beforeDay
=
(
Integer
)
config
.
getOrDefault
(
TIME_TO_LIVE_OF_DATA
,
3
);
deleteTimer
=
new
DataTTLKeeper
Timer
(
getManager
(),
namingListener
,
uuId
+
0
,
beforeDay
);
}
@Override
public
void
notifyAfterCompleted
()
throws
ServiceNotProvidedException
{
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-storage
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-storage/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-stream/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-ui/collector-ui-define/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-ui
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-ui
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-ui/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-commons/apm-datacarrier/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-commons
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-commons/apm-util/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-commons
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-commons/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-network/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-agent-core/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sniffer
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-agent-core
</artifactId>
...
...
apm-sniffer/apm-agent/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sniffer
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-agent
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-grpc-1.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-httpClient-4.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-jedis-2.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
jetty-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
jetty-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
jetty-plugins
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -25,7 +25,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -22,7 +22,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-mongodb-3.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
nutz-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
nutz-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
nutz-plugins
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sniffer
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-sdk-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -25,7 +25,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-resin-3.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -25,7 +25,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
apm-resin-4.x-plugin
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-sdk-plugin
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
spring-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
spring-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
spring-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
spring-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-sdk-plugin
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
spring-plugins
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -21,7 +21,7 @@
<parent>
<artifactId>
spring-plugins
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
浏览文件 @
f1fbc287
...
...
@@ -24,7 +24,7 @@
<parent>
<groupId>
org.skywalking
</groupId>
<artifactId>
spring-cloud
</artifactId>
<version>
3.
2.5
-2017
</version>
<version>
3.
3.0
-2017
</version>
</parent>
<artifactId>
netflix-plugins
</artifactId>
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-test-tools/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/apm-toolkit-activation/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
apm-sniffer/pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
docker-compose.yml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
pom.xml
浏览文件 @
f1fbc287
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录