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

2424 Commits

Author SHA1 Message Date
吴晟 Wu Sheng 3fdc389a76 Update .travis.yml 2017-09-27 17:19:15 +08:00
吴晟 Wu Sheng 187cbf30a5 Update .travis.yml 2017-09-27 17:17:02 +08:00
吴晟 Wu Sheng 1b56c88521 Update .travis.yml 2017-09-27 17:08:10 +08:00
吴晟 Wu Sheng ac6f4c3018 Merge pull request #468 from ascrutae/jetty-plugins 
support jetty plugins
 2017-09-27 16:14:33 +08:00
吴晟 Wu Sheng e51abb3018 Merge pull request #470 from ascrutae/fix/spring-annotation-issue 
fix the operation name of spring mvc span is incorrect
 2017-09-27 16:13:57 +08:00
ascrutae 5f880f9576 support jetty plugins 2017-09-27 15:58:02 +08:00
ascrutae 7c279d7da7 fix the operation name of spring mvc span is incorrect 2017-09-27 15:53:34 +08:00
吴晟 Wu Sheng 25036048ae Merge pull request #467 from wu-sheng/fixed/438 
Fixed #438, catch null point exception when collector start up with s…
 2017-09-27 15:16:33 +08:00
吴晟 Wu Sheng b55f9ab7d3 Merge branch 'master' into fixed/438 2017-09-27 15:03:54 +08:00
peng-yongsheng 224ef659d3 Fixed #438, catch null point exception when collector start up with standalone mode. 2017-09-27 14:52:41 +08:00
吴晟 Wu Sheng ea8d4a7dc7 Merge pull request #463 from zhangkewei/master 
rename configPath to config,support custom config file name.
 2017-09-27 14:45:24 +08:00
吴晟 Wu Sheng ab52bdb63c Merge branch 'master' into master 2017-09-27 14:26:10 +08:00
吴晟 Wu Sheng 02f939a4e5 Merge pull request #464 from wu-sheng/feature/401 
Provide error and application query condition in trace stack UI.
 2017-09-27 12:48:53 +08:00
吴晟 Wu Sheng 72576928df Merge branch 'master' into feature/401 2017-09-27 12:09:15 +08:00
peng-yongsheng d897ecccbc Provide error and application query condition in trace stack UI. 
#401
 2017-09-27 12:05:48 +08:00
zhangkewei 3dba4644ee rename configPath to config,support custom config file name. 2017-09-27 10:35:56 +08:00
吴晟 Wu Sheng 6c9019993c Merge pull request #461 from wu-sheng/news/partner-list 
Add Shurenyun on the partner list
 2017-09-27 06:19:56 +08:00
wusheng 4b9767b564 Upload logo link. 2017-09-26 22:35:28 +08:00
wusheng e1e1123dc4 Add shurenyun on the commercial support partner list. 2017-09-26 22:30:23 +08:00
吴晟 Wu Sheng 928e782d43 Merge pull request #458 from ascrutae/zhangxin/fix/spring-operationName-failed 
fix issue that the span  operation name of spring mvc is null
 2017-09-25 16:28:58 +08:00
ascrutae 8968db0346 fix issue that the span operation name of spring mvc is null 2017-09-25 15:45:11 +08:00
吴晟 Wu Sheng fd57c7ce41 Update README_ZH.md 2017-09-25 09:26:41 +08:00
吴晟 Wu Sheng e7dfc93eaf Update README.md 2017-09-25 09:25:30 +08:00
wusheng 7e8ec8c886 Fix typo. 2017-09-24 22:15:41 +08:00
wusheng a4835558bc no message 2017-09-24 22:10:18 +08:00
wusheng 16eeee2a6c Update skywalking contributor group. 2017-09-24 22:09:19 +08:00
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