This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch Arch-Doc
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 1fe85fc4cae6818b3ae7ed6c7192764b3d76198f
Merge: cf187fa ecc0f94
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Mon Jun 18 23:36:35 2018 +0800
Merge branch 'master' into Arch-Doc
README.md | 13 +-
README_ZH.md | 22 +-
.../handler/InstanceDiscoveryServiceHandler.java | 26 +-
.../handler/naming/AgentGRPCNamingHandler.java | 5 +-
.../InstanceDiscoveryServiceHandlerTest.java | 47 +-
.../handler/ApplicationRegisterServletHandler.java | 4 +-
.../handler/InstanceDiscoveryServletHandler.java | 10 +-
.../handler/InstanceHeartBeatServletHandler.java | 4 +-
.../NetworkAddressRegisterServletHandler.java | 4 +-
.../ServiceNameDiscoveryServiceHandler.java | 4 +-
.../handler/TraceSegmentServletHandler.java | 4 +-
.../handler/naming/AgentJettyNamingHandler.java | 4 +-
.../register/define/service/AgentOsInfo.java | 84 ++++
.../define/service/IInstanceIDService.java | 2 +-
.../provider/service/InstanceIDService.java | 5 +-
.../parser/provider/parser/SegmentParse.java | 35 +-
apm-collector/apm-collector-boot/pom.xml | 8 +-
.../src/main/resources/application.yml | 8 +-
.../apm/collector/server/jetty/JettyHandler.java | 157 +------
.../{JettyHandler.java => JettyJsonHandler.java} | 24 +-
.../apm-collector-thirdparty-receiver/pom.xml | 37 ++
.../receiver-zipkin/docs/README.md | 25 ++
.../receiver-zipkin/pom.xml | 44 ++
.../receiver-zipkin/receiver-zipkin-define/pom.xml | 33 ++
.../zipkin/define/ZipkinReceiverModule.java} | 24 +-
...ywalking.apm.collector.core.module.ModuleDefine | 19 +
.../receiver-zipkin-provider/pom.xml | 68 +++
.../zipkin/provider/Receiver2AnalysisBridge.java | 48 +++
.../receiver/zipkin/provider/RegisterServices.java | 78 ++++
.../zipkin/provider/ZipkinReceiverConfig.java} | 28 +-
.../zipkin/provider/ZipkinReceiverProvider.java | 91 ++++
.../zipkin/provider/cache/CacheFactory.java} | 27 +-
.../zipkin/provider/cache/ISpanCache.java} | 12 +-
.../provider/cache/caffeine/CaffeineSpanCache.java | 99 +++++
.../zipkin/provider/data/SkyWalkingTrace.java | 58 +++
.../receiver/zipkin/provider/data/ZipkinTrace.java | 63 +++
.../zipkin/provider/handler/SpanProcessor.java | 54 +++
.../provider/handler/SpanV1JettyHandler.java | 71 +++
.../provider/handler/SpanV2JettyHandler.java | 73 ++++
.../zipkin/provider/transform/SegmentBuilder.java | 477 +++++++++++++++++++++
.../provider/transform/SegmentListener.java} | 13 +-
.../transform/Zipkin2SkyWalkingTransfer.java | 67 +++
...alking.apm.collector.core.module.ModuleProvider | 19 +
.../transform/SpringSleuthSegmentBuilderTest.java | 196 +++++++++
.../collector/ui/jetty/handler/GraphQLHandler.java | 4 +-
.../jetty/handler/naming/UIJettyNamingHandler.java | 4 +-
apm-collector/pom.xml | 7 +
apm-dist/release-docs/LICENSE | 1 +
docs/README.md | 1 +
docs/en/Incubating/Abstract.md | 1 +
50 files changed, 1913 insertions(+), 299 deletions(-)
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
