Commit Graph

2855 Commits

Author SHA1 Message Date
吴晟 Wu Sheng 4152fa2cb2
Merge branch 'master' into feature/support-start-script 2017-11-20 13:44:15 +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
吴晟 Wu Sheng 461672c954
Merge branch 'master' into feature/support-start-script 2017-11-19 23:08:30 +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
ascrutae b13049a429 support start script 2017-11-19 08:54:51 +08: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
吴晟 Wu Sheng 8658ca7752
Merge pull request #592 from OpenSkywalking/feature/stream-jetty
Feature/stream jetty
2017-11-16 07:23:56 -06:00
吴晟 Wu Sheng df97dc3428
Merge branch 'master' into feature/stream-jetty 2017-11-16 07:06:58 -06: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
peng-yongsheng 8c3fbe4c03 Provider agent register and trace stream by http json request. 2017-11-16 15:13:05 +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
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
peng-yongsheng 8d104e4f4f Delete the name column in all storage tables. 2017-11-15 23:08:53 +08:00
wusheng 8ea0f33e7d Fix a document issue. 2017-11-15 22:41:07 +08:00
peng-yongsheng e5c9e2951a Distruptor queue exits unexpectedly, collector hangs up 2017-11-15 22:28:54 +08:00
peng-yongsheng 6dd6e9c4f8 delete the collector 3.2.3 backup files. 2017-11-15 22:23:03 +08:00
peng-yongsheng e0e9ba0371 Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization 2017-11-15 22:21:03 +08:00
peng-yongsheng 8feaf766b3 Trace stream aggregation test success. 2017-11-15 22:20:08 +08:00
wu-sheng 3202a546d7 Fix a license error. 2017-11-15 16:47:45 +08:00
吴晟 Wu Sheng 4a2e1bca27
Merge pull request #570 from OpenSkywalking/feature/agent-memory-control
Add Span amount control mechanism, also memory limit mechanism
2017-11-14 22:31:07 -06:00
peng-yongsheng c10b7b1819 Change all daos to be services. 2017-11-15 11:40:49 +08:00
吴晟 Wu Sheng 2d80d8dc3a
Merge branch 'feature/collector-modelization' into feature/agent-memory-control 2017-11-14 18:46:41 -06:00
peng-yongsheng b744d4028c Trace segment stream finish. 2017-11-15 00:12:24 +08:00
peng-yongsheng 34aad0f00a jvm stream finish. 2017-11-14 23:40:39 +08:00
peng-yongsheng 714b4ccbf7 Move service register to prepare method. 2017-11-14 21:59:27 +08:00
wusheng 9c174d3ae5 * Remove GPLv3 license in pom.
* Update architecture graph.
* Update REAMDME.
2017-11-14 21:39:19 +08:00
wusheng 41e459df19 Change the hierarchy of noopspan. And add WithPeerInfo interface. 2017-11-14 19:27:45 +08:00
wusheng ad547e00b9 Merge branch 'feature/collector-modelization' into feature/agent-memory-control
* feature/collector-modelization: (55 commits)
  Change the exception to runtime exception in module find and service find method.
  Register graph finish.
  Application register test success.
  Fix a code style issue.
  Move instruments into an independency module in collector, named `apm-collector-instrument`.
  Remove ServiceInstrumentation mechanism for further collector agent design.
  Adjust startup sequence.
  cluster, naming, grpc manager, jetty manager, storage modules test successful.
  Segment standardization
  Parse and listener
  trace workers
  Register workers
  no message
  Add cache service manager in worker construction.
  Fix compile issues.
  Support WayToNode for entry node.
  JVM worker
  Use cache service from cache module.
  Refactor cache module to provide cache services.
  Fix a pom confilct.
  ...
2017-11-14 17:52:26 +08:00
peng-yongsheng 0567bcd43d Change the exception to runtime exception in module find and service find method. 2017-11-14 00:40:57 +08:00