Commit Graph

2370 Commits

Author SHA1 Message Date
pengys5 75bed4998d Merge branch 'master' into feature/cluster 2017-09-10 21:12:29 +08:00
pengys5 d45e7fec67 no message 2017-09-10 21:11:54 +08:00
pengys5 897cd24252 no message 2017-09-10 18:54:35 +08:00
吴晟 Wu Sheng dc95c0327c Merge pull request #408 from ascrutae/zhangxin/feature/skywalking-package
fix package issue
2017-09-10 16:37:00 +08:00
ascrutae 88c89e500a fix package issue 2017-09-10 16:21:05 +08:00
pengys5 3773c46811 Merge branch 'master' into feature/cluster 2017-09-10 14:15:59 +08:00
pengys5 479b421ae2 no message 2017-09-10 14:15:15 +08:00
吴晟 Wu Sheng 4b8b2372a8 Merge pull request #407 from wu-sheng/feature/memorypool
Delete the is heap property in memory pool entity
2017-09-10 12:29:48 +08:00
ascrutae 9f3ccb1a79 fix compile failure 2017-09-10 12:14:22 +08:00
吴晟 Wu Sheng d12a0ed219 Merge branch 'master' into feature/memorypool 2017-09-10 11:49:51 +08:00
pengys5 f0b1abe834 Delete the is heap property in memory pool entity 2017-09-10 11:46:54 +08:00
吴晟 Wu Sheng f3191c0f8c Merge pull request #406 from ascrutae/zhangxin/fix/gc-issue
fix gc issue
2017-09-10 11:42:25 +08:00
ascrutae 349802604c fix gc issue 2017-09-10 11:40:21 +08:00
pengys5 f187931e8d zk add node listener 2017-09-10 01:25:34 +08:00
吴晟 Wu Sheng ce6d4c8d75 Merge pull request #405 from wu-sheng/feature/package
Feature/package
2017-09-09 21:40:50 +08:00
吴晟 Wu Sheng 1249c04ac1 Merge branch 'master' into feature/package 2017-09-09 21:40:35 +08:00
吴晟 Wu Sheng 03a5db8ea4 Merge pull request #404 from wu-sheng/feature/debugging
Feature/debugging
2017-09-09 21:33:04 +08:00
pengys5 9bd79b9273 Change ui jetty server discovery port change to 10800 2017-09-09 21:31:45 +08:00
pengys5 b4b77408cc Merge branch 'feature/debugging' into feature/package 2017-09-09 21:03:56 +08:00
pengys5 bd48a75b14 Mistake 2017-09-09 20:51:20 +08:00
pengys5 cd78b93029 service reference merge id and name row 2017-09-09 20:42:43 +08:00
pengys5 73080cbd49 Cpu usage percent 2017-09-09 20:15:36 +08:00
吴晟 Wu Sheng be1f06b190 Merge pull request #403 from ascrutae/feature/debugging
fix issue that cpu metric data is incorrect
2017-09-09 19:48:22 +08:00
ascrutae c0344337c8 fix issue that cpu metric data is incorrect 2017-09-09 17:24:04 +08:00
pengys5 5e2204e2d0 Add some property into tag array. 2017-09-09 15:59:50 +08:00
pengys5 7ac93aff5d delete the s5TimeBucket column 2017-09-09 15:18:06 +08:00
pengys5 7aac7365ac Fixed the GlobalTraceId contidtion not effect in trece stack web ui. 2017-09-09 10:29:38 +08:00
pengys5 4582e9d9fa Support entry service id or entry service name argument to query service tree. 2017-09-08 17:15:54 +08:00
pengys5 8abad65f6b Register service do not return the id when value of 0. 2017-09-08 00:35:25 +08:00
pengys5 ae1b0e3c85 Merge branch 'master' into feature/debugging 2017-09-07 23:41:32 +08:00
吴晟 Wu Sheng ddac322272 Merge pull request #398 from ascrutae/feature/debugging
fix time bucket issue and fix issue  that check style failed
2017-09-07 11:24:59 +08:00
ascrutae 6d46e85a6f fix time bucket issue 2017-09-07 09:30:34 +08:00
pengys5 9267fde67a Just contains the exit span scene. 2017-09-07 09:01:08 +08:00
wusheng 815a47769c Adjust log of SegmentServiceClient, close #396 2017-09-06 21:38:43 +08:00
pengys5 cf4430a254 Replace mistake 2017-09-05 16:34:16 +08:00
pengys5 40a9686a33 Merge branch 'feature/debugging' of https://github.com/wu-sheng/sky-walking into feature/debugging
# Conflicts:
#	apm-collector/apm-collector-boot/src/main/resources/application.yml
2017-09-04 23:34:14 +08:00
pengys5 f767431607 Single segment has entry span, but no exit span and no reference span test success. 2017-09-04 23:33:18 +08:00
吴晟 Wu Sheng a46c01e34d Merge pull request #395 from ascrutae/zhangxin/fix/plugin-def-issue
change toolkit plugin name
2017-09-04 22:55:45 +08:00
吴晟 Wu Sheng e280f7ce85 Merge pull request #394 from ascrutae/zhangxin/fix/debuging-issue
Change the URL that fetch grpc address
2017-09-04 22:55:16 +08:00
ascrutae 73ae751882 modify the IP value of elastic search cluster node 2017-09-04 22:52:18 +08:00
ascrutae d236072c1a change toolkit plugin name 2017-09-04 22:41:56 +08:00
ascrutae f96338d977 Change the URL that fetch grpc address 2017-09-04 22:39:25 +08:00
吴晟 Wu Sheng af690c18ed Merge pull request #322 from wu-sheng/wu-sheng-3.2-readme
Provide new readme for 3.2
2017-09-04 22:16:53 +08:00
吴晟 Wu Sheng c410fc598e Update README_ZH.md 2017-09-04 22:11:26 +08:00
吴晟 Wu Sheng 5d5440b02b Update README.md 2017-09-04 22:10:53 +08:00
pengys5 4437c8b9c0 Merge branch 'master' into feature/debugging 2017-09-04 22:02:24 +08:00
pengys5 8c87939d5e Package and shell 2017-09-04 21:54:54 +08:00
吴晟 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