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

2469 Commits

Author SHA1 Message Date
吴晟 Wu Sheng 13920ea5a9 Merge pull request #489 from wu-sheng/revert-481-ilucky-spymemcached 
Revert "Support SpyMemcached V2.x"
 2017-10-08 14:54:18 +08:00
吴晟 Wu Sheng caffba4ee8 Revert "Support SpyMemcached V2.x" 2017-10-08 01:53:46 -05:00
吴晟 Wu Sheng 57860b9521 Merge pull request #481 from IluckySi/ilucky-spymemcached 
Support SpyMemcached V2.x
 2017-10-08 14:27:18 +08:00
吴晟 Wu Sheng 02cc6fab1c Merge branch 'master' into ilucky-spymemcached 2017-10-08 14:13:54 +08:00
IluckySi 22deca0484 Support Spymemcached V2.0 2017-10-08 14:06:34 +08:00
吴晟 Wu Sheng 1b6a332468 Revert "support @RequestMapping annotation of spring 3.x" 2017-10-07 21:54:33 +08:00
ascrutae 2153ab09b6 support @RequestMapping annotation of spring 3.x 2017-10-07 21:54:32 +08:00
吴晟 Wu Sheng f46b9ec4a5 Update README.md 2017-10-07 21:54:32 +08:00
吴晟 Wu Sheng 50e29b6dd0 Update README_ZH.md 2017-10-07 21:54:32 +08:00
吴晟 Wu Sheng 5f747e5ead Update SkyWalkingAgent.java 
Fix bug.
 2017-10-07 21:54:32 +08:00
wusheng b806bf4692 Change version for next iteration. 2017-10-07 21:54:32 +08:00
clevertension 7a86adc64b add more special chars 2017-10-07 21:54:32 +08:00
clevertension 48738abf53 fix unit test 2017-10-07 21:54:32 +08:00
吴晟 Wu Sheng 4ca612f65e Update TraceSegmentServiceClient.java 
Upstream log can't output correctly.
 2017-10-07 21:54:32 +08:00
clevertension 8244256a96 fix Illegal group reference 2017-10-07 21:54:32 +08:00
wusheng 2647a906e3 Support multi plugin defines targeting the same class. Relate to #402, but more than that. e.g. Enhance a class in the certain version library, but we need multi plugins to do so, like @clevertension ’s #465 2017-10-07 21:54:31 +08:00
吴晟 Wu Sheng 6e3ad02d56 Merge pull request #478 from wu-sheng/feature/multi-enhance 
Support multi plugin defines targeting the same class.
 2017-09-30 16:09:33 +08:00
吴晟 Wu Sheng 991c031f8c Merge branch 'master' into feature/multi-enhance 2017-09-30 15:44:05 +08:00
吴晟 Wu Sheng 199764683f Update SkyWalkingAgent.java 
Fix bug.
 2017-09-30 15:42:42 +08:00
吴晟 Wu Sheng 223ee8a2d6 Merge pull request #487 from wu-sheng/revert-486-zhangxin/fix/support-spring-3.x 
Revert "support  @RequestMapping annotation of spring 3.x"
 2017-09-30 15:09:51 +08:00
吴晟 Wu Sheng d56aa6effd Revert "support @RequestMapping annotation of spring 3.x" 2017-09-30 15:08:47 +08:00
吴晟 Wu Sheng 55edf9780b Merge pull request #486 from ascrutae/zhangxin/fix/support-spring-3.x 
support  @RequestMapping annotation of spring 3.x
 2017-09-30 14:07:37 +08:00
ascrutae 62ffa4204b support @RequestMapping annotation of spring 3.x 2017-09-30 13:32:49 +08:00
IluckySi 1a36dc80e3 Support SpyMemcached V2.x 2017-09-30 11:43:52 +08:00
吴晟 Wu Sheng 131db17a29 Update README.md 2017-09-30 09:31:10 +08:00
吴晟 Wu Sheng e040e897ee Update README_ZH.md 2017-09-30 09:30:46 +08:00
wusheng d61297d6b4 Merge branch 'master' into feature/multi-enhance 
* master:
  Change version for next iteration.
  add more special chars
  fix unit test
  fix Illegal group reference
  Update TraceSegmentServiceClient.java
 2017-09-29 17:23:35 +08:00
wusheng b16963a4bf Change version for next iteration. 2017-09-29 17:18:14 +08:00
吴晟 Wu Sheng 1370f3ced0 Merge pull request #482 from clevertension/my-main 
fix Illegal group reference
 2017-09-29 16:02:44 +08:00
clevertension ed46538a4a add more special chars 2017-09-29 15:23:37 +08:00
clevertension 016ab5285a fix unit test 2017-09-29 15:12:21 +08:00
吴晟 Wu Sheng 0bd60b8c28 Merge branch 'master' into my-main 2017-09-29 14:50:27 +08:00
clevertension f969222d83 fix Illegal group reference 2017-09-29 14:48:47 +08:00
吴晟 Wu Sheng ea398f0552 Update TraceSegmentServiceClient.java 
Upstream log can't output correctly.
 2017-09-29 14:48:34 +08:00
wusheng a75d6bdce1 Support multi plugin defines targeting the same class. Relate to #402, but more than that. e.g. Enhance a class in the certain version library, but we need multi plugins to do so, like @clevertension ’s #465 2017-09-29 09:45:36 +08:00
吴晟 Wu Sheng 4a874676e5 Merge pull request #473 from wu-sheng/feature/3.2.2-version 
Version change, 3.2.1 to 3.2.2
 2017-09-28 11:10:01 +08:00
peng-yongsheng 0d13b27362 Version change 2017-09-28 10:54:16 +08:00
wusheng 9efa734cd0 Update screenshots. 2017-09-28 09:35:43 +08:00
wusheng 5e1931a37d Update readme. 2017-09-28 08:55:36 +08:00
wusheng d48c629098 Update screenshots. 2017-09-28 08:50:30 +08:00
吴晟 Wu Sheng 27e5bad665 Merge pull request #471 from wu-sheng/fixed/469 
fixed #469
 2017-09-27 18:45:17 +08:00
吴晟 Wu Sheng edaaa305bf Merge pull request #472 from ascrutae/fix/log-encode-issue 
fix log encode issue and check style failured
 2017-09-27 18:44:25 +08:00
peng-yongsheng 5609ef2996 fixed #469 
because of remove the collection item action inside of collection for each action.
 2017-09-27 18:02:25 +08:00
吴晟 Wu Sheng 96593af366 Update .travis.yml 2017-09-27 17:24:00 +08:00
吴晟 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
ascrutae d68fa5f6e0 fix log encode issue and check style failured 2017-09-27 17:16:41 +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