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/05/07 01:49:37 UTC
[incubator-skywalking] branch beta-changes updated (a694c36 ->
f6ad0e3)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch beta-changes
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from a694c36 Merge branch 'master' into beta-changes
add 25b502d Contact maillist (#1141)
add 01b5d49 Add EntityFrameworkCore provider components in component-libraries config (#1142)
add 4127b23 Add NodeJS components (#1144)
add 1ced58d Update submodule skywalking-ui (#1145)
add 03e3eb1 Fix the GC value is incorrect (#1147)
add 9e4a455 Add collector agent test (#1137)
add 0313f18 Name incorrect (#1153)
add 257e19f Submodule/skywalking ui (#1155)
add 388beea Segment start time: minimum start time in all span (#1156)
add 42eaa1f Use SortOrder instead of SortMode, because SortMode sort column type of Array only. (#1157)
add ed487bc Add RunnableWrapper (#1152)
add 5f30228 Rename thermodynamic attributes. (#1161)
add 89d7901 #1162 (#1163)
add 4fc5cc3 fix_average_duration_zero (#1164)
add bb1efe5 Get conjectural node component name from component server name. (#1165)
add 20df413 Module class rename to ModuleDefine, Module is the JDK9 class. It is conflict with our Module class. (#1168)
add 4c41648 Submodule/skywalking ui (#1171)
add d24c325 Do not get alarm metric for overview and application topology. (#1173)
add 6cb266b Collector table description for develop guide. (#995)
add 4714f0e fix #1174 (#1175)
add bd28d44 Docs/fix grpc dirname (#1180)
add d14eb2b fix first formula,like #1164 (#1179)
add db8b931 Fix If traceId not exists result will return all traces (#1178)
new f6ad0e3 Merge branch 'master' into beta-changes
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 | 1 +
README_ZH.md | 1 +
.../{ActiveSpan.java => RunnableWrapper.java} | 30 +-
.../agent/grpc/define/AgentGRPCModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../agent-grpc/agent-grpc-provider/pom.xml | 15 +
.../grpc/provider/AgentModuleGRPCProvider.java | 4 +-
.../grpc/provider/AgentModuleGRPCProviderTest.java | 102 ++++
.../provider/AgentModuleGRPCRegistrationTest.java} | 19 +-
.../provider/AuthenticationSimpleCheckerTest.java | 105 ++++
.../ApplicationRegisterServiceHandlerTest.java | 81 +++
.../InstanceDiscoveryServiceHandlerTest.java | 121 +++++
.../handler/JVMMetricsServiceHandlerTest.java | 154 ++++++
.../NetworkAddressRegisterServiceHandlerTest.java | 81 +++
.../grpc/provider/handler/SegmentCounterTest.java} | 22 +-
.../ServiceNameDiscoveryServiceHandlerTest.java | 89 ++++
.../handler/TraceSegmentServiceHandlerTest.java | 83 +++
.../naming/AgentGRPCNamingHandlerTest.java} | 36 +-
.../naming/AgentGRPCNamingListenerTest.java} | 17 +-
.../apm/collector/core/module/MockModule.java | 19 +-
.../agent/jetty/define/AgentJettyModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jetty/provider/AgentModuleJettyProvider.java | 7 +-
.../collector}/DelegatingServletInputStream.java | 2 +-
.../provider/AgentModuleJettyProviderTest.java} | 45 +-
.../AgentModuleJettyRegistrationTest.java} | 17 +-
.../ApplicationRegisterServletHandlerTest.java | 90 ++++
.../InstanceDiscoveryServletHandlerTest.java | 94 ++++
.../InstanceHeartBeatServletHandlerTest.java | 90 ++++
.../NetworkAddressRegisterServletHandlerTest.java | 92 ++++
.../ServiceNameDiscoveryServiceHandlerTest.java | 105 ++++
.../handler/TraceSegmentServletHandlerTest.java | 106 ++++
.../naming/AgentJettyNamingHandlerTest.java} | 36 +-
.../naming/AgentJettyNamingListenerTest.java} | 21 +-
.../jetty/provider/handler/reader/BaseReader.java} | 19 +-
.../reader/KeyWithStringValueJsonReaderTest.java | 42 +-
.../provider/handler/reader/LogJsonReaderTest.java | 52 +-
.../handler/reader/ReferenceJsonReaderTest.java | 87 ++++
.../handler/reader/SegmentJsonReaderTest.java | 68 +++
.../handler/reader/SpanJsonReaderTest.java | 87 ++++
.../handler/reader/TraceSegmentJsonReaderTest.java | 66 +++
.../apm/collector/core/module/MockModule.java | 13 +-
.../analysis/alarm/define/AnalysisAlarmModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisAlarmModuleProvider.java | 4 +-
.../define/AnalysisBaselineComputingModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../AnalysisBaselineComputingModuleProvider.java | 7 +-
.../analysis/jvm/define/AnalysisJVMModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jvm/provider/AnalysisJVMModuleProvider.java | 8 +-
.../metric/define/AnalysisMetricModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisMetricModuleProvider.java | 4 +-
.../ApplicationComponentSpanListener.java | 49 +-
.../mapping/ApplicationMappingSpanListener.java | 42 +-
.../worker/global/GlobalTraceSpanListener.java | 45 +-
.../std/ResponseTimeDistributionSpanListener.java | 84 +--
.../mapping/InstanceMappingSpanListener.java | 44 +-
.../segment/SegmentDurationSpanListener.java | 79 ++-
.../ServiceReferenceMetricSpanListener.java | 58 +--
...sponseTimeDistributionSpanListenerTestCase.java | 25 +-
.../register/define/AnalysisRegisterModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisRegisterModuleProvider.java | 8 +-
.../parser/define/AnalysisSegmentParserModule.java | 4 +-
.../parser/define/decorator/SegmentCoreInfo.java | 88 ++++
.../parser/define/decorator/SpanDecorator.java | 13 +-
.../parser/define/listener/EntrySpanListener.java | 4 +-
.../parser/define/listener/ExitSpanListener.java | 4 +-
.../parser/define/listener/FirstSpanListener.java | 4 +-
.../define/listener/GlobalTraceIdsListener.java | 3 +-
.../parser/define/listener/LocalSpanListener.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../AnalysisSegmentParserModuleConfig.java | 9 +
.../AnalysisSegmentParserModuleProvider.java | 8 +-
.../parser/provider/buffer/BufferFileConfig.java | 3 +
.../provider/buffer/SegmentBufferManager.java | 30 +-
.../parser/provider/parser/SegmentParse.java | 70 +--
.../worker/model/impl/AggregationWorker.java | 1 +
.../worker/model/impl/MergePersistenceWorker.java | 1 +
.../src/main/resources/application.yml | 7 +-
.../src/main/resources/component-libraries.yml | 53 +-
.../caffeine/CacheModuleCaffeineProvider.java | 8 +-
.../apm/collector/cache/CacheModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../cache/guava/CacheModuleGuavaProvider.java | 4 +-
.../apm/collector/cluster/ClusterModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../cluster/redis/ClusterModuleRedisProvider.java | 8 +-
.../ClusterModuleStandaloneProvider.java | 4 +-
.../zookeeper/ClusterModuleZookeeperProvider.java | 4 +-
.../configuration/ConfigurationModule.java | 4 +-
.../IResponseTimeDistributionConfigService.java | 2 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../configuration/ConfigurationModuleConfig.java | 20 +-
.../configuration/ConfigurationModuleProvider.java | 37 +-
.../ResponseTimeDistributionConfigService.java | 10 +-
.../apm/collector/core/data/AbstractData.java | 2 +-
.../apm/collector/core/module/BootstrapFlow.java | 4 +-
.../core/module/{Module.java => ModuleDefine.java} | 4 +-
.../apm/collector/core/module/ModuleManager.java | 14 +-
.../apm/collector/core/module/ModuleProvider.java | 12 +-
.../apm/collector/core/module/Service.java | 2 +-
.../apm/collector/core/module/BaseModuleA.java | 2 +-
.../apm/collector/core/module/BaseModuleB.java | 2 +-
.../apm/collector/core/module/ModuleAProvider.java | 2 +-
.../apm/collector/core/module/ModuleBProvider.java | 2 +-
.../apm/collector/core/module/TestModule.java | 2 +-
.../collector/core/module/TestModuleProvider.java | 2 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../collector/grpc/manager/GRPCManagerModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../grpc/manager/GRPCManagerProvider.java | 4 +-
.../jetty/manager/JettyManagerModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jetty/manager/JettyManagerProvider.java | 8 +-
.../apm/collector/naming/NamingModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../naming/jetty/NamingModuleJettyProvider.java | 8 +-
.../apm/collector/remote/RemoteModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../remote/grpc/RemoteModuleGRPCProvider.java | 8 +-
.../apm/collector/storage/StorageModule.java | 4 +-
.../storage/dao/ui/IApplicationAlarmUIDAO.java | 7 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../storage/es/StorageModuleEsProvider.java | 4 +-
.../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 23 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 8 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 29 +-
.../storage/h2/StorageModuleH2Provider.java | 8 +-
.../storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java | 4 +-
.../skywalking/apm/collector/ui/UIModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../collector/ui/jetty/UIModuleJettyProvider.java | 4 +-
.../apm/collector/ui/query/AlarmQuery.java | 14 +-
.../apm/collector/ui/query/ApplicationQuery.java | 16 +-
.../apm/collector/ui/query/OverViewLayerQuery.java | 25 +-
.../apm/collector/ui/service/AlarmService.java | 42 +-
.../ui/service/ApplicationTopologyService.java | 20 +-
.../service/ResponseTimeDistributionService.java | 2 +-
.../collector/ui/service/SegmentTopService.java | 4 +
.../apm/collector/ui/service/TopologyBuilder.java | 43 +-
.../apm/collector/core/module/MockModule.java | 2 +-
.../apm/collector/ui/query/AlarmQueryTestCase.java | 26 +-
.../apm/collector/ui/service/AlarmServiceTest.java | 34 +-
.../collector/ui/service/TopologyBuilderTest.java | 2 +-
apm-dist/bin/collectorService.sh | 4 +-
apm-dist/bin/webappService.sh | 4 +-
.../agent/core/context/trace/TraceSegmentRef.java | 2 +-
.../skywalking/apm/agent/core/jvm/gc/GCModule.java | 30 +-
.../apm-sdk-plugin/jdk-cross-thread-plugin/pom.xml | 59 ---
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/pom.xml | 1 -
.../trace/CallableOrRunnableActivation.java} | 17 +-
.../CallableOrRunnableConstructInterceptor.java | 3 +-
.../CallableOrRunnableInvokeInterceptor.java | 6 +-
.../src/main/resources/skywalking-plugin.def | 1 +
.../trace}/CallableOrRunnableInterceptorTest.java | 26 +-
docs/README.md | 1 +
.../Application-toolkit-trace-cross-thread-CN.md | 9 +
docs/cn/How-to-build-CN.md | 2 +-
docs/en/Application-toolkit-trace-cross-thread.md | 10 +
docs/en/Collector-Table-Description.md | 572 +++++++++++++++++++++
docs/en/How-to-build.md | 2 +-
skywalking-ui | 2 +-
166 files changed, 3206 insertions(+), 1000 deletions(-)
copy apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/{ActiveSpan.java => RunnableWrapper.java} (70%)
rename apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProviderTest.java
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyRegistrationTest.java => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistrationTest.java} (63%)
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AuthenticationSimpleCheckerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandlerTest.java
copy apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/{main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounter.java => test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounterTest.java} (67%)
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandlerTest.java
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingHandlerTest.java => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingHandlerTest.java} (58%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingListenerTest.java => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListenerTest.java} (71%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider => apm-collector-agent/agent-grpc/agent-grpc-provider}/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java (74%)
rename apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui => apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector}/DelegatingServletInputStream.java (97%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProviderTest.java => apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProviderTest.java} (60%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyRegistrationTest.java => apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistrationTest.java} (68%)
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/NetworkAddressRegisterServletHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandlerTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandlerTest.java
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingHandlerTest.java => apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandlerTest.java} (58%)
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingListenerTest.java => apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListenerTest.java} (64%)
copy apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/{main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/StreamJsonReader.java => test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/BaseReader.java} (70%)
copy apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java => apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReaderTest.java (54%)
copy apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java => apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReaderTest.java (50%)
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReaderTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReaderTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReaderTest.java
create mode 100644 apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReaderTest.java
copy apm-collector/{apm-collector-ui/collector-ui-jetty-provider => apm-collector-agent/agent-jetty/agent-jetty-provider}/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java (83%)
rename apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
create mode 100644 apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/SegmentCoreInfo.java
rename apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/{Module.java => ModuleDefine.java} (99%)
rename apm-collector/apm-collector-core/src/test/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
rename apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/jdk-cross-thread-plugin/pom.xml
delete mode 100644 apm-sniffer/apm-sdk-plugin/jdk-cross-thread-plugin/src/main/resources/skywalking-plugin.def
rename apm-sniffer/{apm-sdk-plugin/jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread/define/CallableOrRunnableInstrumentation.java => apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableActivation.java} (83%)
rename apm-sniffer/{apm-sdk-plugin/jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread => apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace}/CallableOrRunnableConstructInterceptor.java (95%)
rename apm-sniffer/{apm-sdk-plugin/jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread => apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace}/CallableOrRunnableInvokeInterceptor.java (97%)
rename apm-sniffer/{apm-sdk-plugin/jdk-cross-thread-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdk/thread => apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace}/CallableOrRunnableInterceptorTest.java (98%)
create mode 100644 docs/en/Collector-Table-Description.md
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
beta-changes
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch beta-changes
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit f6ad0e31adf776406b4a95f9599622568cdd811e
Merge: a694c36 db8b931
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon May 7 09:49:33 2018 +0800
Merge branch 'master' into beta-changes
README.md | 1 +
README_ZH.md | 1 +
.../apm/toolkit/trace/RunnableWrapper.java | 28 +-
.../agent/grpc/define/AgentGRPCModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../agent-grpc/agent-grpc-provider/pom.xml | 15 +
.../grpc/provider/AgentModuleGRPCProvider.java | 4 +-
.../grpc/provider/AgentModuleGRPCProviderTest.java | 102 ++++
.../provider/AgentModuleGRPCRegistrationTest.java | 48 ++
.../provider/AuthenticationSimpleCheckerTest.java | 105 ++++
.../ApplicationRegisterServiceHandlerTest.java | 81 +++
.../InstanceDiscoveryServiceHandlerTest.java | 121 +++++
.../handler/JVMMetricsServiceHandlerTest.java | 154 ++++++
.../NetworkAddressRegisterServiceHandlerTest.java | 81 +++
.../grpc/provider/handler/SegmentCounterTest.java} | 29 +-
.../ServiceNameDiscoveryServiceHandlerTest.java | 89 ++++
.../handler/TraceSegmentServiceHandlerTest.java | 83 +++
.../handler/naming/AgentGRPCNamingHandlerTest.java | 65 +++
.../naming/AgentGRPCNamingListenerTest.java} | 36 +-
.../apm/collector/core/module/MockModule.java | 19 +-
.../agent/jetty/define/AgentJettyModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jetty/provider/AgentModuleJettyProvider.java | 7 +-
.../collector/DelegatingServletInputStream.java | 75 +++
.../provider/AgentModuleJettyProviderTest.java | 92 ++++
.../provider/AgentModuleJettyRegistrationTest.java | 48 ++
.../ApplicationRegisterServletHandlerTest.java | 90 ++++
.../InstanceDiscoveryServletHandlerTest.java | 94 ++++
.../InstanceHeartBeatServletHandlerTest.java | 90 ++++
.../NetworkAddressRegisterServletHandlerTest.java | 92 ++++
.../ServiceNameDiscoveryServiceHandlerTest.java | 105 ++++
.../handler/TraceSegmentServletHandlerTest.java | 106 ++++
.../naming/AgentJettyNamingHandlerTest.java | 69 +++
.../naming/AgentJettyNamingListenerTest.java | 55 ++
.../jetty/provider/handler/reader/BaseReader.java} | 24 +-
.../reader/KeyWithStringValueJsonReaderTest.java | 55 ++
.../provider/handler/reader/LogJsonReaderTest.java | 67 +++
.../handler/reader/ReferenceJsonReaderTest.java | 87 ++++
.../handler/reader/SegmentJsonReaderTest.java | 68 +++
.../handler/reader/SpanJsonReaderTest.java | 87 ++++
.../handler/reader/TraceSegmentJsonReaderTest.java | 66 +++
.../apm/collector/core/module/MockModule.java | 13 +-
.../analysis/alarm/define/AnalysisAlarmModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisAlarmModuleProvider.java | 4 +-
.../define/AnalysisBaselineComputingModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../AnalysisBaselineComputingModuleProvider.java | 7 +-
.../analysis/jvm/define/AnalysisJVMModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jvm/provider/AnalysisJVMModuleProvider.java | 8 +-
.../metric/define/AnalysisMetricModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisMetricModuleProvider.java | 4 +-
.../ApplicationComponentSpanListener.java | 49 +-
.../mapping/ApplicationMappingSpanListener.java | 42 +-
.../worker/global/GlobalTraceSpanListener.java | 45 +-
.../std/ResponseTimeDistributionSpanListener.java | 84 +--
.../mapping/InstanceMappingSpanListener.java | 44 +-
.../segment/SegmentDurationSpanListener.java | 79 ++-
.../ServiceReferenceMetricSpanListener.java | 58 +--
...sponseTimeDistributionSpanListenerTestCase.java | 25 +-
.../register/define/AnalysisRegisterModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../provider/AnalysisRegisterModuleProvider.java | 8 +-
.../parser/define/AnalysisSegmentParserModule.java | 4 +-
.../parser/define/decorator/SegmentCoreInfo.java | 88 ++++
.../parser/define/decorator/SpanDecorator.java | 13 +-
.../parser/define/listener/EntrySpanListener.java | 4 +-
.../parser/define/listener/ExitSpanListener.java | 4 +-
.../parser/define/listener/FirstSpanListener.java | 4 +-
.../define/listener/GlobalTraceIdsListener.java | 3 +-
.../parser/define/listener/LocalSpanListener.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../AnalysisSegmentParserModuleConfig.java | 9 +
.../AnalysisSegmentParserModuleProvider.java | 8 +-
.../parser/provider/buffer/BufferFileConfig.java | 3 +
.../provider/buffer/SegmentBufferManager.java | 30 +-
.../parser/provider/parser/SegmentParse.java | 70 +--
.../worker/model/impl/AggregationWorker.java | 1 +
.../worker/model/impl/MergePersistenceWorker.java | 1 +
.../src/main/resources/application.yml | 7 +-
.../src/main/resources/component-libraries.yml | 53 +-
.../caffeine/CacheModuleCaffeineProvider.java | 8 +-
.../apm/collector/cache/CacheModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../cache/guava/CacheModuleGuavaProvider.java | 4 +-
.../apm/collector/cluster/ClusterModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../cluster/redis/ClusterModuleRedisProvider.java | 8 +-
.../ClusterModuleStandaloneProvider.java | 4 +-
.../zookeeper/ClusterModuleZookeeperProvider.java | 4 +-
.../configuration/ConfigurationModule.java | 4 +-
.../IResponseTimeDistributionConfigService.java | 2 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../configuration/ConfigurationModuleConfig.java | 20 +-
.../configuration/ConfigurationModuleProvider.java | 37 +-
.../ResponseTimeDistributionConfigService.java | 10 +-
.../apm/collector/core/data/AbstractData.java | 2 +-
.../apm/collector/core/module/BootstrapFlow.java | 4 +-
.../core/module/{Module.java => ModuleDefine.java} | 4 +-
.../apm/collector/core/module/ModuleManager.java | 14 +-
.../apm/collector/core/module/ModuleProvider.java | 12 +-
.../apm/collector/core/module/Service.java | 2 +-
.../apm/collector/core/module/BaseModuleA.java | 2 +-
.../apm/collector/core/module/BaseModuleB.java | 2 +-
.../apm/collector/core/module/ModuleAProvider.java | 2 +-
.../apm/collector/core/module/ModuleBProvider.java | 2 +-
.../apm/collector/core/module/TestModule.java | 2 +-
.../collector/core/module/TestModuleProvider.java | 2 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../collector/grpc/manager/GRPCManagerModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../grpc/manager/GRPCManagerProvider.java | 4 +-
.../jetty/manager/JettyManagerModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../jetty/manager/JettyManagerProvider.java | 8 +-
.../apm/collector/naming/NamingModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../naming/jetty/NamingModuleJettyProvider.java | 8 +-
.../apm/collector/remote/RemoteModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../remote/grpc/RemoteModuleGRPCProvider.java | 8 +-
.../apm/collector/storage/StorageModule.java | 4 +-
.../storage/dao/ui/IApplicationAlarmUIDAO.java | 7 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../storage/es/StorageModuleEsProvider.java | 4 +-
.../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 23 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 8 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 29 +-
.../storage/h2/StorageModuleH2Provider.java | 8 +-
.../storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java | 4 +-
.../skywalking/apm/collector/ui/UIModule.java | 4 +-
...walking.apm.collector.core.module.ModuleDefine} | 0
.../collector/ui/jetty/UIModuleJettyProvider.java | 4 +-
.../apm/collector/ui/query/AlarmQuery.java | 14 +-
.../apm/collector/ui/query/ApplicationQuery.java | 16 +-
.../apm/collector/ui/query/OverViewLayerQuery.java | 25 +-
.../apm/collector/ui/service/AlarmService.java | 42 +-
.../ui/service/ApplicationTopologyService.java | 20 +-
.../service/ResponseTimeDistributionService.java | 2 +-
.../collector/ui/service/SegmentTopService.java | 4 +
.../apm/collector/ui/service/TopologyBuilder.java | 43 +-
.../apm/collector/core/module/MockModule.java | 2 +-
.../apm/collector/ui/query/AlarmQueryTestCase.java | 26 +-
.../apm/collector/ui/service/AlarmServiceTest.java | 34 +-
.../collector/ui/service/TopologyBuilderTest.java | 2 +-
apm-dist/bin/collectorService.sh | 4 +-
apm-dist/bin/webappService.sh | 4 +-
.../agent/core/context/trace/TraceSegmentRef.java | 2 +-
.../skywalking/apm/agent/core/jvm/gc/GCModule.java | 30 +-
.../apm-sdk-plugin/jdk-cross-thread-plugin/pom.xml | 59 ---
.../src/main/resources/skywalking-plugin.def | 17 -
apm-sniffer/apm-sdk-plugin/pom.xml | 1 -
.../trace/CallableOrRunnableActivation.java} | 17 +-
.../CallableOrRunnableConstructInterceptor.java | 3 +-
.../CallableOrRunnableInvokeInterceptor.java | 6 +-
.../src/main/resources/skywalking-plugin.def | 1 +
.../trace}/CallableOrRunnableInterceptorTest.java | 26 +-
docs/README.md | 1 +
.../Application-toolkit-trace-cross-thread-CN.md | 9 +
docs/cn/How-to-build-CN.md | 2 +-
docs/en/Application-toolkit-trace-cross-thread.md | 10 +
docs/en/Collector-Table-Description.md | 572 +++++++++++++++++++++
docs/en/How-to-build.md | 2 +-
skywalking-ui | 2 +-
166 files changed, 3636 insertions(+), 903 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.