Commit Graph

2879 Commits

Author SHA1 Message Date
liyuntao 1b2c8f75a0
Merge branch 'master' into develop 2017-11-20 14:09:17 +08:00
吴晟 Wu Sheng 33755f7a80
Merge pull request #605 from ascrutae/fix/naming-service-url-issue
fix the naming service url and port is incorrect issue
2017-11-20 13:41:07 +08:00
ascrutae 9a4d4a21b8 fix the naming service url and port is incorrect 2017-11-20 13:04:12 +08:00
lytscu 626ef11fef comments 2017-11-20 11:20:24 +08:00
liyuntao f1be3e9934
Merge branch 'master' into develop 2017-11-20 09:42:57 +08:00
吴晟 Wu Sheng af0b05a508
Merge pull request #600 from OpenSkywalking/feature/split-agent-module
Feature/split agent module
2017-11-19 23:08:04 +08:00
peng-yongsheng 0804bc3f18 Merge branch 'feature/split-agent-module' of https://github.com/OpenSkywalking/skywalking into feature/split-agent-module 2017-11-19 22:52:22 +08:00
peng-yongsheng 14967e4949 Fixed maven package error from style check. 2017-11-19 22:44:33 +08:00
吴晟 Wu Sheng c85db8c4f9
Merge branch 'master' into feature/split-agent-module 2017-11-19 22:42:56 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
吴晟 Wu Sheng 1996e6ed6f
Merge pull request #598 from ascrutae/fix/restemplate-plugin-issue
fix issue restemplate plugin don’t works fine
2017-11-19 22:21:03 +08:00
吴晟 Wu Sheng dcb8512225
Merge branch 'master' into fix/restemplate-plugin-issue 2017-11-19 21:13:26 +08:00
ascrutae 750e57fc8e fix issue restemplate plugin don’t works fine 2017-11-19 17:09:23 +08:00
吴晟 Wu Sheng ee2f5c5e25
Merge pull request #595 from ascrutae/fix/spring-aop-issue
fix issue that controller cannot find the request mapping
2017-11-19 01:30:40 -06:00
吴晟 Wu Sheng 1c762f1c21
Merge branch 'master' into fix/spring-aop-issue 2017-11-19 01:08:12 -06:00
wusheng d2df4db284 Adjust the find server codes. 2017-11-18 10:32:25 +08:00
ascrutae 61c7a35bee fix issue that controller cannot find the request mapping 2017-11-18 10:23:39 +08:00
peng-yongsheng f3e85ef6e3 Change apm-collector-stream from collector module to common codes.
Make agent gRPC to be a collector module.
Make agent jetty to be a collector module.
Make agent stream to be a collector module.
2017-11-17 13:57:20 +08:00
lytscu 57ee51f256 comments 2017-11-16 21:26:39 +08:00
吴晟 Wu Sheng 8658ca7752
Merge pull request #592 from OpenSkywalking/feature/stream-jetty
Feature/stream jetty
2017-11-16 07:23:56 -06:00
lytscu 14bc3d9670 comments 2017-11-16 21:14:50 +08:00
吴晟 Wu Sheng df97dc3428
Merge branch 'master' into feature/stream-jetty 2017-11-16 07:06:58 -06:00
lytscu 4215fc628c comments 2017-11-16 21:04:11 +08:00
peng-yongsheng 0c0a480a29 Application, instance, service name register by http json test success.
Trace segment compute by http json stream test success.
2017-11-16 20:59:24 +08:00
lytscu 96633124da comments 2017-11-16 20:52:09 +08:00
lytscu 726d1d6b0c Comments 2017-11-16 20:38:30 +08:00
lytscu 1182e8a9bf Comments 2017-11-16 20:04:46 +08:00
lytscu 484d43cbf7 add DBCollectionImpl instrumentation 2017-11-16 19:51:19 +08:00
lytscu 6b9d6caff1 3.2.4->3.2.5 2017-11-16 17:41:30 +08:00
lytscu 78398cc733 Reconstruction 2017-11-16 17:27:24 +08:00
peng-yongsheng 8c3fbe4c03 Provider agent register and trace stream by http json request. 2017-11-16 15:13:05 +08:00
lytscu 5691a94987 Merge branch 'develop' of https://github.com/lytscu/skywalking into develop
yes
:
2017-11-16 14:47:50 +08:00
lytscu 4eeb5ab8df Delete redundant code 2017-11-16 14:46:37 +08:00
liyuntao 46370f0079
Merge branch 'master' into develop 2017-11-16 14:38:53 +08:00
lytscu f3699ba266 1.carrier->operation 2. Remove duplicate constructors intercept points 2017-11-16 14:36:57 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00
wu-sheng 19367166a9 Appand modules: apm-collector-baseline and apm-collector-baseline-computing for jd contributor team. 2017-11-16 11:32:45 +08:00
lytscu 498fc9b92c Merge branch 'develop' of https://github.com/lytscu/skywalking into develop 2017-11-16 11:16:15 +08:00
liyuntao 03d9b48dc4
Merge branch 'master' into develop 2017-11-16 10:55:31 +08:00
lytscu 67d5fc13b5 Merge remote-tracking branch 'upstream/master' into develop 2017-11-16 10:49:24 +08:00
lytscu b7790c5a87 V3 modify revert 2017-11-16 10:48:03 +08:00
wu-sheng 59f20e3487 Fix documents links. 2017-11-16 10:36:57 +08:00
wu-sheng 5b9c137f17 Try to update coverage. 2017-11-16 10:27:38 +08:00
吴晟 Wu Sheng c080540853 Set theme jekyll-theme-midnight 2017-11-16 09:20:17 +08:00
吴晟 Wu Sheng 1dbb47a5cc
Merge pull request #585 from OpenSkywalking/feature/collector-modelization
Provide new collector modelization core and graph streaming core
2017-11-15 19:17:11 -06:00
peng-yongsheng e349222817 All success. 2017-11-16 01:13:00 +08:00
peng-yongsheng bc4f1830eb Trace dag ui with h2 storage provider test success. 2017-11-16 01:06:25 +08:00
peng-yongsheng 779638bea0 Trace stack ui with elasticsearch storage provider test success. 2017-11-16 00:29:31 +08:00
peng-yongsheng 085da8394e trace dag ui with elasticsearch storage module provider test success. 2017-11-16 00:07:32 +08:00
peng-yongsheng 101d92bf93 Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization 2017-11-15 23:09:21 +08:00