You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/06/18 15:36:36 UTC
[incubator-skywalking] branch Arch-Doc updated (cf187fa -> 1fe85fc)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch Arch-Doc
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from cf187fa Update Architecture.md
add ecc0f94 Zipkin receiver in SkyWalking collector (#1273)
new 1fe85fc Merge branch 'master' into Arch-Doc
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
.../pom.xml | 14 +-
.../receiver-zipkin/docs/README.md | 25 ++
.../receiver-zipkin}/pom.xml | 11 +-
.../receiver-zipkin-define}/pom.xml | 11 +-
.../zipkin/define/ZipkinReceiverModule.java} | 15 +-
...ywalking.apm.collector.core.module.ModuleDefine | 2 +-
.../receiver-zipkin-provider}/pom.xml | 30 +-
.../zipkin/provider/Receiver2AnalysisBridge.java | 48 +++
.../receiver/zipkin/provider/RegisterServices.java | 78 ++++
.../zipkin/provider/ZipkinReceiverConfig.java} | 25 +-
.../zipkin/provider/ZipkinReceiverProvider.java | 91 ++++
.../zipkin/provider/cache/CacheFactory.java | 34 +-
.../receiver/zipkin/provider/cache/ISpanCache.java | 9 +-
.../provider/cache/caffeine/CaffeineSpanCache.java | 99 +++++
.../zipkin/provider/data/SkyWalkingTrace.java | 58 +++
.../zipkin/provider/data/ZipkinTrace.java} | 37 +-
.../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} | 10 +-
.../transform/Zipkin2SkyWalkingTransfer.java | 67 +++
...alking.apm.collector.core.module.ModuleProvider | 2 +-
.../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, 1685 insertions(+), 340 deletions(-)
create mode 100644 apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/AgentOsInfo.java
copy apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/{JettyHandler.java => JettyJsonHandler.java} (95%)
copy apm-collector/{apm-collector-analysis/analysis-jvm => apm-collector-thirdparty-receiver}/pom.xml (80%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/docs/README.md
copy apm-collector/{apm-collector-configuration => apm-collector-thirdparty-receiver/receiver-zipkin}/pom.xml (81%)
copy apm-collector/{apm-collector-analysis/analysis-jvm/jvm-define => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define}/pom.xml (83%)
copy apm-collector/{apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/define/ZipkinReceiverModule.java} (64%)
copy apm-collector/{apm-collector-agent/agent-grpc/agent-grpc-define => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine (90%)
copy apm-collector/{apm-collector-analysis/analysis-segment-parser/segment-parser-provider => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider}/pom.xml (76%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/Receiver2AnalysisBridge.java
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/RegisterServices.java
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyConfig.java => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/ZipkinReceiverConfig.java} (61%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/ZipkinReceiverProvider.java
copy apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java => apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/CacheFactory.java (54%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java => apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/ISpanCache.java (84%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/caffeine/CaffeineSpanCache.java
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/SkyWalkingTrace.java
copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/ZipkinTrace.java} (57%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/handler/SpanProcessor.java
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/handler/SpanV1JettyHandler.java
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/handler/SpanV2JettyHandler.java
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java
copy apm-collector/{apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleConfig.java => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentListener.java} (76%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/Zipkin2SkyWalkingTransfer.java
copy apm-collector/{apm-collector-agent/agent-jetty/agent-jetty-provider => apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider (90%)
create mode 100644 apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/test/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SpringSleuthSegmentBuilderTest.java
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into Arch-Doc
Posted by wu...@apache.org.
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...@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
wusheng@apache.org.