Commit Graph

469 Commits

Author SHA1 Message Date
wu-sheng 09b979c5af Fix npe 2017-12-19 15:27:14 +08:00
wusheng 6f1f4cf14f Change network protocol for 5.0 2017-12-18 21:27:24 +08:00
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 14c4734f58 Update more license. 2017-12-15 09:50:53 +08:00
ascrutae 60eb0d5814 [Agent] Fix issue that OkHttpClient plugin doesn't work 2017-12-14 22:27:14 +08:00
ascrutae 25dda07a84 [Agent] fix jedis testcase failed 2017-12-14 16:47:05 +08:00
Xin,Zhang 1dade173ae
Merge branch 'master' into fix/opentracing-plugin-issue 2017-12-14 11:39:19 +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 7f98cf902a
Merge branch 'master' into fix/shade-pacage-incorrect 2017-12-13 19:21:59 +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
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
ascrutae a62076f082 fix all interceptor class in plugin is incorrect 2017-12-12 14:16:45 +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 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
ascrutae c17f955d94 support the future stub of grpc framework 2017-12-09 00:18:43 +08:00
wusheng d458622bb4 Update version to 5.0-2018-preview for new iteration. 2017-12-06 22:06:54 +08:00
吴晟 Wu Sheng 02877d4bbc
Merge branch 'master' into feature/support-oracle-tns-url 2017-12-06 16:32:01 +08:00
ascrutae 9307938976 support TNS URL of oracle plugin 2017-12-06 16:17:01 +08:00
wu-sheng 730c43d501 Fix comment. 2017-12-06 15:24:33 +08:00
wu-sheng 8e86bc6fa2 Fix a comment 2017-12-06 15:06:06 +08:00
吴晟 Wu Sheng 374517ca03
Merge pull request #646 from ascrutae/fix/mysql-5.0.x-plugin-issue
fix mysql 5.0.x plugin issue
2017-12-06 15:01:45 +08:00
ascrutae aa55121b8f refactory code 2017-12-06 14:56:09 +08:00
ascrutae 3f2e7904c3 fix mysql 5.0.x plugin issue 2017-12-06 13:31:26 +08:00
ascrutae b02a873466 support spring mvc spring 4.0 framework 2017-12-06 11:55:12 +08:00
ascrutae 4c7eda8e38 fix match failed issue 2017-12-05 13:41:19 +08:00
Xin,Zhang a086804753
Merge branch 'master' into fix/match-failed 2017-12-05 01:02:21 +08:00
ascrutae e63e033263 fix match failed issue 2017-12-05 00:56:58 +08:00
wusheng 055c760bc0 Set versions, and documents ready for releasing 3.2.6 2017-12-04 22:04:28 +08:00
wusheng 8bc03bddb9 Merge branch 'fix/gRPC-1.8.0'
* fix/gRPC-1.8.0:
  Update netty to 4.1.17
  Update gRPC version. And shade google opencensus in agent.
2017-12-04 21:11:25 +08:00
ascrutae 1fa81783f7 change the remote address of MQ exit span to naming service address 2017-12-04 13:15:56 +08:00
吴晟 Wu Sheng b501bc8189
Update pom.xml 2017-12-04 10:26:22 +08:00
吴晟 Wu Sheng a6fb212018
Merge branch 'master' into feature/support-rocketMQ-plugin 2017-12-04 10:20:21 +08:00
吴晟 Wu Sheng 31970312d1
Update pom.xml 2017-12-04 10:07:27 +08:00
吴晟 Wu Sheng 858f66e850
Merge branch 'master' into master 2017-12-04 10:00:32 +08:00