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

2182 Commits

Author SHA1 Message Date
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
pengys5 b452cdd208 Add memory pool metric record persistence, but not test. 2017-08-10 00:33:20 +08:00
pengys5 e6907b2846 fixed package name mistake 2017-08-10 00:15:39 +08:00
pengys5 b560ef1f98 Add memory metric record persistence, but not test. 
#346
 2017-08-10 00:13:44 +08:00
pengys5 a798bb6498 Add cpu metric record persistence, but not test. 2017-08-09 23:47:20 +08:00
吴晟 Wu Sheng bfed002049 Merge pull request #347 from wu-sheng/feature/346 
Change the data type of application instance id
 2017-08-09 09:55:40 -05:00
pengys5 00c708fa13 Change the data type of application instance id from int 64 to int 32 in jvm metric service 2017-08-09 22:45:46 +08:00
吴晟 Wu Sheng 2d17b083aa Merge pull request #337 from wu-sheng/feature/336 
Feature/336
 2017-08-09 09:25:31 -05:00
吴晟 Wu Sheng f4f0d1cb41 Merge branch 'master' into feature/336 2017-08-09 09:15:11 -05:00
吴晟 Wu Sheng 303cc1cac6 Merge pull request #345 from ascrutae/zhangxin/fix/hierarchy-match-failed 
fix issue that the match of HierarchyMatch do not work
 2017-08-09 01:08:21 -05:00
ascrutae 164960f668 fix issue that the match of HierarchyMatch do not work 2017-08-09 11:49:26 +08:00
吴晟 Wu Sheng 972d4396eb Merge pull request #342 from ascrutae/zhangxin/feature/entry-application-instanceID 
Add entryApplicationInstanceID field for service topological
 2017-08-08 03:30:55 -05:00
吴晟 Wu Sheng 0ed0848853 Merge branch 'master' into zhangxin/feature/entry-application-instanceID 2017-08-08 03:20:30 -05:00
ascrutae e1d9701b3f modify field name 2017-08-08 16:06:56 +08:00
吴晟 Wu Sheng 9009baa6cb Merge branch 'master' into feature/336 2017-08-07 21:43:48 -05:00
吴晟 Wu Sheng 243c000794 Merge pull request #344 from wu-sheng/feature/338 
Feature/338
 2017-08-07 21:40:17 -05:00
pengys5 a7c11a1baf delete the define id in every data define. 
#336 #338
 2017-08-08 10:03:34 +08:00
pengys5 eb72cb04ba Change the static json key name to full name in json reader. 2017-08-08 09:41:25 +08:00
pengys5 82f79a734d Service reference save to elastic search test success. 
Entry service save to elastic search test success.

#338
 2017-08-08 00:18:47 +08:00
ascrutae 630705c1f0 Merge remote-tracking branch 'upstream/master' into zhangxin/feature/entry-application-instanceID 
# Conflicts:
#	apm-network/src/main/proto/TraceSegmentService.proto
 2017-08-07 23:09:12 +08:00
吴晟 Wu Sheng 9559c75c58 Merge pull request #343 from wu-sheng/feature/341 
add entryApplicationInstanceId attribute
 2017-08-07 10:04:38 -05:00
吴晟 Wu Sheng 93fae09b7f Merge branch 'master' into feature/341 2017-08-07 10:04:14 -05:00
pengys5 4d7ad33771 add entryApplicationInstanceId attribute that let collector known the entry service which application instance send. 2017-08-07 22:59:11 +08:00
ascrutae 81f73fb5e8 Add entryApplicationInstanceID field for service topological 2017-08-07 22:40:29 +08:00
吴晟 Wu Sheng 7765378d1d Merge branch 'master' into feature/336 2017-08-06 19:46:26 -05:00
pengys5 119d21d525 Service entry test success. 2017-08-06 23:26:17 +08:00