Commit Graph

2225 Commits

Author SHA1 Message Date
ascrutae fa42cd47b5 Fix issue that tomcat plugin cannot capture exception 2017-08-29 22:15:59 +08:00
吴晟 Wu Sheng aac05bce78 Update README.md 2017-08-29 17:39:10 +08:00
吴晟 Wu Sheng e265b583a8 Update README.md 2017-08-28 17:13:05 +08:00
吴晟 Wu Sheng ee8ac2eb90 Merge pull request #372 from wu-sheng/feature/354
Trace dag web ui test success.
2017-08-25 17:44:59 +08:00
pengys5 2db52c1fca Trace dag web ui test success.
#354
2017-08-25 16:05:56 +08:00
吴晟 Wu Sheng 7f5248c5d5 Merge pull request #369 from wu-sheng/feature/365
Feature/365
2017-08-22 09:24:06 +08:00
吴晟 Wu Sheng 73d309da00 Merge branch 'master' into feature/365 2017-08-22 09:14:50 +08:00
pengys5 166112074b Instance health web ui working with collector success.
#365
2017-08-21 23:59:03 +08:00
吴晟 Wu Sheng 2fe5362af4 Merge pull request #368 from wu-sheng/feature/367
Feature/367 move data define to storage module
2017-08-20 19:46:56 +08:00
pengys5 0149dcf2af Merge branch 'feature/367' into feature/365
# Conflicts:
#	apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java

#365
2017-08-20 19:45:57 +08:00
吴晟 Wu Sheng d57a85aa3a Merge branch 'master' into feature/367 2017-08-20 19:41:38 +08:00
pengys5 0bf8ec444c fixed check style failed 2017-08-20 15:29:58 +08:00
pengys5 5f30a3bbc0 1. Add remote module with grpc
2. Move all data define to storage module

#367
2017-08-20 15:17:12 +08:00
pengys5 a6d9111d7c no message 2017-08-20 14:27:08 +08:00
吴晟 Wu Sheng 2de7fefddc Merge pull request #364 from ascrutae/zhangxin/fix/spring-plugin-issue
fix operation name that span created by spring plugin is not correct
2017-08-19 18:33:50 +08:00
ascrutae ffed1e928f fix operation name that span created by spring plugin is not correct 2017-08-19 18:06:09 +08:00
pengys5 c1c7d9b8a5 The rest interface for instance health web ui test success.
#360
2017-08-19 17:51:11 +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
pengys5 118713698d instance health web ui search interface finish but not test.
#360
2017-08-17 23:53:34 +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
pengys5 a84cb315c8 Provide the service that use for get last heart beat time.
#351
2017-08-17 16:34:46 +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