Commit Graph

2248 Commits

Author SHA1 Message Date
吴晟 Wu Sheng 39652d9439 Merge pull request #392 from ascrutae/zhangxin/feature/package-output-dir
Unify package out directory
2017-09-04 20:51:55 +08:00
吴晟 Wu Sheng d0a0a4a518 Merge pull request #393 from ascrutae/zhangxin/feature/adjust-context-trace-project
Combine context trace project and context trace project
2017-09-04 20:51:41 +08:00
ascrutae dd8e066249 Combine context trace project and context trace project 2017-09-04 16:16:35 +08:00
ascrutae 8f6ef439c4 Unify package out directory 2017-09-04 11:08:21 +08:00
吴晟 Wu Sheng 30a25c8aad Merge pull request #386 from wu-sheng/feature/365
Performance evaluation test result:
2017-09-03 19:05:01 +08:00
吴晟 Wu Sheng f1a82f27fc Merge branch 'master' into feature/365 2017-09-03 17:38:14 +08:00
pengys5 2178a736a9 fixed check style error 2017-09-03 16:39:26 +08:00
pengys5 a9ff88fe95 Performance evaluation test result:
Because of laptop just have 100M network card and sata disk, so 100 million segment process by collector used 255 second, but cpu just used 28%
2017-09-03 16:19:44 +08:00
吴晟 Wu Sheng 857de42598 Merge pull request #385 from wu-sheng/feature/365
Jvm metric test success.
2017-09-02 18:42:36 +08:00
吴晟 Wu Sheng f281f842eb Merge branch 'master' into feature/365 2017-09-02 18:33:03 +08:00
pengys5 bdf29e5a92 Jvm metric test success.
#365
2017-09-02 18:11:53 +08:00
吴晟 Wu Sheng 7deeedea63 Merge pull request #384 from ascrutae/zhangxin/fix/jdbc-issue
fix jdbc plugin issue
2017-09-01 22:39:37 +08:00
ascrutae 0baf691ae4 fix jdbc plugin issue 2017-09-01 12:12:21 +08:00
吴晟 Wu Sheng 61b4a080b7 Merge pull request #382 from ascrutae/zhangxin/feature/netfilx-fegin-plugin
support netflix fegin plugin
2017-08-31 22:34:06 +08:00
ascrutae e685ef90d0 support netflix fegin plugin 2017-08-31 22:23:03 +08:00
吴晟 Wu Sheng ab677f2028 Merge pull request #378 from ascrutae/zhangxin/feature/filter-svg
add svg ignore
2017-08-31 10:09:38 +08:00
ascrutae f6665c4296 add svg ignore 2017-08-31 09:57:20 +08:00
吴晟 Wu Sheng 9b9701845e Merge pull request #377 from wu-sheng/feature/373
Feature/373 service reference finish
2017-08-30 23:19:51 +08:00
吴晟 Wu Sheng 76a8a12a8c Merge branch 'master' into feature/373 2017-08-30 23:07:06 +08:00
pengys5 34c5263aa5 Fixed style check failure 2017-08-30 22:40:43 +08:00
pengys5 d3db2d7fd4 Service reference finish and test success.
#373
2017-08-30 22:24:05 +08:00
吴晟 Wu Sheng a04843a6c6 Merge pull request #376 from ascrutae/zhangxin/fix/tomcat-error-capture
Fix issue that tomcat plugin cannot capture exception
2017-08-29 22:32:58 +08:00
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
pengys5 167dc818b4 Delete service and node reference entity, rename service and node reference sum entity to reference. 2017-08-26 18:21:07 +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