Commit Graph

2207 Commits

Author SHA1 Message Date
ascrutae ffed1e928f fix operation name that span created by spring plugin is not correct 2017-08-19 18:06:09 +08:00
吴晟 Wu Sheng e782a5871c Merge pull request #363 from ascrutae/zhangxin/fix/trace-issue
fix trace annotation not work
2017-08-19 17:32:42 +08:00
ascrutae c75d893ea2 fix trace annotation not work 2017-08-19 17:11:41 +08:00
吴晟 Wu Sheng 6f06b45c62 Merge pull request #362 from ascrutae/zhangxin/feature/support-trace-annotation
support trace annotation
2017-08-19 07:49:44 +08:00
ascrutae b820a3968b support trace annotation 2017-08-19 06:56:05 +08:00
吴晟 Wu Sheng 998c04e002 Merge pull request #361 from ascrutae/zhangxin/fix/contextmanger-issue
fix create segment failed
2017-08-17 17:52:14 +08:00
ascrutae 987c483db7 fix create segment failed 2017-08-17 17:28:34 +08:00
吴晟 Wu Sheng 7f9cdeafff Merge pull request #359 from wu-sheng/feature/358
Update instance heart beat time that receive from jam metric service.
2017-08-16 23:33:54 +08:00
wusheng 65cd3d7582 Fix compile issue. 2017-08-16 23:25:51 +08:00
吴晟 Wu Sheng def9953522 Merge branch 'master' into feature/358 2017-08-16 23:25:07 +08:00
wusheng 8bfa648bda Provide a new method for creating exit span. 2017-08-16 23:11:39 +08:00
pengys5 b671d63420 Update instance heart beat time that receive from jam metric service.
#358
2017-08-16 23:05:01 +08:00
吴晟 Wu Sheng 2169b11208 Update Config.java
Fix a typo.
2017-08-14 17:23:23 +08:00
吴晟 Wu Sheng 1d558c689c Merge pull request #356 from ascrutae/zhangxin/fix/spring-mvc-issue
fix occur exception when request mapping of method without values
2017-08-14 14:53:26 +08:00
ascrutae 15785ddba0 fix occur exception when request mapping of method without values 2017-08-14 14:36:24 +08:00
吴晟 Wu Sheng a00291f98f Merge pull request #355 from ascrutae/zhangxin/feature/add-default-span-layer
add default span layer
2017-08-12 08:41:05 -05:00
吴晟 Wu Sheng d9ba6e8221 Merge branch 'master' into zhangxin/feature/add-default-span-layer 2017-08-12 08:27:56 -05:00
ascrutae 77069695a8 add default span layer 2017-08-12 21:04:07 +08:00
吴晟 Wu Sheng 2ccee15b96 Merge pull request #353 from wu-sheng/feature/351
Feature/351
2017-08-11 10:55:48 -05:00
吴晟 Wu Sheng 903a15a392 Merge branch 'master' into feature/351 2017-08-11 09:56:41 -05:00
wusheng 604fcdeb7a Fix CI fail. 2017-08-11 22:56:36 +08:00
pengys5 5355fc462a Span web Ui test success.
#351
2017-08-11 22:47:39 +08:00
pengys5 883ee2f7e5 Trace stack web ui test success.
#351
2017-08-11 22:40:02 +08:00
wusheng a0b001db76 no message 2017-08-11 21:42:05 +08:00
wusheng ec575ce007 Fix bugs and refactor EntrySpan and Exitspan. 2017-08-11 21:22:25 +08:00
wusheng ef8b5aaad1 Adjust the springMVC plugin. 2017-08-11 19:12:28 +08:00
吴晟 Wu Sheng 62817eedf7 Merge pull request #352 from ascrutae/zhangxin/feature/spring-mvc-annotation-plugin
support spring mvc annotation plugin
2017-08-11 05:48:55 -05:00
ascrutae fe383773e9 support spring mvc annotation plugin 2017-08-11 18:07:30 +08:00
吴晟 Wu Sheng 9f3434e834 Merge pull request #348 from ascrutae/zhangxin/feature/support-rest-template
Support spring rest template and spring concurrent plugin
2017-08-11 02:15:37 -05:00
吴晟 Wu Sheng 933b25854d Merge branch 'master' into zhangxin/feature/support-rest-template 2017-08-11 02:06:11 -05:00
ascrutae 78bbfd0f9f modify support spring version 2017-08-11 14:55:07 +08:00
吴晟 Wu Sheng 70a59c5e2e Merge pull request #350 from wu-sheng/feature/346
Feature/346 jvm metric save to elastic search test success
2017-08-11 00:16:33 -05:00
吴晟 Wu Sheng ba1254b74f Merge branch 'master' into feature/346 2017-08-10 22:33:34 -05:00
pengys5 b9404f6a97 Throw UnexpectedException when invoke deserialize or serialize method in GC,CPU,MEMORY,MEMORY POOL data define. 2017-08-11 11:19:13 +08:00
pengys5 5012a9bc40 Fixed time bucket test error 2017-08-11 10:41:34 +08:00
ascrutae 2699a0fe14 Merge branch 'zhangxin/feature/support-rest-template' of https://github.com/ascrutae/sky-walking into zhangxin/feature/support-rest-template 2017-08-11 07:13:43 +08:00
ascrutae 0a5dd6691c no message 2017-08-11 07:13:26 +08:00
wusheng f5d5cd3b9b Reset some comments. 2017-08-11 07:13:26 +08:00
wusheng e0442497c0 Reset some comments. 2017-08-11 07:13:26 +08:00
wusheng a897c950e2 Refactor the interceptor method parameter list for SpringMVC plugin. 2017-08-11 07:13:26 +08:00
pengys5 6aebdcdbc6 Change the data type of application instance id from int 64 to int 32 in jvm metric service 2017-08-11 07:13:26 +08:00
pengys5 ce8eaa940d fixed package error 2017-08-10 22:36:21 +08:00
pengys5 258a870c89 Jvm metric save to es test success.
#346
2017-08-10 22:35:20 +08:00
ascrutae e52acd2bcc Merge branch 'master' into zhangxin/feature/support-rest-template 2017-08-10 21:47:35 +08:00
ascrutae 9f912d004a support resttemplate plugin 2017-08-10 21:40:19 +08:00
wusheng 72003d716c Reset some comments. 2017-08-10 20:49:22 +08:00
wusheng f81b02c399 Reset some comments. 2017-08-10 20:45:43 +08:00
吴晟 Wu Sheng 710a5de42d Merge pull request #349 from wu-sheng/feature/refactor-interceptor-param
Refactor the interceptor method parameter list for SpringMVC plugin.
2017-08-10 06:59:13 -05:00
wusheng 992032cf6a Refactor the interceptor method parameter list for SpringMVC plugin. 2017-08-10 17:54:08 +08:00
pengys5 ecc050c63d Add gc metric record persistence, but not test 2017-08-10 00:50:53 +08:00