kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,398 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

2398 Commits

Author SHA1 Message Date
wusheng 23a4dd5732 FIx a test case. 2017-09-23 21:11:55 +08:00
吴晟 Wu Sheng 8b66888cf5 Merge pull request #456 from ascrutae/fix/override-argment-failed 
fix override args failed
 2017-09-23 19:11:40 +08:00
ascrutae 061de44ba7 fix override args failed 2017-09-23 19:02:40 +08:00
吴晟 Wu Sheng 089612d08a Update README_ZH.md 2017-09-23 11:45:51 +08:00
吴晟 Wu Sheng 8a778fdbd4 Update README.md 2017-09-23 11:45:31 +08:00
吴晟 Wu Sheng 5a937fa289 Update README_ZH.md 2017-09-23 10:21:11 +08:00
吴晟 Wu Sheng 38cf773325 Merge pull request #455 from wu-sheng/dev/3.2.1 
Sync Dev/3.2.1
 2017-09-23 09:43:55 +08:00
吴晟 Wu Sheng 5ab84c2f52 Merge pull request #453 from nutzam/master 
add: support nutz mvc and nutz http
 2017-09-23 09:43:04 +08:00
吴晟 Wu Sheng 13b408e3e8 Update PathMappingCache.java 
Update a comment
 2017-09-23 08:37:00 +08:00
wendal chen d38221350c change: Component name for NUTZ_MVC_ANNOTATION, from NutzMVCAnnotation to NutzMVC 2017-09-22 22:41:00 +08:00
wendal chen 1194f0a8fd add: testcase for nutz http 1.x plugin 2017-09-22 20:57:18 +08:00
wendal chen 5934158902 change: nutz http plugins split into three Instrumentation 
change: use ElementMatchers.takesArguments to match Sender(Request)
 2017-09-22 12:11:19 +08:00
wendal chen e68d48a6d4 Merge branch 'dev/3.2.1' of https://github.com/wu-sheng/sky-walking 
# Conflicts:
#	apm-network/src/main/java/org/skywalking/apm/network/trace/component/ComponentsDefine.java
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
 2017-09-22 11:42:12 +08:00
吴晟 Wu Sheng e588186c62 Merge pull request #454 from wu-sheng/dev/3.2.1 
Sync Dev/3.2.1 to master
 2017-09-22 09:23:30 +08:00
吴晟 Wu Sheng d49105f30c Merge pull request #444 from zhangkewei/dev/3.2.1 
fixed the collector online/offline bug in zookeeper
 2017-09-22 09:22:36 +08:00
wendal chen 05bcf2b6dd fix: let nutz-plugins compatible with 3.2.1-2017 
change: using ContextCarrier.items() in 3.2.1-2017
remove: useless javadoc in nutz-plugins
 2017-09-21 20:11:09 +08:00
吴晟 Wu Sheng 3aeaf89761 Merge pull request #445 from ascrutae/feature/support-struts2-plugin 
support struts 2 plugin
 2017-09-21 16:47:53 +08:00
wendal chen 7597b0f067 Merge branch 'dev/3.2.1' of https://github.com/wu-sheng/sky-walking 2017-09-21 16:09:39 +08:00
wendal chen 368535cea1 change: nutz http 1.x without java.lang.reflect.* 
use ConstructorInterceptPoint to get "org.nutz.http.Request",
and store in SkyWalkingDynamicField, then set header in SenderSendInterceptor
 2017-09-21 16:08:26 +08:00
ascrutae ec0259c87e Merge branch 'feature/support-struts2-plugin' of https://github.com/ascrutae/sky-walking into feature/support-struts2-plugin 2017-09-21 15:38:25 +08:00
ascrutae 9dc2fcbcbe support new api of context carrier 2017-09-21 15:38:06 +08:00
wendal chen 64b6c92292 add: support nutz mvc and nutz http 2017-09-21 11:40:35 +08:00
吴晟 Wu Sheng bddd829620 Merge pull request #446 from wu-sheng/feature/new-context-carrier 
New Context Carrier CODING STYLE(API)
 2017-09-21 09:05:30 +08:00
ascrutae 37339fd21d support new api of context carrier 2017-09-20 19:00:51 +08:00
吴晟 Wu Sheng 4ff4e9aee8 Merge pull request #449 from clevertension/dev/3.2.1 
add auto local jar file installation before compile
 2017-09-20 15:25:04 +08:00
clevertension cfe722c705 remove prepare stage 2017-09-20 14:55:53 +08:00
ascrutae 901dca5edd Merge remote-tracking branch 'upstream/feature/new-context-carrier' into feature/support-struts2-plugin 2017-09-20 14:12:36 +08:00
clevertension edd2b742d1 add auto local jar file installation before compile 2017-09-20 14:04:45 +08:00
wusheng 1a76da6cdd Finish codes about new ContextCarrier coding style. 2017-09-20 10:18:22 +08:00
wusheng be992f4106 Fix test case issues 2017-09-19 23:45:12 +08:00
wusheng cc2163b7c2 Fix compile issues. 2017-09-19 23:36:29 +08:00
ascrutae e78e7e4d00 support struts 2 plugin 2017-09-19 23:35:38 +08:00
wusheng 3e2e294d8a Fix some compile issue. (not finished.) 2017-09-19 19:40:44 +08:00
zhangsan b61f590dcb The commit code in ClusterZKDataMonitor's 'process' method,fixed the collector online/offline bug. By 'client.getChildren\(event.getPath\(\), true\);', collector can't get the deleted node. In fact,ClusterZKDataMonitor listening zookeeper 'onNodeChanged' event by use 'if \(listeners.containsKey\(event.getPath\(\)\)\)'. 2017-09-19 18:30:54 +08:00
吴晟 Wu Sheng 7834d7bdb9 Merge pull request #441 from ascrutae/zhangxin/fix/start-failed 
fix start failed issue
 2017-09-19 14:14:10 +08:00
ascrutae 1f2076aa50 fix start failed issue 2017-09-19 13:35:44 +08:00
wusheng e0d50533c4 New context carrier. 2017-09-18 23:12:42 +08:00
wusheng cd1d3a3bcc Fix compile issue. 2017-09-18 21:57:33 +08:00
wusheng 9f4bcf7e3e Optimise ID encoding. Only do once for every ID object. 2017-09-18 21:56:53 +08:00
wusheng 1030ec3a70 Update README 2017-09-17 08:15:28 +08:00
wusheng 099877c2ce Prepare for 3.2 iteration. 2017-09-17 07:54:25 +08:00
吴晟 Wu Sheng 065994a569 Merge pull request #432 from wu-sheng/pengys5-patch-2 
Update README_ZH.md
 2017-09-16 23:02:36 +08:00
吴晟 Wu Sheng 38ba7f8403 Merge pull request #431 from wu-sheng/pengys5-patch-1 
Update README.md
 2017-09-16 23:02:11 +08:00
彭勇升 Buddha c2f7aeb27c Update README_ZH.md 2017-09-16 23:01:06 +08:00
彭勇升 Buddha 83ffdee89f Update README.md 2017-09-16 23:00:28 +08:00
吴晟 Wu Sheng df553f6e60 Merge pull request #429 from ascrutae/zhangxin/feature/collector-image 
support collector image
 2017-09-16 19:19:28 +08:00
吴晟 Wu Sheng c95ac03a33 Merge pull request #430 from wu-sheng/fix/cluster 
Add the implementation of deserialize and serialize method in data de…
 2017-09-16 19:10:41 +08:00
pengys5 ec03cc5cae Instance sort 2017-09-16 17:47:26 +08:00
pengys5 dbdd083800 Add the implementation of deserialize and serialize method in data define class. 2017-09-16 17:34:04 +08:00
ascrutae d50a9f2c29 support collector image 2017-09-16 17:25:55 +08:00