Commit Graph

3065 Commits

Author SHA1 Message Date
gaohongtao 318c3db7c9 Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha` 2017-12-15 10:40:23 +08:00
吴晟 Wu Sheng 3a418a41f8
Merge pull request #679 from apache/apache/readme_update
Update readme and remove the annoucement
2017-12-15 10:03:22 +08:00
wu-sheng 14c4734f58 Update more license. 2017-12-15 09:50:53 +08:00
吴晟 Wu Sheng 526c50d4cb
Merge branch 'master' into apache/readme_update 2017-12-15 09:32:01 +08:00
吴晟 Wu Sheng 60a8390fef
Merge pull request #678 from ascrutae/fix/windows-start-script-failed
[Collector] Fix issue that collector start failed in the Windows environment
2017-12-15 09:31:49 +08:00
吴晟 Wu Sheng edf860e213
Merge branch 'master' into fix/windows-start-script-failed 2017-12-15 09:19:08 +08:00
吴晟 Wu Sheng 6796079284
Merge pull request #676 from ascrutae/fix/okhttpclient-issue
[Agent] Fix issue that OkHttpClient plugin doesn't work
2017-12-15 08:22:48 +08:00
ascrutae db75a4a6c0 [Collector] Fix issue that collector start failed in the Windows environment 2017-12-15 06:46:58 +08:00
ascrutae 60eb0d5814 [Agent] Fix issue that OkHttpClient plugin doesn't work 2017-12-14 22:27:14 +08:00
wu-sheng 60f60693c2 update coverall repo token 2017-12-14 17:05:19 +08:00
吴晟 Wu Sheng a99cba7065
Merge pull request #674 from ascrutae/fix/jedis-testcase-failed
[Agent] fix jedis testcase failed
2017-12-14 17:00:03 +08:00
ascrutae 25dda07a84 [Agent] fix jedis testcase failed 2017-12-14 16:47:05 +08:00
吴晟 Wu Sheng 599c852140
Merge pull request #672 from ascrutae/fix/opentracing-plugin-issue
[Agent] Fix the enhance class is incorrect
2017-12-14 12:06:16 +08:00
Xin,Zhang 1dade173ae
Merge branch 'master' into fix/opentracing-plugin-issue 2017-12-14 11:39:19 +08:00
吴晟 Wu Sheng eee5e65798
Merge pull request #671 from ascrutae/feature/trace-context
[Agent] Cannot propagate the context across threads
2017-12-14 11:38:56 +08:00
Xin,Zhang e1da9b5430
Merge branch 'master' into fix/opentracing-plugin-issue 2017-12-14 11:29:07 +08:00
ascrutae 6b14bc861d [Agent] Fix the enhance class is incorrect 2017-12-14 11:24:15 +08:00
ascrutae 9f4532c03b fix miss transform ref data for each span issue 2017-12-14 10:50:14 +08:00
ascrutae ad5fd07343 remove unimport class 2017-12-14 10:10:51 +08:00
Xin,Zhang 7dd91fff96
Merge branch 'master' into feature/trace-context 2017-12-14 10:03:43 +08:00
ascrutae b85ada779c fix the local span cannot ref other trace segment 2017-12-14 10:02:45 +08:00
wu-sheng c1c7838989 update readme. 2017-12-14 09:25:03 +08:00
吴晟 Wu Sheng 419acc16bd
Merge pull request #668 from ascrutae/fix/shade-pacage-incorrect
add relocation config of org.apache.http and org.apache.commons package
2017-12-13 21:22:43 +08:00
吴晟 Wu Sheng 7f98cf902a
Merge branch 'master' into fix/shade-pacage-incorrect 2017-12-13 19:21:59 +08:00
吴晟 Wu Sheng 1a593abd8c
Merge pull request #669 from ascrutae/fix/annotation-activation-plugin-issue
fix issue that the intercept class package name  is incorrect
2017-12-13 19:21:39 +08:00
ascrutae a4b49b28b4 fix issue that the intercept class and the enhance class package name of the trace annotation plugin is incorrect 2017-12-13 18:38:45 +08:00
ascrutae 73d662b1b4 add relocation config of org.apache.http and org.apache.commons 's package 2017-12-13 18:28:03 +08:00
吴晟 Wu Sheng 2fa0a41fbc
Merge pull request #663 from ascrutae/fix/mysql-plugin-issue
fix the sql tag value is null when client using Statement.execute(sql) method
2017-12-13 14:42:02 +08:00
ascrutae 68352251dc fix compile failed issue 2017-12-13 14:06:41 +08:00
吴晟 Wu Sheng 2cfc35d35a
Merge branch 'master' into fix/mysql-plugin-issue 2017-12-13 09:35:59 +08:00
ascrutae c9dbd6d9c3 fix the sql tag value is null when client using Statement.execute(sql) method 2017-12-12 21:37:24 +08:00
wusheng 03d4d31a84 Fix a potential bug for override args of static method. Feedback from @YunaiV @ascrutae 2017-12-12 20:26:01 +08:00
吴晟 Wu Sheng ea37839950
Merge pull request #661 from ascrutae/fix/interceptor-class-incorrect
fix all interceptor class in plugin is incorrect
2017-12-12 14:40:56 +08:00
ascrutae a62076f082 fix all interceptor class in plugin is incorrect 2017-12-12 14:16:45 +08:00
吴晟 Wu Sheng 8d9820322b
Merge pull request #657 from ascrutae/feature/activation-plugin-def-incorrect
fix instrumentation class in activation plugin define is incorrect
2017-12-11 16:21:25 +08:00
ascrutae bcba34c68e fix instrumentation class in activation plugin define is incorrect 2017-12-11 16:19:06 +08:00
吴晟 Wu Sheng 032ade6e3c
Merge pull request #656 from ascrutae/feature/plugin-def-incorrect
fix the instrumentation class in plugin define file is incorrect
2017-12-11 16:05:10 +08:00
wu-sheng b3d98f3c50 Fix test case. 2017-12-11 16:04:45 +08:00
ascrutae b5a7c8fbf0 fix the instrumentation class in plugin define file is incorrect 2017-12-11 16:00:15 +08:00
wusheng 15328202b8 Revove duplicate license headers. 2017-12-11 15:04:26 +08:00
wusheng 05b818e709 Update package name to org.apache.skywalking 2017-12-10 16:32:39 +08:00
wusheng b16d23c148 Update artifactId to "org.apache.skywalking" 2017-12-10 08:21:20 +08:00
wusheng 23133f7d97 Update copyright to Apache Foundation. 2017-12-09 23:38:32 +08:00
peng-yongsheng 9b76ecd218 Change the version of some modules. 2017-12-09 23:31:09 +08:00
peng-yongsheng a9ff0b2812 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
2017-12-09 23:16:11 +08:00
peng-yongsheng f1f519030a Redefine graph id and node id. 2017-12-09 23:09:21 +08:00
吴晟 Wu Sheng e009fce227
Merge pull request #653 from ascrutae/feature/support-grpc-future
support the future stub of grpc framework
2017-12-09 22:05:58 +08:00
吴晟 Wu Sheng 8d9ea103b1
Merge branch 'master' into feature/support-grpc-future 2017-12-09 21:41:22 +08:00
ascrutae c17f955d94 support the future stub of grpc framework 2017-12-09 00:18:43 +08:00
吴晟 Wu Sheng 8607844b20
Update README.md 2017-12-08 23:03:21 +08:00