You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2020/02/11 10:06:02 UTC
[skywalking] branch grpc_alarm updated (17e5b33 -> 11f0ea1)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch grpc_alarm
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 17e5b33 fix ci.
add 5b255ba Set up more strict code styles and fix existing issues (#4337)
add 11f0ea1 Merge commit '5b255ba3e3b50e0e0196b28cdca21dcd5c9c3da2' into grpc_alarm
No new revisions were added by this update.
Summary of changes:
.../log/log4j/v1/x/TraceIdPatternConverter.java | 6 +-
.../log/log4j/v1/x/TraceIdPatternLayout.java | 3 -
.../log/log4j/v1/x/TraceIdPatternParser.java | 2 -
.../log/log4j/v2/x/Log4j2OutputAppender.java | 8 +-
.../toolkit/log/log4j/v2/x/TraceIdConverter.java | 10 +-
.../log/logback/v1/x/LogbackPatternConverter.java | 8 +-
.../logback/v1/x/TraceIdPatternLogbackLayout.java | 7 +-
.../logback/v1/x/logstash/TraceIdJsonProvider.java | 3 -
.../v1/x/mdc/LogbackMDCPatternConverter.java | 8 +-
.../v1/x/mdc/TraceIdMDCPatternLogbackLayout.java | 2 -
.../apm/toolkit/opentracing/ByteBufferContext.java | 4 -
.../toolkit/opentracing/NeedSnifferActivation.java | 12 +-
.../toolkit/opentracing/SkywalkingActiveSpan.java | 7 +-
.../apm/toolkit/opentracing/SkywalkingContext.java | 3 -
.../opentracing/SkywalkingContinuation.java | 10 +-
.../apm/toolkit/opentracing/SkywalkingSpan.java | 34 +-
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 13 +-
.../apm/toolkit/opentracing/SkywalkingTracer.java | 6 +-
.../skywalking/apm/toolkit/opentracing/Tag.java | 4 -
.../apm/toolkit/opentracing/TextMapContext.java | 4 -
.../skywalking/apm/toolkit/trace/ActiveSpan.java | 3 -
.../apm/toolkit/trace/CallableWrapper.java | 4 +-
.../apm/toolkit/trace/RunnableWrapper.java | 5 +-
.../apm/toolkit/trace/SupplierWrapper.java | 4 +-
.../apache/skywalking/apm/toolkit/trace/Tag.java | 10 +-
.../apache/skywalking/apm/toolkit/trace/Tags.java | 4 +-
.../apache/skywalking/apm/toolkit/trace/Trace.java | 3 -
.../skywalking/apm/toolkit/trace/TraceContext.java | 8 +-
.../apm/toolkit/trace/TraceCrossThread.java | 4 +-
apm-checkstyle/checkStyle.xml | 54 +--
apm-commons/apm-datacarrier/pom.xml | 3 +-
.../apm/commons/datacarrier/DataCarrier.java | 27 +-
.../apm/commons/datacarrier/EnvUtil.java | 2 -
.../buffer/ArrayBlockingQueueBuffer.java | 16 +-
.../apm/commons/datacarrier/buffer/Buffer.java | 5 +-
.../commons/datacarrier/buffer/BufferStrategy.java | 7 +-
.../apm/commons/datacarrier/buffer/Channels.java | 4 -
.../commons/datacarrier/buffer/QueueBuffer.java | 5 +-
.../datacarrier/common/AtomicRangeInteger.java | 7 +-
.../datacarrier/consumer/BulkConsumePool.java | 25 +-
.../consumer/ConsumerCannotBeCreatedException.java | 4 -
.../commons/datacarrier/consumer/ConsumerPool.java | 6 +-
.../datacarrier/consumer/ConsumerPoolFactory.java | 19 +-
.../datacarrier/consumer/ConsumerThread.java | 6 -
.../commons/datacarrier/consumer/IConsumer.java | 4 -
.../apm/commons/datacarrier/consumer/IDriver.java | 4 +-
.../consumer/MultipleChannelsConsumer.java | 5 -
.../datacarrier/partition/IDataPartitioner.java | 6 +-
.../partition/ProducerThreadPartitioner.java | 5 +-
.../partition/SimpleRollingPartitioner.java | 4 -
.../apm/commons/datacarrier/DataCarrierTest.java | 30 +-
.../apm/commons/datacarrier/EnvUtilTest.java | 4 -
.../commons/datacarrier/LinkedArrayBenchmark.java | 11 +-
.../apm/commons/datacarrier/SampleData.java | 4 -
.../datacarrier/common/AtomicRangeIntegerTest.java | 25 +-
.../datacarrier/common/AtomicRangeIntegerV1.java | 2 -
.../datacarrier/common/AtomicRangeIntegerV2.java | 5 +-
.../datacarrier/consumer/ConsumeDriverTest.java | 18 +-
.../consumer/ConsumerPoolFactoryTest.java | 8 +-
.../commons/datacarrier/consumer/ConsumerTest.java | 15 +-
.../datacarrier/consumer/SampleConsumer.java | 4 -
.../partition/ProducerThreadPartitionerTest.java | 6 +-
.../partition/SimpleRollingPartitionerTest.java | 4 -
apm-commons/apm-util/pom.xml | 3 +-
.../skywalking/apm/util/ConfigInitializer.java | 25 +-
.../apache/skywalking/apm/util/MachineInfo.java | 1 -
.../apm/util/PlaceholderConfigurerSupport.java | 15 +-
.../apm/util/PropertyPlaceholderHelper.java | 28 +-
.../apm/util/RunnableWithExceptionProtection.java | 3 -
.../skywalking/apm/util/StringFormatGroup.java | 59 +--
.../skywalking/apm/util/ConfigInitializerTest.java | 6 +-
.../skywalking/apm/util/MachineInfoTest.java | 3 -
.../util/RunnableWithExceptionProtectionTest.java | 3 -
.../skywalking/apm/util/StringFormatGroupTest.java | 30 +-
.../apache/skywalking/apm/util/StringUtilTest.java | 4 -
apm-commons/pom.xml | 3 +-
apm-dist-es7/pom.xml | 7 +-
apm-protocol/apm-network/pom.xml | 9 +-
.../skywalking/apm/network/ProtocolVersion.java | 2 -
.../apm/network/constants/ProfileConstants.java | 3 +-
.../apm/network/trace/component/Component.java | 8 +-
.../network/trace/component/ComponentsDefine.java | 47 ++-
.../network/trace/component/OfficialComponent.java | 4 -
.../trace/component/command/BaseCommand.java | 6 +-
.../component/command/CommandDeserializer.java | 3 -
.../trace/component/command/Deserializable.java | 3 -
.../component/command/EndpointResetCommand.java | 12 +-
.../component/command/InstanceResetCommand.java | 5 +-
.../component/command/NetworkResetCommand.java | 12 +-
.../component/command/ProfileTaskCommand.java | 24 +-
.../trace/component/command/Serializable.java | 3 -
.../component/command/ServiceResetCommand.java | 2 -
.../component/command/TraceIgnoreCommand.java | 8 +-
.../command/UnsupportedCommandException.java | 3 -
.../component/command/ServiceResetCommandTest.java | 14 +-
.../apm/network/trace/proto/GRPCNoServerTest.java | 26 +-
apm-protocol/pom.xml | 3 +-
apm-sniffer/apm-agent-core/pom.xml | 32 +-
.../skywalking/apm/agent/core/base64/Base64.java | 1 +
.../core/boot/AgentPackageNotFoundException.java | 4 -
.../apm/agent/core/boot/AgentPackagePath.java | 8 +-
.../apm/agent/core/boot/BootService.java | 6 +-
.../apm/agent/core/boot/DefaultImplementor.java | 3 -
.../agent/core/boot/DefaultNamedThreadFactory.java | 7 +-
.../apm/agent/core/boot/OverrideImplementor.java | 3 -
.../agent/core/boot/ServiceConflictException.java | 3 -
.../apm/agent/core/boot/ServiceManager.java | 32 +-
.../core/commands/CommandExecutionException.java | 9 +-
.../apm/agent/core/commands/CommandExecutor.java | 7 +-
.../core/commands/CommandExecutorService.java | 15 +-
.../core/commands/CommandSerialNumberCache.java | 3 -
.../apm/agent/core/commands/CommandService.java | 4 +-
.../executor/ProfileTaskCommandExecutor.java | 2 -
.../executor/ServiceResetCommandExecutor.java | 3 -
.../skywalking/apm/agent/core/conf/Config.java | 47 +--
.../agent/core/conf/ConfigNotFoundException.java | 4 -
.../agent/core/conf/ConfigReadFailedException.java | 25 --
.../skywalking/apm/agent/core/conf/Constants.java | 1 -
.../apm/agent/core/conf/OPGroupDefinition.java | 3 -
.../agent/core/conf/RemoteDownstreamConfig.java | 7 +-
.../agent/core/conf/SnifferConfigInitializer.java | 27 +-
.../agent/core/context/AbstractTracerContext.java | 4 +-
.../apm/agent/core/context/AsyncSpan.java | 17 +-
.../apm/agent/core/context/CarrierItem.java | 3 -
.../apm/agent/core/context/CarrierItemHead.java | 4 -
.../apm/agent/core/context/ContextCarrier.java | 7 +-
.../apm/agent/core/context/ContextManager.java | 40 +-
.../core/context/ContextManagerExtendService.java | 19 +-
.../apm/agent/core/context/ContextSnapshot.java | 10 +-
.../core/context/IgnoreTracerContextListener.java | 4 -
.../agent/core/context/IgnoredTracerContext.java | 26 +-
.../core/context/OperationNameFormatService.java | 20 +-
.../apm/agent/core/context/RuntimeContext.java | 19 +-
.../agent/core/context/RuntimeContextSnapshot.java | 6 +-
.../apm/agent/core/context/SW6CarrierItem.java | 3 -
.../apm/agent/core/context/TracingContext.java | 62 ++-
.../agent/core/context/TracingContextListener.java | 1 -
.../agent/core/context/TracingThreadListener.java | 3 -
.../agent/core/context/ids/DistributedTraceId.java | 18 +-
.../core/context/ids/DistributedTraceIds.java | 4 -
.../agent/core/context/ids/GlobalIdGenerator.java | 21 +-
.../skywalking/apm/agent/core/context/ids/ID.java | 24 +-
.../core/context/ids/NewDistributedTraceId.java | 3 -
.../agent/core/context/ids/PropagatedTraceId.java | 3 -
.../apm/agent/core/context/tag/AbstractTag.java | 1 -
.../apm/agent/core/context/tag/StringTag.java | 2 -
.../apm/agent/core/context/tag/Tags.java | 6 +-
.../apm/agent/core/context/trace/AbstractSpan.java | 10 +-
.../core/context/trace/AbstractTracingSpan.java | 45 ++-
.../apm/agent/core/context/trace/EntrySpan.java | 14 +-
.../apm/agent/core/context/trace/ExitSpan.java | 18 +-
.../apm/agent/core/context/trace/LocalSpan.java | 12 +-
.../agent/core/context/trace/LogDataEntity.java | 11 +-
.../apm/agent/core/context/trace/NoopExitSpan.java | 1 -
.../apm/agent/core/context/trace/NoopSpan.java | 65 ++--
.../apm/agent/core/context/trace/SpanLayer.java | 9 +-
.../core/context/trace/StackBasedTracingSpan.java | 46 +--
.../apm/agent/core/context/trace/TraceSegment.java | 24 +-
.../agent/core/context/trace/TraceSegmentRef.java | 14 +-
.../apm/agent/core/context/trace/WithPeerInfo.java | 4 -
.../apm/agent/core/context/util/KeyValuePair.java | 3 -
.../apm/agent/core/context/util/PeerFormat.java | 4 -
.../core/context/util/ThrowableTransformer.java | 1 -
.../agent/core/dictionary/DictionaryManager.java | 4 -
.../apm/agent/core/dictionary/DictionaryUtil.java | 4 -
.../core/dictionary/EndpointNameDictionary.java | 84 ++--
.../apm/agent/core/dictionary/Found.java | 4 -
.../core/dictionary/NetworkAddressDictionary.java | 17 +-
.../apm/agent/core/dictionary/NotFound.java | 4 -
.../apm/agent/core/dictionary/PossibleFound.java | 3 -
.../skywalking/apm/agent/core/jvm/JVMService.java | 44 +--
.../apm/agent/core/jvm/cpu/CPUMetricsAccessor.java | 3 -
.../apm/agent/core/jvm/cpu/CPUProvider.java | 11 +-
.../agent/core/jvm/cpu/NoSupportedCPUAccessor.java | 4 -
.../apm/agent/core/jvm/cpu/SunCpuAccessor.java | 6 +-
.../apm/agent/core/jvm/gc/CMSGCModule.java | 10 +-
.../apm/agent/core/jvm/gc/G1GCModule.java | 10 +-
.../apm/agent/core/jvm/gc/GCMetricAccessor.java | 6 +-
.../skywalking/apm/agent/core/jvm/gc/GCModule.java | 13 +-
.../apm/agent/core/jvm/gc/GCProvider.java | 6 +-
.../apm/agent/core/jvm/gc/ParallelGCModule.java | 10 +-
.../apm/agent/core/jvm/gc/SerialGCModule.java | 10 +-
.../skywalking/apm/agent/core/jvm/gc/UnknowGC.java | 7 +-
.../apm/agent/core/jvm/memory/MemoryProvider.java | 6 +-
.../core/jvm/memorypool/CMSCollectorModule.java | 27 +-
.../core/jvm/memorypool/G1CollectorModule.java | 27 +-
.../jvm/memorypool/MemoryPoolMetricsAccessor.java | 3 -
.../core/jvm/memorypool/MemoryPoolModule.java | 25 +-
.../core/jvm/memorypool/MemoryPoolProvider.java | 7 +-
.../jvm/memorypool/ParallelCollectorModule.java | 27 +-
.../core/jvm/memorypool/SerialCollectorModule.java | 27 +-
.../core/jvm/memorypool/UnknownMemoryPool.java | 7 +-
.../apm/agent/core/logging/api/ILog.java | 6 +-
.../apm/agent/core/logging/api/LogManager.java | 1 -
.../apm/agent/core/logging/api/LogResolver.java | 4 +-
.../apm/agent/core/logging/api/NoopLogger.java | 6 +-
.../apm/agent/core/logging/core/Converter.java | 3 -
.../apm/agent/core/logging/core/FileWriter.java | 73 ++--
.../apm/agent/core/logging/core/IWriter.java | 1 -
.../apm/agent/core/logging/core/LogEvent.java | 3 -
.../apm/agent/core/logging/core/LogLevel.java | 4 -
.../agent/core/logging/core/LogMessageHolder.java | 7 +-
.../apm/agent/core/logging/core/LogOutput.java | 4 -
.../apm/agent/core/logging/core/Parser.java | 5 -
.../core/logging/core/PatternLogResolver.java | 4 -
.../apm/agent/core/logging/core/PatternLogger.java | 11 +-
.../agent/core/logging/core/SystemOutWriter.java | 6 +-
.../apm/agent/core/logging/core/WriterFactory.java | 4 -
.../logging/core/coverts/AgentNameConverter.java | 5 -
.../core/logging/core/coverts/ClassConverter.java | 3 -
.../core/logging/core/coverts/DateConverter.java | 3 -
.../core/logging/core/coverts/LevelConverter.java | 2 -
.../logging/core/coverts/LiteralConverter.java | 2 -
.../logging/core/coverts/MessageConverter.java | 2 -
.../core/logging/core/coverts/ThreadConverter.java | 2 -
.../logging/core/coverts/ThrowableConverter.java | 2 -
.../skywalking/apm/agent/core/os/OSUtil.java | 3 -
.../apm/agent/core/os/ProcessorUtil.java | 4 -
.../plugin/AbstractClassEnhancePluginDefine.java | 18 +-
.../agent/core/plugin/ByteBuddyCoreClasses.java | 4 +-
.../apm/agent/core/plugin/DynamicPluginLoader.java | 2 -
.../apm/agent/core/plugin/EnhanceContext.java | 12 +-
.../core/plugin/InstrumentDebuggingClass.java | 3 -
.../apm/agent/core/plugin/PluginBootstrap.java | 14 +-
.../apm/agent/core/plugin/PluginCfg.java | 1 -
.../apm/agent/core/plugin/PluginDefine.java | 2 -
.../apm/agent/core/plugin/PluginException.java | 1 -
.../apm/agent/core/plugin/PluginFinder.java | 9 +-
.../agent/core/plugin/PluginResourcesResolver.java | 6 +-
.../apm/agent/core/plugin/WitnessClassFinder.java | 9 +-
.../plugin/bootstrap/BootstrapInstrumentBoost.java | 40 +-
.../plugin/bootstrap/BootstrapPluginLogBridge.java | 41 +-
.../agent/core/plugin/bootstrap/IBootstrapLog.java | 4 +-
.../template/ConstructorInterTemplate.java | 11 +-
.../template/InstanceMethodInterTemplate.java | 30 +-
...nstanceMethodInterWithOverrideArgsTemplate.java | 30 +-
.../template/StaticMethodInterTemplate.java | 12 +-
.../StaticMethodInterWithOverrideArgsTemplate.java | 12 +-
.../core/plugin/bytebuddy/AbstractJunction.java | 4 -
.../plugin/bytebuddy/AnnotationTypeNameMatch.java | 17 +-
.../plugin/bytebuddy/ArgumentTypeNameMatch.java | 17 +-
.../core/plugin/bytebuddy/ReturnTypeNameMatch.java | 15 +-
.../exception/IllegalPluginDefineException.java | 1 -
.../interceptor/ConstructorInterceptPoint.java | 7 +-
.../DeclaredInstanceMethodsInterceptPoint.java | 6 +-
.../core/plugin/interceptor/EnhanceException.java | 1 -
.../interceptor/InstanceMethodsInterceptPoint.java | 7 +-
.../interceptor/StaticMethodsInterceptPoint.java | 7 +-
.../enhance/BootstrapInterRuntimeAssist.java | 11 +-
.../enhance/ClassEnhancePluginDefine.java | 111 ++----
.../ClassInstanceMethodsEnhancePluginDefine.java | 7 +-
.../ClassStaticMethodsEnhancePluginDefine.java | 6 +-
.../interceptor/enhance/ConstructorInter.java | 20 +-
.../interceptor/enhance/EnhancedInstance.java | 4 -
.../interceptor/enhance/InstMethodsInter.java | 39 +-
.../enhance/InstMethodsInterWithOverrideArgs.java | 39 +-
.../enhance/InstanceConstructorInterceptor.java | 7 +-
.../enhance/InstanceMethodsAroundInterceptor.java | 10 +-
.../interceptor/enhance/MethodInterceptResult.java | 12 +-
.../interceptor/enhance/OverrideCallable.java | 4 -
.../enhance/StaticMethodsAroundInterceptor.java | 10 +-
.../interceptor/enhance/StaticMethodsInter.java | 25 +-
.../StaticMethodsInterWithOverrideArgs.java | 25 +-
.../core/plugin/jdk9module/JDK9ModuleExporter.java | 6 +-
.../agent/core/plugin/loader/AgentClassLoader.java | 8 +-
.../core/plugin/loader/InstrumentationLoader.java | 2 -
.../plugin/loader/InterceptorInstanceLoader.java | 19 +-
.../core/plugin/match/ClassAnnotationMatch.java | 3 -
.../apm/agent/core/plugin/match/ClassMatch.java | 4 -
.../agent/core/plugin/match/HierarchyMatch.java | 3 -
.../apm/agent/core/plugin/match/IndirectMatch.java | 3 -
.../core/plugin/match/MethodAnnotationMatch.java | 6 +-
.../match/MethodInheritanceAnnotationMatcher.java | 7 +-
.../core/plugin/match/MultiClassNameMatch.java | 3 -
.../apm/agent/core/plugin/match/NameMatch.java | 3 -
.../apm/agent/core/plugin/match/PrefixMatch.java | 3 -
.../core/plugin/match/ProtectiveShieldMatcher.java | 7 +-
.../core/plugin/match/logical/LogicalAndMatch.java | 2 -
.../match/logical/LogicalMatchOperation.java | 2 -
.../core/plugin/match/logical/LogicalOrMatch.java | 2 -
.../apm/agent/core/profile/ProfileTask.java | 18 +-
.../core/profile/ProfileTaskChannelService.java | 126 +++---
.../core/profile/ProfileTaskExecutionContext.java | 9 +-
.../core/profile/ProfileTaskExecutionService.java | 76 ++--
.../apm/agent/core/profile/ProfileThread.java | 2 -
.../apm/agent/core/profile/ProfilingStatus.java | 3 -
.../apm/agent/core/profile/ThreadProfiler.java | 9 +-
.../agent/core/profile/TracingThreadSnapshot.java | 4 -
.../apm/agent/core/remote/AgentIDDecorator.java | 8 +-
.../agent/core/remote/AuthenticationDecorator.java | 5 +-
.../apm/agent/core/remote/ChannelBuilder.java | 3 -
.../apm/agent/core/remote/ChannelDecorator.java | 3 -
.../apm/agent/core/remote/GRPCChannel.java | 7 +-
.../apm/agent/core/remote/GRPCChannelListener.java | 4 -
.../apm/agent/core/remote/GRPCChannelManager.java | 57 ++-
.../apm/agent/core/remote/GRPCChannelStatus.java | 7 +-
.../agent/core/remote/GRPCStreamServiceStatus.java | 24 +-
.../remote/ServiceAndEndpointRegisterClient.java | 98 +++--
.../agent/core/remote/StandardChannelBuilder.java | 10 +-
.../apm/agent/core/remote/TLSChannelBuilder.java | 7 +-
.../core/remote/TraceSegmentServiceClient.java | 41 +-
.../apm/agent/core/sampling/SamplingService.java | 41 +-
.../apm/agent/core/util/CollectionUtil.java | 14 +-
.../apm/agent/core/util/CustomizeExpression.java | 2 -
.../skywalking/apm/agent/core/util/MethodUtil.java | 20 +-
.../apm/agent/core/base64/Base64Test.java | 3 -
.../core/boot/DefaultNamedThreadFactoryTest.java | 3 -
.../apm/agent/core/boot/ServiceManagerTest.java | 14 +-
.../core/conf/SnifferConfigInitializerTest.java | 8 +-
.../apm/agent/core/context/ContextManagerTest.java | 34 +-
.../core/context/IgnoredTracerContextTest.java | 16 +-
.../apm/agent/core/context/TracingContextTest.java | 12 +-
.../context/util/AbstractTracingSpanHelper.java | 1 -
.../apm/agent/core/context/util/FieldGetter.java | 5 +-
.../apm/agent/core/context/util/SegmentHelper.java | 1 -
.../apm/agent/core/context/util/SpanHelper.java | 1 -
.../core/context/util/TraceSegmentRefHelper.java | 1 -
.../agent/core/dictionary/DictionaryUtilTests.java | 3 -
.../agent/core/logging/core/FileWriterTest.java | 4 -
.../core/logging/core/PatternLogResolverTest.java | 4 -
.../agent/core/logging/core/PatternLoggerTest.java | 12 +-
.../core/logging/core/SystemOutWriterTest.java | 4 -
.../agent/core/logging/core/WriterFactoryTest.java | 6 +-
.../bytebuddy/AnnotationTypeNameMatchTest.java | 5 +-
.../apm/agent/core/plugin/bytebuddy/Inject.java | 11 +-
.../MethodInheritanceAnnotationMatcherTest.java | 4 +-
.../apm/agent/core/plugin/bytebuddy/Person.java | 5 +-
.../plugin/bytebuddy/ReturnTypeNameMatchTest.java | 5 +-
.../agent/core/remote/GRPCChannelManagerTest.java | 20 +-
.../core/remote/TraceSegmentServiceClientTest.java | 3 +-
.../agent/core/test/tools/AgentServiceRule.java | 1 -
.../apm/agent/core/test/tools/SegmentStorage.java | 1 -
.../agent/core/test/tools/SegmentStoragePoint.java | 1 -
.../core/test/tools/TracingSegmentRunner.java | 7 +-
.../apm/agent/core/util/MethodUtilTest.java | 6 +-
.../apm/agent/core/util/PeerFormatTest.java | 4 -
apm-sniffer/apm-agent/pom.xml | 21 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 70 ++--
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 3 +-
.../ActiveMQConsumerConstructorInterceptor.java | 5 +-
.../activemq/ActiveMQConsumerInterceptor.java | 22 +-
.../ActiveMQProducerConstructorInterceptor.java | 5 +-
.../activemq/ActiveMQProducerInterceptor.java | 24 +-
.../define/ActiveMQConsumerInstrumentation.java | 43 ++-
.../define/ActiveMQProducerInstrumentation.java | 44 ++-
...sumerAndProducerConstructorInterceptorTest.java | 34 +-
.../activemq/ActiveMQConsumerInterceptorTest.java | 15 +-
.../activemq/ActiveMQProducerInterceptorTest.java | 14 +-
.../apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml | 3 +-
.../armeria/Armeria084ClientInterceptor.java | 27 +-
.../armeria/Armeria084ServerInterceptor.java | 27 +-
.../define/Armeria084ClientInstrumentation.java | 20 +-
.../define/Armeria084ServerInstrumentation.java | 12 +-
.../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 3 +-
.../armeria/Armeria085ClientInterceptor.java | 19 +-
.../armeria/Armeria085ServerInterceptor.java | 27 +-
.../armeria/Armeria086ClientInterceptor.java | 19 +-
.../plugin/armeria/ArmeriaClientInterceptor.java | 11 +-
.../define/Armeria085ClientInstrumentation.java | 20 +-
.../define/Armeria085ServerInstrumentation.java | 12 +-
.../define/Armeria086ClientInstrumentation.java | 22 +-
apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml | 3 +-
.../plugin/avro/AbstractRequestInterceptor.java | 13 +-
.../skywalking/apm/plugin/avro/AvroInstance.java | 1 +
.../plugin/avro/GenericRequestorInterceptor.java | 3 +-
.../apm/plugin/avro/ResponderInterceptor.java | 3 +-
.../apm/plugin/avro/SWClientRPCPlugin.java | 4 +-
.../apm/plugin/avro/SWServerRPCPlugin.java | 7 +-
.../plugin/avro/SpecificRequestorInterceptor.java | 5 +-
.../define/GenericRequestorInstrumentation.java | 9 +-
.../avro/define/ResponderInstrumentation.java | 3 +-
.../define/SpecificRequestorInstrumentation.java | 7 +-
.../avro/GenericRequestorInterceptorTest.java | 7 +-
.../avro/SpecificRequestorInterceptorTest.java | 7 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 3 +-
.../plugin/canal/CanalConstructorInterceptor.java | 9 +-
.../apm/plugin/canal/CanalEnhanceInfo.java | 17 +-
.../apm/plugin/canal/CanalInterceptor.java | 28 +-
.../canal/ClusterNodeConstructInterceptor.java | 13 +-
.../plugin/canal/define/CanalInstrumentation.java | 20 +-
.../canal/define/ClusterNodeInstrumentation.java | 12 +-
.../apm/plugin/canal/CanalInterceptorTest.java | 5 +-
.../cassandra-java-driver-3.x-plugin/pom.xml | 3 +-
.../java/driver/v3/ClusterConnectInterceptor.java | 12 +-
...ConstructorWithStateListenerArgInterceptor.java | 7 +-
.../cassandra/java/driver/v3/ConnectionInfo.java | 3 -
.../plugin/cassandra/java/driver/v3/Constants.java | 3 -
...sultSetFutureGetUninterruptiblyInterceptor.java | 13 +-
...AndExecuteAsyncWithStatementArgInterceptor.java | 18 +-
.../driver/v3/define/ClusterInstrumentation.java | 7 +-
.../DefaultResultSetFutureInstrumentation.java | 6 +-
.../v3/define/SessionManagerInstrumentation.java | 7 +-
.../driver/v3/ClusterConnectInterceptorTest.java | 5 +-
...tructorWithStateListenerArgInterceptorTest.java | 8 +-
...SetFutureGetUninterruptiblyInterceptorTest.java | 12 +-
...xecuteAsyncWithStatementArgInterceptorTest.java | 16 +-
.../dubbo-2.7.x-conflict-patch/pom.xml | 3 +-
.../asf/dubbo/patch/MakeWrapperInterceptor.java | 93 +++--
.../asf/dubbo/patch/WrapperInstrumentation.java | 27 +-
.../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 3 +-
.../apm/plugin/asf/dubbo/DubboInterceptor.java | 19 +-
.../dubbo/ContextManagerExtendOverrideService.java | 3 -
.../apm/plugin/dubbo/DubboInterceptorTest.java | 16 +-
.../apm/plugin/dubbo/PluginBootService.java | 15 +-
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 3 +-
.../plugin/dubbo/patch/MakeWrapperInterceptor.java | 96 +++--
.../plugin/dubbo/patch/WrapperInstrumentation.java | 29 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 3 +-
.../apm/plugin/dubbo/DubboInterceptor.java | 20 +-
.../dubbo/ContextManagerExtendOverrideService.java | 3 -
.../apm/plugin/dubbo/DubboInterceptorTest.java | 16 +-
.../apm/plugin/dubbo/PluginBootService.java | 15 +-
.../apm-sdk-plugin/ehcache-2.x-plugin/pom.xml | 4 +-
.../ehcache/v2/EhcacheConstructorInterceptor.java | 3 -
.../apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java | 3 -
.../plugin/ehcache/v2/EhcacheLockInterceptor.java | 15 +-
.../ehcache/v2/EhcacheOperateAllInterceptor.java | 12 +-
.../v2/EhcacheOperateElementInterceptor.java | 12 +-
.../v2/EhcacheOperateObjectInterceptor.java | 12 +-
.../v2/define/EhcachePluginInstrumentation.java | 49 ++-
.../plugin/ehcache/v2/EhcacheInterceptorTest.java | 23 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 3 +-
.../apm/plugin/esjob/JobExecutorInterceptor.java | 10 +-
.../esjob/define/JobExecutorInstrumentation.java | 23 +-
.../plugin/esjob/JobExecutorInterceptorTest.java | 32 +-
.../elasticsearch-5.x-plugin/pom.xml | 3 +-
.../v5/AddTransportAddressesInterceptor.java | 7 +-
.../apm/plugin/elasticsearch/v5/Constants.java | 3 -
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 5 +-
.../v5/PlainListenableActionFutureInterceptor.java | 23 +-
.../v5/RemoveTransportAddressInterceptor.java | 7 +-
.../v5/TransportActionNodeProxyInterceptor.java | 18 +-
.../v5/TransportProxyClientInterceptor.java | 21 +-
.../apm/plugin/elasticsearch/v5/Util.java | 3 -
.../v5/define/GenericActionInstrumentation.java | 18 +-
...PlainListenableActionFutureInstrumentation.java | 5 +-
.../TransportActionNodeProxyInstrumentation.java | 13 +-
...TransportClientNodesServiceInstrumentation.java | 29 +-
.../TransportProxyClientInstrumentation.java | 3 -
.../elasticsearch-6.x-plugin/pom.xml | 3 +-
.../plugin/elasticsearch/v6/RemotePeerCache.java | 8 +-
.../elasticsearch/v6/RestClientEnhanceInfo.java | 4 +-
.../v6/define/IndicesClientInstrumentation.java | 9 +-
.../define/RestHighLevelClientInstrumentation.java | 16 +-
.../elasticsearch/v6/interceptor/Constants.java | 4 +-
.../IndicesClientCreateMethodsInterceptor.java | 34 +-
.../IndicesClientDeleteMethodsInterceptor.java | 31 +-
.../RestHighLevelClientConInterceptor.java | 6 +-
.../RestHighLevelClientGetMethodsInterceptor.java | 22 +-
...RestHighLevelClientIndexMethodsInterceptor.java | 22 +-
...stHighLevelClientIndicesMethodsInterceptor.java | 21 +-
...estHighLevelClientSearchMethodsInterceptor.java | 22 +-
...estHighLevelClientUpdateMethodsInterceptor.java | 22 +-
.../IndicesClientCreateMethodsInterceptorTest.java | 14 +-
.../IndicesClientDeleteMethodsInterceptorTest.java | 13 +-
.../RestHighLevelClientConInterceptorTest.java | 21 +-
...stHighLevelClientGetMethodsInterceptorTest.java | 15 +-
...HighLevelClientIndexMethodsInterceptorTest.java | 15 +-
...ighLevelClientSearchMethodsInterceptorTest.java | 15 +-
...ighLevelClientUpdateMethodsInterceptorTest.java | 15 +-
.../feign-default-http-9.x-plugin/pom.xml | 3 +-
.../http/v9/DefaultHttpClientInterceptor.java | 12 +-
.../apm/plugin/feign/http/v9/FeignResolvedURL.java | 2 +-
.../plugin/feign/http/v9/PathVarInterceptor.java | 28 +-
.../define/DefaultHttpClientInstrumentation.java | 18 +-
.../http/v9/define/PathVarInstrumentation.java | 18 +-
.../http/v9/DefaultHttpClientInterceptorTest.java | 24 +-
.../feign/http/v9/PathVarInterceptorTest.java | 26 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 3 +-
.../skywalking/apm/plugin/grpc/v1/Constants.java | 10 +-
.../plugin/grpc/v1/OperationNameFormatUtil.java | 2 -
.../grpc/v1/client/AbstractStubInterceptor.java | 8 +-
.../grpc/v1/client/BlockingCallInterceptor.java | 9 +-
.../plugin/grpc/v1/client/ClientInterceptor.java | 5 +-
.../plugin/grpc/v1/client/TracingClientCall.java | 27 +-
.../AbstractServerImplBuilderInstrumentation.java | 18 +-
.../v1/define/AbstractStubInstrumentation.java | 21 +-
.../grpc/v1/define/ClientCallsInstrumentation.java | 18 +-
.../AbstractServerImplBuilderInterceptor.java | 11 +-
.../plugin/grpc/v1/server/ServerInterceptor.java | 9 +-
.../plugin/grpc/v1/server/TracingServerCall.java | 7 +-
.../grpc/v1/server/TracingServerCallListener.java | 10 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 3 +-
.../h2/JdbcXAConnectionConstructorInterceptor.java | 9 +-
...PooledJdbcConnectionConstructorInterceptor.java | 6 +-
.../define/AbstractConnectionInstrumentation.java | 71 ++--
.../jdbc/h2/define/DriverInstrumentation.java | 3 -
.../h2/define/JdbcConnectionInstrumentation.java | 6 +-
.../h2/define/JdbcXAConnectionInstrumentation.java | 15 +-
.../PooledJdbcConnectionInstrumentation.java | 15 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 4 +-
.../v4/HttpClientExecuteInterceptor.java | 23 +-
.../define/AbstractHttpClientInstrumentation.java | 12 +-
.../DefaultRequestDirectorInstrumentation.java | 4 +-
.../define/InternalHttpClientInstrumentation.java | 8 +-
.../define/MinimalHttpClientInstrumentation.java | 8 +-
.../v4/HttpClientExecuteInterceptorTest.java | 15 +-
.../httpasyncclient-4.x-plugin/pom.xml | 3 +-
.../v4/HttpAsyncClientInterceptor.java | 12 +-
.../v4/HttpAsyncRequestExecutorInterceptor.java | 11 +-
.../v4/SessionRequestCompleteInterceptor.java | 12 +-
.../v4/SessionRequestConstructorInterceptor.java | 6 +-
.../v4/SessionRequestFailInterceptor.java | 12 +-
.../v4/define/HttpAsyncClientInstrumentation.java | 42 +-
.../HttpAsyncRequestExecutorInstrumentation.java | 29 +-
.../v4/define/SessionRequestInstrumentation.java | 80 ++--
.../v4/wrapper/FutureCallbackWrapper.java | 7 +-
.../wrapper/HttpAsyncResponseConsumerWrapper.java | 6 +-
.../v4/HttpAsyncClientInterceptorTest.java | 17 +-
.../v3/HttpClientExecuteInterceptor.java | 27 +-
.../v3/define/HttpClientInstrumentation.java | 14 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 3 +-
.../hystrix/v1/EnhanceRequireObjectCache.java | 2 -
.../v1/HystrixCommandConstructorInterceptor.java | 10 +-
.../v1/HystrixCommandGetFallbackInterceptor.java | 5 +-
.../hystrix/v1/HystrixCommandRunInterceptor.java | 5 +-
.../v1/HystrixConcurrencyStrategyInterceptor.java | 20 +-
.../hystrix/v1/HystrixPluginsInterceptor.java | 7 +-
.../plugin/hystrix/v1/SWExecutionHookWrapper.java | 76 ++--
.../v1/SWHystrixConcurrencyStrategyWrapper.java | 10 +-
.../hystrix/v1/SWHystrixPluginsWrapperCache.java | 9 +-
.../v1/define/HystrixCommandInstrumentation.java | 33 +-
.../v1/define/HystrixPluginsInstrumentation.java | 18 +-
.../HystrixConcurrencyStrategyInterceptorTest.java | 8 +-
.../hystrix/v1/HystrixPluginsInterceptorTest.java | 8 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 3 +-
.../jdbc/ConnectionServiceMethodInterceptor.java | 26 +-
.../apm/plugin/jdbc/JDBCDriverInterceptor.java | 18 +-
.../plugin/jdbc/JDBCPrepareCallInterceptor.java | 8 +-
.../jdbc/JDBCPrepareStatementInterceptor.java | 8 +-
...reparedStatementIgnorableSetterInterceptor.java | 20 +-
...entNullSetterInstanceMethodsInterceptPoint.java | 3 -
...JDBCPreparedStatementNullSetterInterceptor.java | 20 +-
.../JDBCPreparedStatementSetterInterceptor.java | 20 +-
.../apm/plugin/jdbc/JDBCStatementInterceptor.java | 8 +-
.../PSSetterDefinitionOfJDBCInstrumentation.java | 7 +-
.../connectionurl/parser/AbstractURLParser.java | 1 -
.../connectionurl/parser/ConnectionURLParser.java | 1 -
.../jdbc/connectionurl/parser/H2URLParser.java | 20 +-
.../jdbc/connectionurl/parser/MysqlURLParser.java | 8 +-
.../jdbc/connectionurl/parser/OracleURLParser.java | 15 +-
.../connectionurl/parser/PostgreSQLURLParser.java | 3 -
.../jdbc/connectionurl/parser/URLLocation.java | 1 -
.../jdbc/connectionurl/parser/URLParser.java | 3 -
.../jdbc/define/AbstractDriverInstrumentation.java | 3 +-
.../apm/plugin/jdbc/define/Constants.java | 35 +-
.../plugin/jdbc/define/StatementEnhanceInfos.java | 3 -
.../jdbc/trace/CallableStatementTracing.java | 14 +-
.../apm/plugin/jdbc/trace/ConnectionInfo.java | 2 -
.../jdbc/trace/PreparedStatementTracing.java | 14 +-
.../apm/plugin/jdbc/trace/SWCallableStatement.java | 427 ++++++++-------------
.../apm/plugin/jdbc/trace/SWPreparedStatement.java | 158 +++-----
.../apm/plugin/jdbc/trace/SWStatement.java | 65 +---
.../apm/plugin/jdbc/trace/StatementTracing.java | 14 +-
.../apm/plugin/jdbc/AbstractStatementTest.java | 1 -
.../apm/plugin/jdbc/ConnectionTracing.java | 12 +-
.../apm/plugin/jdbc/SWCallableStatementTest.java | 34 +-
.../skywalking/apm/plugin/jdbc/SWConnection.java | 156 +++-----
.../apm/plugin/jdbc/SWConnectionTest.java | 1 -
.../apm/plugin/jdbc/SWStatementTest.java | 1 -
.../apm/plugin/jdbc/SwPreparedStatementTest.java | 35 +-
.../jdbc/connectionurl/parser/URLParserTest.java | 1 -
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 3 +-
...erConstructorWithHostAndPortArgInterceptor.java | 3 +-
...nstructorWithListHostAndPortArgInterceptor.java | 3 +-
...edisConstructorWithShardInfoArgInterceptor.java | 3 +-
.../JedisConstructorWithStringArgInterceptor.java | 3 +-
.../v2/JedisConstructorWithUriArgInterceptor.java | 3 +-
.../plugin/jedis/v2/JedisMethodInterceptor.java | 9 +-
.../apm/plugin/jedis/v2/RedisMethodMatch.java | 224 ++++++++---
.../v2/define/JedisClusterInstrumentation.java | 3 +-
.../jedis/v2/define/JedisInstrumentation.java | 5 +-
...nstructorWithHostAndPortArgInterceptorTest.java | 1 -
...uctorWithListHostAndPortArgInterceptorTest.java | 4 +-
...ConstructorWithShardInfoArgInterceptorTest.java | 1 -
...disConstructorWithStringArgInterceptorTest.java | 6 +-
.../JedisConstructorWithUriArgInterceptorTest.java | 1 -
.../jedis/v2/JedisMethodInterceptorTest.java | 15 +-
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 3 +-
.../v90/client/SyncHttpRequestSendInterceptor.java | 9 +-
.../client/define/HttpRequestInstrumentation.java | 23 +-
.../client/SyncHttpRequestSendInterceptorTest.java | 23 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 3 +-
.../v9/client/SyncHttpRequestSendInterceptor.java | 9 +-
.../client/define/HttpRequestInstrumentation.java | 24 +-
.../client/SyncHttpRequestSendInterceptorTest.java | 22 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 3 +-
.../plugin/jetty/v9/server/ForwardInterceptor.java | 8 +-
.../plugin/jetty/v9/server/HandleInterceptor.java | 8 +-
.../server/define/DispatcherInstrumentation.java | 24 +-
.../v9/server/define/JettyInstrumentation.java | 20 +-
.../jetty/v9/server/HandleInterceptorTest.java | 9 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 3 +-
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 3 +-
.../apm/plugin/kafka/CallbackAdapter.java | 2 +-
.../skywalking/apm/plugin/kafka/CallbackCache.java | 7 +-
.../kafka/CallbackConstructorInterceptor.java | 1 -
.../apm/plugin/kafka/CallbackInterceptor.java | 8 +-
.../kafka/ConsumerConstructorInterceptor.java | 7 +-
.../plugin/kafka/ConsumerEnhanceRequiredInfo.java | 2 +-
.../apm/plugin/kafka/KafkaConsumerInterceptor.java | 15 +-
.../apm/plugin/kafka/KafkaProducerInterceptor.java | 12 +-
.../kafka/KafkaTemplateCallbackInterceptor.java | 11 +-
.../kafka/ProducerConstructorInterceptor.java | 3 +-
.../kafka/ProducerConstructorMapInterceptor.java | 3 -
.../plugin/kafka/SubscribeMethodInterceptor.java | 7 +-
.../kafka/define/AbstractKafkaInstrumentation.java | 5 +-
.../AbstractKafkaTemplateInstrumentation.java | 6 +-
.../kafka/define/CallbackInstrumentation.java | 18 +-
.../kafka/define/KafkaConsumerInstrumentation.java | 35 +-
.../kafka/define/KafkaProducerInstrumentation.java | 6 +-
.../define/KafkaProducerMapInstrumentation.java | 4 +-
.../KafkaTemplateCallbackInstrumentation.java | 3 +-
.../kafka/define/KafkaTemplateInstrumentation.java | 6 +-
.../apm/plugin/kafka/CallbackInterceptorTest.java | 25 +-
.../kafka/ConsumerConstructorInterceptorTest.java | 10 +-
.../plugin/kafka/KafkaConsumerInterceptorTest.java | 27 +-
.../plugin/kafka/KafkaProducerInterceptorTest.java | 26 +-
.../kafka/ProducerConstructorInterceptorTest.java | 8 +-
.../kafka/SubscribeMethodInterceptorTest.java | 10 +-
.../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 3 +-
.../lettuce/v5/AbstractRedisClientInterceptor.java | 11 +-
.../lettuce/v5/AsyncCommandMethodInterceptor.java | 11 +-
.../v5/ClientOptionsConstructorInterceptor.java | 8 +-
.../lettuce/v5/RedisChannelWriterInterceptor.java | 14 +-
.../v5/RedisClientConstructorInterceptor.java | 4 -
.../RedisClusterClientConstructorInterceptor.java | 7 +-
.../apm/plugin/lettuce/v5/SWBiConsumer.java | 3 -
.../apm/plugin/lettuce/v5/SWConsumer.java | 3 -
.../define/AbstractRedisClientInstrumentation.java | 13 +-
.../v5/define/AsyncCommandInstrumentation.java | 10 +-
.../v5/define/ClientOptionsInstrumentation.java | 6 +-
.../define/RedisChannelWriterInstrumentation.java | 5 +-
.../v5/define/RedisClientInstrumentation.java | 6 +-
.../define/RedisClusterClientInstrumentation.java | 6 +-
.../v5/RedisChannelWriterInterceptorTest.java | 19 +-
.../lettuce/v5/mock/MockRedisClusterClient.java | 4 -
...ckRedisClusterClientConstructorInterceptor.java | 7 +-
.../light4j-plugins/light4j-plugin/pom.xml | 3 +-
.../plugin/light4j/HandleRequestInterceptor.java | 40 +-
.../light4j/define/LightInstrumentation.java | 6 +-
.../light4j/HandleRequestInterceptorTest.java | 11 +-
apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 3 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 3 +-
.../v2/MongoDBCollectionMethodInterceptor.java | 26 +-
.../plugin/mongodb/v2/define/InterceptPoint.java | 4 -
.../MongoDBCollectionImplInstrumentation.java | 15 +-
.../define/MongoDBCollectionInstrumentation.java | 18 +-
.../v2/MongoDBCollectionMethodInterceptorTest.java | 6 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 3 +-
.../v3/define/v30/MongoDBInstrumentation.java | 62 ++-
.../v3/define/v36/MongoDBInstrumentation.java | 53 +--
.../MongoDBOperationExecutorInstrumentation.java | 33 +-
.../v37/MongoDBClientDelegateInstrumentation.java | 65 ++--
.../MongoDBOperationExecutorInstrumentation.java | 44 +--
.../MongoDBOperationExecutorInstrumentation.java | 39 +-
.../v3/interceptor/v30/MongoDBInterceptor.java | 24 +-
.../v37/MongoDBClientDelegateInterceptor.java | 15 +-
.../v37/MongoDBOperationExecutorInterceptor.java | 11 +-
.../plugin/mongodb/v3/support/MongoConstants.java | 4 -
.../mongodb/v3/support/MongoOperationHelper.java | 10 +-
.../mongodb/v3/support/MongoRemotePeerHelper.java | 5 -
.../plugin/mongodb/v3/support/MongoSpanHelper.java | 4 -
.../v3/interceptor/v30/MongoDBInterceptorTest.java | 21 +-
.../v37/MongoDBClientDelegateInterceptorTest.java | 5 -
.../MongoDBOperationExecutorInterceptorTest.java | 19 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 3 +-
.../apm/plugin/motan/MotanConsumerInterceptor.java | 34 +-
.../apm/plugin/motan/MotanProviderInterceptor.java | 20 +-
.../motan/define/MotanConsumerInstrumentation.java | 3 +-
.../motan/define/MotanProviderInstrumentation.java | 3 +-
.../plugin/motan/MotanConsumerInterceptorTest.java | 1 -
.../plugin/motan/MotanProviderInterceptorTest.java | 2 -
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 3 +-
.../mysql/v5/ConnectionCreate5xInterceptor.java | 15 +-
.../define/AbstractConnectionInstrumentation.java | 65 ++--
.../v5/define/AbstractMysqlInstrumentation.java | 7 +-
.../mysql/v5/define/CacheIpsInstrumentation.java | 6 +-
.../mysql/v5/define/CallableInstrumentation.java | 32 +-
.../ConnectionImplCreateInstrumentation.java | 2 +-
.../apm/plugin/jdbc/mysql/v5/define/Constants.java | 4 -
.../define/Mysql50ConnectionInstrumentation.java | 10 +-
.../define/Mysql5xConnectionInstrumentation.java | 6 +-
...paredStatementIgnoredSetterInstrumentation.java | 4 -
.../define/PreparedStatementInstrumentation.java | 37 +-
...PreparedStatementNullSetterInstrumentation.java | 4 -
.../PreparedStatementSetterInstrumentation.java | 4 -
.../mysql/v5/define/StatementInstrumentation.java | 50 ++-
.../v5/ConnectionImplCreateInterceptorTest.java | 13 +-
.../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 3 +-
.../mysql/v6/ConnectionCreateNewInterceptor.java | 11 +-
.../mysql/v6/ConnectionCreateOldInterceptor.java | 11 +-
.../v6/define/AbstractMysqlInstrumentation.java | 8 +-
.../mysql/v6/define/CacheIpsInstrumentation.java | 31 +-
.../mysql/v6/define/CallableInstrumentation.java | 32 +-
.../ConnectionImplCreateInstrumentation.java | 6 +-
.../mysql/v6/define/ConnectionInstrumentation.java | 60 ++-
.../apm/plugin/jdbc/mysql/v6/define/Constants.java | 4 -
.../mysql/v6/define/DriverInstrumentation.java | 3 -
...paredStatementIgnoredSetterInstrumentation.java | 4 -
.../define/PreparedStatementInstrumentation.java | 37 +-
...PreparedStatementNullSetterInstrumentation.java | 4 -
.../PreparedStatementSetterInstrumentation.java | 4 -
.../mysql/v6/define/StatementInstrumentation.java | 50 ++-
.../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 3 +-
.../jdbc/mysql/v8/ConnectionCreateInterceptor.java | 13 +-
.../v8/define/AbstractMysqlInstrumentation.java | 7 +-
.../mysql/v8/define/CallableInstrumentation.java | 25 +-
.../ConnectionImplCreateInstrumentation.java | 7 +-
.../mysql/v8/define/ConnectionInstrumentation.java | 61 +--
.../apm/plugin/jdbc/mysql/v8/define/Constants.java | 1 -
...paredStatementIgnoredSetterInstrumentation.java | 4 -
.../define/PreparedStatementInstrumentation.java | 28 +-
...PreparedStatementNullSetterInstrumentation.java | 4 -
.../PreparedStatementSetterInstrumentation.java | 4 -
.../mysql/v8/define/StatementInstrumentation.java | 36 +-
.../v8/ConnectionImplCreateInterceptorTest.java | 7 +-
apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 3 +-
.../apm/plugin/jdbc/mysql/ConnectionCache.java | 3 -
.../apm/plugin/jdbc/mysql/Constants.java | 3 -
.../mysql/CreateCallableStatementInterceptor.java | 6 +-
.../mysql/CreatePreparedStatementInterceptor.java | 5 +-
.../jdbc/mysql/CreateStatementInterceptor.java | 7 +-
.../jdbc/mysql/DriverConnectInterceptor.java | 12 +-
...PreparedStatementExecuteMethodsInterceptor.java | 18 +-
.../plugin/jdbc/mysql/SetCatalogInterceptor.java | 5 +-
.../mysql/StatementExecuteMethodsInterceptor.java | 21 +-
.../CreateCallableStatementInterceptorTest.java | 1 -
.../CreatePreparedStatementInterceptorTest.java | 1 -
.../jdbc/mysql/CreateStatementInterceptorTest.java | 1 -
.../StatementExecuteMethodsInterceptorTest.java | 9 +-
.../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 3 +-
.../netty/socketio/NettySocketIOClientInfo.java | 2 -
.../NettySocketIOConnectionInterceptor.java | 12 +-
.../NettySocketIOConstructorInterceptor.java | 3 -
.../socketio/NettySocketIOOnEventInterceptor.java | 12 +-
.../socketio/NettySocketIORoomInterceptor.java | 12 +-
.../NettySocketIOPluginClientInstrumentation.java | 7 +-
...ettySocketIOPluginNameSpaceInstrumentation.java | 2 -
.../plugin/netty/socketio/NettySocketIOTest.java | 34 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 3 +-
.../http/sync/SenderConstructorInterceptor.java | 1 -
.../nutz/http/sync/SenderSendInterceptor.java | 14 +-
.../define/AbstractNutzHttpInstrumentation.java | 1 -
.../NutzHttpFilePostSenderInstrumentation.java | 1 -
.../define/NutzHttpGetSenderInstrumentation.java | 1 -
.../define/NutzHttpPostSenderInstrumentation.java | 1 -
.../nutz/http/sync/SenderInterceptorTest.java | 1 -
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 3 +-
.../nutz/mvc/ActionConstructorInterceptor.java | 4 -
.../plugin/nutz/mvc/ActionMethodInterceptor.java | 8 +-
.../apm/plugin/nutz/mvc/PathMappingCache.java | 7 +-
.../nutz/mvc/define/ActionInstrumentation.java | 1 -
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 3 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 3 +-
.../apm/plugin/okhttp/v3/AsyncCallInterceptor.java | 18 +-
.../apm/plugin/okhttp/v3/EnhanceRequiredInfo.java | 5 +-
.../apm/plugin/okhttp/v3/EnqueueInterceptor.java | 12 +-
.../apm/plugin/okhttp/v3/OnFailureInterceptor.java | 5 +-
.../plugin/okhttp/v3/OnResponseInterceptor.java | 7 +-
.../apm/plugin/okhttp/v3/RealCallInterceptor.java | 35 +-
.../okhttp/v3/define/AsyncCallInstrumentation.java | 24 +-
.../okhttp/v3/define/CallbackInstrumentation.java | 27 +-
.../okhttp/v3/define/RealCallInstrumentation.java | 36 +-
.../plugin/okhttp/v3/RealCallInterceptorTest.java | 22 +-
apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml | 3 +-
.../plugin/play/v2x/HttpFiltersInterceptor.java | 14 +-
.../apm/plugin/play/v2x/TracingFilter.java | 8 +-
.../play/v2x/define/Play2xInstrumentation.java | 16 +-
.../play/v2x/HttpFiltersInterceptorTest.java | 11 +-
.../plugin/play/v2x/Play2xInstrumentationTest.java | 9 +-
.../apm/plugin/play/v2x/TracingFilterTest.java | 9 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 17 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 3 +-
.../CreateCallableStatementInterceptor.java | 9 +-
.../CreatePreparedStatementInterceptor.java | 9 +-
.../postgresql/CreateStatementInterceptor.java | 9 +-
...PrepareStatementWithStringArrayInterceptor.java | 10 +-
...PreparedStatementExecuteMethodsInterceptor.java | 24 +-
.../StatementExecuteMethodsInterceptor.java | 22 +-
.../AbstractJdbc2StatementInstrumentation.java | 35 +-
.../define/ConnectionInstrumentation.java | 70 ++--
.../plugin/jdbc/postgresql/define/Constants.java | 3 -
.../postgresql/define/DriverInstrumentation.java | 3 -
.../define/Jdbc3ConnectionInstrumentation.java | 58 +--
.../define/Jdbc4ConnectionInstrumentation.java | 57 +--
.../define/PgCallableStatementInstrumentation.java | 21 +-
.../define/PgPreparedStatementInstrumentation.java | 27 +-
.../PgPreparedStatementSetterInstrumentation.java | 4 +-
.../define/PgStatementInstrumentation.java | 31 +-
apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 3 +-
.../pulsar/ConsumerConstructorInterceptor.java | 10 +-
.../plugin/pulsar/ConsumerEnhanceRequiredInfo.java | 2 -
.../pulsar/ProducerConstructorInterceptor.java | 10 +-
.../plugin/pulsar/ProducerEnhanceRequiredInfo.java | 2 -
.../plugin/pulsar/PulsarConsumerInterceptor.java | 14 +-
.../plugin/pulsar/PulsarProducerInterceptor.java | 22 +-
.../pulsar/SendCallbackEnhanceRequiredInfo.java | 2 -
.../apm/plugin/pulsar/SendCallbackInterceptor.java | 10 +-
.../define/PulsarConsumerInstrumentation.java | 36 +-
.../define/PulsarProducerInstrumentation.java | 24 +-
.../pulsar/define/SendCallbackInstrumentation.java | 24 +-
.../pulsar/ConsumerConstructorInterceptorTest.java | 14 +-
.../pulsar/ProducerConstructorInterceptorTest.java | 13 +-
.../pulsar/PulsarConsumerInterceptorTest.java | 23 +-
.../pulsar/PulsarProducerInterceptorTest.java | 17 +-
.../plugin/pulsar/SendCallbackInterceptorTest.java | 6 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 3 +-
.../rabbitmq/RabbitMQConsumerInterceptor.java | 21 +-
...QProducerAndConsumerConstructorInterceptor.java | 4 +-
.../rabbitmq/RabbitMQProducerInterceptor.java | 35 +-
.../define/RabbitMQConsumerInstrumentation.java | 37 +-
.../define/RabbitMQProducerInstrumentation.java | 37 +-
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 46 ++-
...ducerAndConsumerConstructorInterceptorTest.java | 43 ++-
.../rabbitmq/RabbitMQProducerInterceptorTest.java | 23 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 3 +-
.../redisson/v3/ConnectionManagerInterceptor.java | 27 +-
.../v3/RedisClientConstructorInterceptor.java | 7 +-
.../v3/RedisConnectionMethodInterceptor.java | 12 +-
.../define/ConnectionManagerInstrumentation.java | 6 +-
.../v3/define/RedisClientInstrumentation.java | 4 +-
.../v3/define/RedisConnectionInstrumentation.java | 6 +-
.../apm/plugin/redisson/v3/util/ClassUtil.java | 8 +-
.../v3/RedisConnectionMethodInterceptorTest.java | 11 +-
apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 3 +-
.../resteasy-server-3.x-plugin/pom.xml | 3 +-
.../SynchronousDispatcherExceptionInterceptor.java | 7 +-
.../server/SynchronousDispatcherInterceptor.java | 3 -
.../SynchronousDispatcherInstrumentation.java | 3 -
.../apm/plugin/resteasy/v3/server/AssertTools.java | 4 +-
.../SynchronousDispatcherInterceptorTest.java | 42 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 3 +-
.../v3/AbstractMessageConsumeInterceptor.java | 13 +-
.../v3/MessageConcurrentlyConsumeInterceptor.java | 4 +-
.../v3/MessageOrderlyConsumeInterceptor.java | 4 +-
.../plugin/rocketMQ/v3/MessageSendInterceptor.java | 14 +-
.../plugin/rocketMQ/v3/OnExceptionInterceptor.java | 9 +-
.../plugin/rocketMQ/v3/OnSuccessInterceptor.java | 9 +-
.../rocketMQ/v3/UpdateNameServerInterceptor.java | 3 +-
.../ConsumeMessageConcurrentlyInstrumentation.java | 20 +-
.../ConsumeMessageOrderlyInstrumentation.java | 20 +-
.../v3/define/MQClientAPIImplInstrumentation.java | 29 +-
.../v3/define/SendCallBackEnhanceInfo.java | 2 -
.../v3/define/SendCallbackInstrumentation.java | 35 +-
.../rocketMQ/v3/MessageSendInterceptorTest.java | 27 +-
.../rocketMQ/v3/OnExceptionInterceptorTest.java | 1 -
.../rocketMQ/v3/OnSuccessInterceptorTest.java | 1 -
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 3 +-
.../v4/AbstractMessageConsumeInterceptor.java | 14 +-
.../v4/MessageConcurrentlyConsumeInterceptor.java | 5 +-
.../v4/MessageOrderlyConsumeInterceptor.java | 5 +-
.../plugin/rocketMQ/v4/MessageSendInterceptor.java | 15 +-
.../plugin/rocketMQ/v4/OnExceptionInterceptor.java | 10 +-
.../plugin/rocketMQ/v4/OnSuccessInterceptor.java | 10 +-
.../rocketMQ/v4/UpdateNameServerInterceptor.java | 4 +-
.../ConsumeMessageConcurrentlyInstrumentation.java | 18 +-
.../ConsumeMessageOrderlyInstrumentation.java | 18 +-
.../v4/define/MQClientAPIImplInstrumentation.java | 27 +-
.../v4/define/SendCallBackEnhanceInfo.java | 3 -
.../v4/define/SendCallbackInstrumentation.java | 27 +-
.../rocketMQ/v4/MessageSendInterceptorTest.java | 27 +-
.../rocketMQ/v4/OnExceptionInterceptorTest.java | 1 -
.../rocketMQ/v4/OnSuccessInterceptorTest.java | 1 -
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 3 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 5 +-
.../ProducerOperationHandlerInterceptor.java | 19 +-
.../TransportClientHandlerInterceptor.java | 21 +-
.../ProducerOperationHandlerInstrumentation.java | 11 +-
.../TransportClientHandlerInstrumentation.java | 11 +-
.../ProducerOperationHandlerInterceptorTest.java | 2 +-
.../TransportClientHandlerInterceptorTest.java | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 3 +-
.../v1/ProducerOperationHandlerInterceptor.java | 19 +-
.../v1/TransportClientHandlerInterceptor.java | 21 +-
.../ProducerOperationHandlerInstrumentation.java | 11 +-
.../TransportClientHandlerInstrumentation.java | 12 +-
.../ProducerOperationHandlerInterceptorTest.java | 2 +-
.../v1/TransportClientHandlerInterceptorTest.java | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 3 +-
.../apm/plugin/sjdbc/ExecuteEventListener.java | 12 +-
.../sjdbc/define/AsyncExecuteInterceptor.java | 13 +-
.../plugin/sjdbc/define/ExecuteInterceptor.java | 12 +-
.../ExecutorEngineConstructorInterceptor.java | 12 +-
.../sjdbc/define/ExecutorInstrumentation.java | 17 +-
.../apm/plugin/sjdbc/InterceptorTest.java | 12 +-
.../sharding-sphere-3.x-plugin/pom.xml | 3 +-
.../apm/plugin/shardingsphere/Constant.java | 2 +-
.../plugin/shardingsphere/ExecuteInterceptor.java | 23 +-
.../shardingsphere/JDBCRootInvokeInterceptor.java | 23 +-
.../plugin/shardingsphere/ParseInterceptor.java | 23 +-
.../shardingsphere/ProxyRootInvokeInterceptor.java | 23 +-
.../define/ExecuteInstrumentation.java | 18 +-
.../define/JDBCRootInvokeInstrumentation.java | 21 +-
.../define/ParseInstrumentation.java | 18 +-
.../define/ProxyRootInvokeInstrumentation.java | 18 +-
.../apm/plugin/shardingsphere/InterceptorTest.java | 34 +-
.../sharding-sphere-4.x-RC3-plugin/pom.xml | 3 +-
.../apm/plugin/shardingsphere/v4rc3/Constant.java | 2 +-
.../shardingsphere/v4rc3/ExecuteInterceptor.java | 23 +-
.../v4rc3/JDBCRootInvokeInterceptor.java | 23 +-
.../shardingsphere/v4rc3/ParseInterceptor.java | 23 +-
.../v4rc3/ProxyRootInvokeInterceptor.java | 23 +-
.../v4rc3/define/ExecuteInstrumentation.java | 18 +-
.../define/JDBCRootInvokeInstrumentation.java | 21 +-
.../v4rc3/define/ParseInstrumentation.java | 18 +-
.../define/ProxyRootInvokeInstrumentation.java | 18 +-
.../shardingsphere/v4rc3/InterceptorTest.java | 34 +-
.../sharding-sphere-4.x-plugin/pom.xml | 3 +-
.../apm/plugin/shardingsphere/v4/Constant.java | 2 +-
.../shardingsphere/v4/ExecuteInterceptor.java | 23 +-
.../v4/JDBCRootInvokeInterceptor.java | 23 +-
.../plugin/shardingsphere/v4/ParseInterceptor.java | 23 +-
.../v4/ProxyRootInvokeInterceptor.java | 23 +-
.../v4/define/ExecuteInstrumentation.java | 18 +-
.../v4/define/JDBCRootInvokeInstrumentation.java | 21 +-
.../v4/define/ParseInstrumentation.java | 18 +-
.../v4/define/ProxyRootInvokeInstrumentation.java | 18 +-
.../apm/plugin/shardingsphere/InterceptorTest.java | 34 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 3 +-
.../plugin/sofarpc/SofaRpcConsumerInterceptor.java | 16 +-
.../plugin/sofarpc/SofaRpcProviderInterceptor.java | 13 +-
.../sofarpc/SofaRpcConsumerInterceptorTest.java | 12 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 9 +-
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 5 +-
.../apm/plugin/solrj/SolrClientInterceptor.java | 18 +-
.../apm/plugin/solrj/SolrConnectorInterceptor.java | 8 +-
.../apm/plugin/solrj/commons/SolrjInstance.java | 1 +
.../apm/plugin/solrj/commons/SolrjTags.java | 1 +
.../solrj/define/SolrClientInstrumentation.java | 5 +-
.../plugin/solrj/SolrClientInterceptorTest.java | 41 +-
.../plugin/solrj/StringFormatBenchmarkTest.java | 7 +-
.../spring-plugins/async-annotation-plugin/pom.xml | 3 +-
.../spring/async/DoSubmitMethodInterceptor.java | 13 +-
.../apm/plugin/spring/async/SWCallable.java | 4 +-
.../AsyncExecutionInterceptorInstrumentation.java | 6 +-
.../concurrent-util-4.x-plugin/pom.xml | 3 +-
.../concurrent/FailureCallbackInterceptor.java | 14 +-
.../concurrent/SuccessCallbackInterceptor.java | 9 +-
.../ListenableFutureCallbackInstrumentation.java | 3 -
.../define/SuccessCallbackInstrumentation.java | 24 +-
.../concurrent/match/EitherInterfaceMatch.java | 7 +-
.../concurrent/match/FailedCallbackMatch.java | 9 +-
.../match/ListenableFutureCallbackMatch.java | 7 +-
.../concurrent/match/SuccessCallbackMatch.java | 3 -
.../spring-plugins/core-patch/pom.xml | 3 +-
.../patch/AopExpressionMatchInterceptor.java | 14 +-
.../AspectJExpressionPointCutInterceptor.java | 16 +-
.../AutowiredAnnotationProcessorInterceptor.java | 18 +-
.../spring/patch/CreateAopProxyInterceptor.java | 8 +-
.../patch/GetPropertyDescriptorsInterceptor.java | 5 +-
.../apm/plugin/spring/patch/MatchUtil.java | 10 +-
.../define/AopExpressionMatchInstrumentation.java | 37 +-
.../define/AopProxyFactoryInstrumentation.java | 18 +-
.../AspectJExpressionPointCutInstrumentation.java | 34 +-
...utowiredAnnotationProcessorInstrumentation.java | 27 +-
.../define/BeanWrapperImplInstrumentation.java | 18 +-
.../patch/AopExpressionMatchInterceptorTest.java | 16 +-
.../patch/CreateAopProxyInterceptorTest.java | 7 +-
.../mvc-annotation-3.x-plugin/pom.xml | 3 +-
.../mvc/v3/ControllerConstructorInterceptor.java | 3 -
.../mvc/v3/HandlerMethodInvokerInterceptor.java | 8 +-
.../v3/define/AbstractSpring3Instrumentation.java | 5 +-
.../mvc/v3/define/ControllerInstrumentation.java | 6 +-
.../v3/define/HandlerMethodInstrumentation.java | 3 -
.../HandlerMethodInvokerInstrumentation.java | 21 +-
.../v3/define/InvocableHandlerInstrumentation.java | 13 +-
.../v3/ControllerConstructorInterceptorTest.java | 19 +-
.../mvc-annotation-4.x-plugin/pom.xml | 3 +-
.../mvc/v4/ControllerConstructorInterceptor.java | 9 +-
.../define/AbstractControllerInstrumentation.java | 9 +-
.../v4/define/AbstractSpring4Instrumentation.java | 6 +-
.../ControllerForLowVersionInstrumentation.java | 10 +-
.../mvc/v4/define/ControllerInstrumentation.java | 4 +-
.../v4/define/HandlerMethodInstrumentation.java | 3 -
.../v4/define/InvocableHandlerInstrumentation.java | 3 -
...RestControllerForLowVersionInstrumentation.java | 10 +-
.../v4/define/RestControllerInstrumentation.java | 9 +-
.../v4/ControllerConstructorInterceptorTest.java | 7 +-
.../plugin/spring/mvc/v4/PathMappingCacheTest.java | 1 -
.../v4/RequestMappingMethodInterceptorTest.java | 13 +-
.../mvc/v4/RestMappingMethodInterceptorTest.java | 31 +-
.../v4/define/ControllerInstrumentationTest.java | 4 +-
.../define/RestControllerInstrumentationTest.java | 5 +-
.../mvc-annotation-5.x-plugin/pom.xml | 3 +-
.../mvc/v5/ControllerConstructorInterceptor.java | 9 +-
.../plugin/spring/mvc/v5/GetBeanInterceptor.java | 10 +-
.../define/AbstractControllerInstrumentation.java | 9 +-
.../v5/define/AbstractSpring5Instrumentation.java | 1 -
.../mvc/v5/define/ControllerInstrumentation.java | 4 +-
.../v5/define/HandlerMethodInstrumentation.java | 2 -
.../v5/define/RestControllerInstrumentation.java | 4 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 3 +-
.../apm/plugin/spring/mvc/commons/Constants.java | 4 +-
.../plugin/spring/mvc/commons/ParsePathUtil.java | 5 +-
.../spring/mvc/commons/PathMappingCache.java | 8 +-
...otationMethodHandlerAdapterInstrumentation.java | 18 +-
.../interceptor/AbstractMethodInterceptor.java | 31 +-
.../commons/interceptor/GetBeanInterceptor.java | 6 +-
.../interceptor/InvokeForRequestInterceptor.java | 5 +-
.../InvokeHandlerMethodInterceptor.java | 3 +-
.../RequestMappingMethodInterceptor.java | 6 +-
.../interceptor/RestMappingMethodInterceptor.java | 5 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 3 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 3 +-
.../resttemplate/async/FutureGetInterceptor.java | 6 +-
.../async/ResponseCallBackInterceptor.java | 7 +-
.../resttemplate/async/RestExecuteInterceptor.java | 23 +-
.../resttemplate/async/RestRequestInterceptor.java | 9 +-
.../ResponseExtractorFutureInstrumentation.java | 28 +-
.../async/define/RestTemplateInstrumentation.java | 25 +-
.../resttemplate/sync/RestExecuteInterceptor.java | 13 +-
.../resttemplate/sync/RestRequestInterceptor.java | 10 +-
.../resttemplate/sync/RestResponseInterceptor.java | 6 +-
.../sync/define/RestTemplateInstrumentation.java | 30 +-
.../spring-cloud/netflix-plugins/pom.xml | 3 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 3 +-
.../v11/define/NetflixFeignInstrumentation.java | 18 +-
.../spring-plugins/spring-cloud/pom.xml | 3 +-
.../spring-plugins/spring-commons/pom.xml | 3 +-
.../plugin/spring/commons/EnhanceCacheObjects.java | 3 +-
.../spring-webflux-5.x-plugin/pom.xml | 3 +-
.../DispatcherHandlerHandleMethodInterceptor.java | 9 +-
.../ServerWebExchangeConstructorInterceptor.java | 4 -
.../define/DispatcherHandlerInstrumentation.java | 6 +-
.../define/ServerWebExchangeInstrumentation.java | 5 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 3 +-
...torWithInetSocketAddressListArgInterceptor.java | 4 +-
.../v2/MemcachedMethodInterceptor.java | 12 +-
.../v2/define/MemcachedInstrumentation.java | 38 +-
...ithInetSocketAddressListArgInterceptorTest.java | 6 +-
.../v2/MemcachedMethodInterceptorTest.java | 15 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 3 +-
.../apm/plugin/struts2/Struts2Interceptor.java | 4 +-
.../struts2/define/Struts2Instrumentation.java | 25 +-
.../apm/plugin/struts2/Struts2InterceptorTest.java | 25 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 3 +-
.../apm/plugin/tomcat78x/ForwardInterceptor.java | 3 +-
.../tomcat78x/TomcatExceptionInterceptor.java | 6 +-
.../plugin/tomcat78x/TomcatInvokeInterceptor.java | 29 +-
.../ApplicationDispatcherInstrumentation.java | 23 +-
.../tomcat78x/define/TomcatInstrumentation.java | 13 +-
.../tomcat78x/TomcatInvokeInterceptorTest.java | 24 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 3 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 3 +-
.../apm/plugin/undertow/v2x/Constants.java | 3 -
.../plugin/undertow/v2x/ForwardInterceptor.java | 12 +-
.../v2x/HttpServerExchangeInterceptor.java | 13 +-
.../undertow/v2x/ListenerConfigInterceptor.java | 13 +-
.../undertow/v2x/RootHandlerInterceptor.java | 13 +-
.../undertow/v2x/RoutingHandlerInterceptor.java | 14 +-
.../apm/plugin/undertow/v2x/SWRunnable.java | 3 -
.../define/HttpServerExchangeInstrumentation.java | 9 +-
.../RequestDispatcherImplInstrumentation.java | 3 -
.../v2x/define/RoutingHandlerInstrumentation.java | 16 +-
.../define/UndertowAddListenerInstrumentation.java | 12 +-
.../UndertowListenerConfigInstrumentation.java | 6 +-
.../define/UndertowRootHandlerInstrumentation.java | 6 +-
.../undertow/v2x/handler/TracingHandler.java | 6 +-
.../undertow/v2x/ForwardInterceptorTest.java | 16 +-
.../undertow/v2x/RootHandlerInterceptorTest.java | 13 +-
.../v2x/RoutingHandlerInterceptorTest.java | 11 +-
.../plugin/undertow/v2x/TracingHandlerTest.java | 9 +-
.../v2x/UndertowBuilderMethodMatcherTest.java | 5 +-
apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 3 +-
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 3 +-
.../ClusteredEventBusSendRemoteInterceptor.java | 13 +-
.../EventBusImplDeliverToHandlerInterceptor.java | 16 +-
.../vertx3/HandlerRegistrationInterceptor.java | 19 +-
.../HttpClientRequestImplEndInterceptor.java | 15 +-
...lientRequestImplHandleExceptionInterceptor.java | 12 +-
...ClientRequestImplHandleResponseInterceptor.java | 12 +-
.../HttpServerResponseImplEndInterceptor.java | 12 +-
...rverResponseImplHandleExceptionInterceptor.java | 12 +-
.../plugin/vertx3/RouterImplAcceptInterceptor.java | 16 +-
.../skywalking/apm/plugin/vertx3/VertxContext.java | 3 -
...ClusteredEventBusSendRemoteInstrumentation.java | 26 +-
...ventBusImplDeliverToHandlerInstrumentation.java | 26 +-
.../define/HandlerRegistrationInstrumentation.java | 25 +-
.../HttpClientRequestImplEndInstrumentation.java | 30 +-
...tRequestImplHandleExceptionInstrumentation.java | 24 +-
...ntRequestImplHandleResponseInstrumentation.java | 24 +-
.../HttpServerResponseImplEndInstrumentation.java | 24 +-
...ResponseImplHandleExceptionInstrumentation.java | 24 +-
.../define/RouterImplAcceptInstrumentation.java | 24 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 3 +-
...cachedConstructorWithComplexArgInterceptor.java | 10 +-
...achedConstructorWithHostPortArgInterceptor.java | 4 -
...tructorWithInetSocketAddressArgInterceptor.java | 6 +-
...torWithInetSocketAddressListArgInterceptor.java | 7 +-
.../xmemcached/v2/XMemcachedMethodInterceptor.java | 22 +-
.../v2/define/XMemcachedInstrumentation.java | 27 +-
...edConstructorWithComplexArgInterceptorTest.java | 11 +-
...dConstructorWithHostPortArgInterceptorTest.java | 6 +-
...torWithInetSocketAddressArgInterceptorTest.java | 3 +-
...ithInetSocketAddressListArgInterceptorTest.java | 3 +-
.../v2/XMemcachedMethodInterceptorTest.java | 15 +-
apm-sniffer/apm-test-tools/pom.xml | 3 +-
.../apm/agent/test/helper/FieldGetter.java | 7 +-
.../apm/agent/test/helper/FieldSetter.java | 12 +-
.../apm/agent/test/helper/SegmentHelper.java | 1 -
.../apm/agent/test/helper/SegmentRefHelper.java | 1 -
.../apm/agent/test/helper/SpanHelper.java | 1 -
.../apm/agent/test/tools/AgentServiceRule.java | 1 -
.../apm/agent/test/tools/SegmentRefAssert.java | 1 -
.../apm/agent/test/tools/SegmentStorage.java | 1 -
.../apm/agent/test/tools/SegmentStoragePoint.java | 1 -
.../apm/agent/test/tools/SpanAssert.java | 1 -
.../apm/agent/test/tools/TracingSegmentRunner.java | 7 +-
.../skywalking/apm/plugin/ArbitrarySetTest.java | 10 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 3 +-
.../log/log4j/v1/x/PrintTraceIdInterceptor.java | 17 +-
.../v1/x/TraceIdPatternConverterActivation.java | 13 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 3 +-
.../log/log4j/v2/x/TraceIdConverterActivation.java | 8 +-
.../v2/x/TraceIdConverterMethodInterceptor.java | 13 +-
.../x/async/AsyncLoggerConfigInstrumentation.java | 11 +-
.../async/AsyncLoggerConfigMethodInterceptor.java | 11 +-
.../async/Log4jLogEventConstructorInterceptor.java | 8 +-
.../v2/x/async/Log4jLogEventInstrumentation.java | 7 +-
.../x/async/RingBufferLogEventInstrumentation.java | 8 +-
.../async/RingBufferLogEventMethodInterceptor.java | 11 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 3 +-
.../v1/x/LogbackPatternConverterActivation.java | 15 +-
.../log/logback/v1/x/PrintTraceIdInterceptor.java | 17 +-
.../x/async/AsyncAppenderBaseInstrumentation.java | 6 +-
.../async/AsyncAppenderBaseMethodInterceptor.java | 13 +-
.../async/LoggingEventConstructorInterceptor.java | 7 +-
.../v1/x/async/LoggingEventInstrumentation.java | 6 +-
.../v1/x/logstash/TcpSocketAppenderActivation.java | 6 +-
.../x/logstash/TcpSocketAppenderInterceptor.java | 22 +-
.../logback/v1/x/mdc/MDCConverterActivation.java | 6 +-
.../v1/x/mdc/PrintMDCTraceIdInterceptor.java | 16 +-
.../apm-toolkit-opentracing-activation/pom.xml | 3 +-
.../continuation/ActivateInterceptor.java | 16 +-
.../continuation/ConstructorInterceptor.java | 1 -
.../SkywalkingContinuationActivation.java | 26 +-
.../ConstructorWithSpanBuilderInterceptor.java | 3 +-
.../span/ConstructorWithTracerInterceptor.java | 1 -
.../opentracing/span/SkywalkingSpanActivation.java | 42 +-
.../opentracing/span/SpanFinishInterceptor.java | 11 +-
.../opentracing/span/SpanLogInterceptor.java | 16 +-
.../span/SpanSetOperationNameInterceptor.java | 11 +-
.../opentracing/span/SpanSetTagInterceptor.java | 9 +-
.../tracer/SkywalkingTracerActivation.java | 42 +-
.../tracer/SkywalkingTracerExtractInterceptor.java | 11 +-
.../tracer/SkywalkingTracerInjectInterceptor.java | 13 +-
.../opentracing/SkywalkingSpanActivationTest.java | 44 ++-
.../apm-toolkit-trace-activation/pom.xml | 3 +-
.../activation/trace/ActiveSpanActivation.java | 86 +++--
.../trace/ActiveSpanDebugInterceptor.java | 15 +-
.../trace/ActiveSpanErrorInterceptor.java | 16 +-
.../trace/ActiveSpanErrorMsgInterceptor.java | 15 +-
.../trace/ActiveSpanErrorThrowableInteceptor.java | 15 +-
.../trace/ActiveSpanInfoInterceptor.java | 15 +-
.../activation/trace/ActiveSpanTagInterceptor.java | 7 +-
.../trace/CallableOrRunnableActivation.java | 32 +-
.../CallableOrRunnableConstructInterceptor.java | 4 +-
.../trace/CallableOrRunnableInvokeInterceptor.java | 9 +-
.../activation/trace/TagAnnotationActivation.java | 14 +-
.../trace/TagAnnotationMethodInterceptor.java | 28 +-
.../trace/TraceAnnotationActivation.java | 21 +-
.../trace/TraceAnnotationMethodInterceptor.java | 10 +-
.../activation/trace/TraceContextActivation.java | 12 +-
.../activation/trace/TraceContextInterceptor.java | 4 +-
.../toolkit/activation/trace/ActiveSpanTest.java | 26 +-
.../trace/CallableOrRunnableInterceptorTest.java | 6 +-
.../activation/trace/TraceAnnotationTest.java | 14 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 15 +-
.../bootstrap-plugins/jdk-http-plugin/pom.xml | 3 +-
.../jdk/http/HttpClientNewInstanceInterceptor.java | 13 +-
.../jdk/http/HttpClientParseHttpInterceptor.java | 19 +-
.../http/HttpClientWriteRequestInterceptor.java | 11 +-
.../http/HttpsClientNewInstanceInterceptor.java | 13 +-
.../jdk/http/define/HttpClientInstrumentation.java | 102 +++--
.../http/define/HttpsClientInstrumentation.java | 43 +--
.../bootstrap-plugins/jdk-threading-plugin/pom.xml | 3 +-
.../apm/plugin/jdk/threading/ThreadingConfig.java | 3 -
.../threading/ThreadingConstructorInterceptor.java | 3 -
.../jdk/threading/ThreadingMethodInterceptor.java | 27 +-
.../threading/define/CallableInstrumentation.java | 7 +-
.../threading/define/RunnableInstrumentation.java | 7 +-
apm-sniffer/bootstrap-plugins/pom.xml | 20 +-
.../customize-enhance-plugin/pom.xml | 3 +-
.../customize/conf/CustomizeConfiguration.java | 103 ++---
.../plugin/customize/conf/MethodConfiguration.java | 2 -
.../apm/plugin/customize/constants/Constants.java | 2 -
.../define/CustomizeInstanceInstrumentation.java | 4 +-
.../define/CustomizeStaticInstrumentation.java | 4 +-
.../interceptor/BaseInterceptorMethods.java | 4 -
.../interceptor/CustomizeInstanceInterceptor.java | 13 +-
.../interceptor/CustomizeStaticInterceptor.java | 13 +-
.../loader/CustomizeInstrumentationLoader.java | 15 +-
.../apm/plugin/customize/util/CustomizeUtil.java | 7 +-
.../customize/util/CustomizeExpressionTest.java | 10 +-
.../plugin/customize/util/CustomizeUtilTest.java | 4 -
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 3 +-
.../apm/plugin/gson/GsonFromJsonInterceptor.java | 19 +-
.../apm/plugin/gson/GsonToJsonInterceptor.java | 18 +-
.../gson/define/GsonFromJsonInstrumentation.java | 17 +-
.../gson/define/GsonToJsonInstrumentation.java | 20 +-
.../plugin/gson/GsonFromJsonInterceptorTest.java | 5 -
.../apm/plugin/gson/GsonToJsonInterceptorTest.java | 4 -
.../kotlin/coroutine/DispatcherInterceptor.java | 9 +-
.../plugin/kotlin/coroutine/TracingRunnable.java | 14 +-
.../define/DispatcherInstrumentation.java | 7 +-
.../gateway-2.1.x-plugin/pom.xml | 47 +--
.../v21x/FilteringWebHandlerInterceptor.java | 15 +-
.../HttpClientOperationsHeadersInterceptor.java | 13 +-
.../v21x/HttpClientOperationsSendInterceptor.java | 13 +-
.../HttpClientOperationsStatusInterceptor.java | 10 +-
.../v21x/NettyRoutingFilterInterceptor.java | 16 +-
.../cloud/gateway/v21x/context/Constants.java | 4 -
.../cloud/gateway/v21x/context/SWTransmitter.java | 4 -
.../define/DefaultHttpHeadersInstrumentation.java | 13 +-
.../define/FilteringWebHandlerInstrumentation.java | 5 +-
.../HttpClientOperationsInstrumentation.java | 14 +-
.../define/NettyRoutingFilterInstrumentation.java | 11 +-
.../optional-spring-cloud/pom.xml | 3 +-
.../optional-spring-plugins/pom.xml | 3 +-
.../spring-annotation-plugin/pom.xml | 3 +-
.../AbstractSpringBeanInstrumentation.java | 18 +-
.../annotations/SpringAnnotationInterceptor.java | 3 +-
.../bean/SpringBeanInstrumentation.java | 6 +-
.../component/SpringComponentInstrumentation.java | 3 +-
.../SpringRepositoryInstrumentation.java | 3 +-
.../services/SpringServicesInstrumentation.java | 3 +-
.../spring-tx-plugin/pom.xml | 3 +-
.../EndTransactionMethodInterceptor.java | 10 +-
.../GetTransactionMethodInterceptor.java | 13 +-
.../spring/transaction/context/Constants.java | 5 +-
...tPlatformTransactionManagerInstrumentation.java | 9 +-
apm-sniffer/optional-plugins/pom.xml | 20 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 3 +-
.../trace/ignore/TraceIgnoreExtendService.java | 5 +-
.../apm/plugin/trace/ignore/conf/IgnoreConfig.java | 12 +-
.../trace/ignore/conf/IgnoreConfigInitializer.java | 22 +-
.../trace/ignore/matcher/FastPathMatcher.java | 3 -
.../trace/ignore/matcher/TracePathMatcher.java | 5 -
.../apm/plugin/trace/ignore/TraceIgnoreTest.java | 5 +-
.../zookeeper-3.4.x-plugin/pom.xml | 3 +-
.../plugin/zookeeper/ClientCnxnInterceptor.java | 15 +-
.../zookeeper/EventThreadMethodInterceptor.java | 18 +-
.../skywalking/apm/plugin/zookeeper/ZooOpt.java | 29 +-
.../define/ClientCnxnInstrumentation.java | 11 +-
.../define/EventThreadInstrumentation.java | 8 +-
.../zookeeper/ClientCnxnInterceptorTest.java | 19 +-
apm-sniffer/pom.xml | 3 +-
apm-webapp/pom.xml | 3 +-
.../skywalking/apm/webapp/ApplicationStartUp.java | 2 +-
.../skywalking/apm/webapp/proxy/MvcConfig.java | 26 +-
.../apm/webapp/proxy/NotFoundHandler.java | 13 +-
.../apm/webapp/proxy/RewritePathFilter.java | 4 +-
apm-webapp/src/main/resources/logback-spring.xml | 6 +-
.../apm/webapp/ApplicationContextTest.java | 3 -
.../skywalking/apm/webapp/NotFoundHandlerTest.java | 15 +-
.../apache/skywalking/apm/webapp/WebAppTest.java | 13 +-
codeStyle.xml | 242 +++++-------
dist-material/log4j2.xml | 4 +-
docker/ui/Dockerfile.ui | 50 +--
docker/ui/logback.xml | 2 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 4 +-
oap-server/exporter/pom.xml | 9 +-
.../server/exporter/provider/MetricFormatter.java | 11 +-
.../exporter/provider/grpc/GRPCExporter.java | 73 ++--
.../provider/grpc/GRPCExporterProvider.java | 38 +-
.../provider/grpc/GRPCExporterSetting.java | 6 +-
.../provider/grpc/ExporterMockReceiver.java | 11 +-
.../provider/grpc/GRPCExporterProviderTest.java | 26 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 6 +-
.../provider/grpc/MockDoubleValueMetrics.java | 3 -
.../provider/grpc/MockIntValueMetrics.java | 3 -
.../provider/grpc/MockLongValueMetrics.java | 3 -
.../provider/grpc/MockMetricExportServiceImpl.java | 9 +-
.../server/exporter/provider/grpc/MockMetrics.java | 3 -
oap-server/oal-grammar/pom.xml | 3 +-
oap-server/oal-rt/pom.xml | 3 +-
.../org/apache/skywalking/oal/rt/OALRuntime.java | 51 +--
.../oal/rt/output/AllDispatcherContext.java | 6 +-
.../oal/rt/output/DispatcherContext.java | 6 +-
.../skywalking/oal/rt/parser/AnalysisResult.java | 13 +-
.../apache/skywalking/oal/rt/parser/Argument.java | 2 -
.../oal/rt/parser/ConditionExpression.java | 4 +-
.../skywalking/oal/rt/parser/DataColumn.java | 4 +-
.../skywalking/oal/rt/parser/DeepAnalysis.java | 12 +-
.../oal/rt/parser/DisableCollection.java | 6 +-
.../skywalking/oal/rt/parser/EntryMethod.java | 12 +-
.../skywalking/oal/rt/parser/MetricsHolder.java | 8 +-
.../skywalking/oal/rt/parser/OALListener.java | 65 ++--
.../skywalking/oal/rt/parser/OALScripts.java | 5 +-
.../oal/rt/parser/PersistenceColumns.java | 3 +-
.../skywalking/oal/rt/parser/PersistenceField.java | 4 +-
.../skywalking/oal/rt/parser/ScriptParser.java | 11 +-
.../skywalking/oal/rt/parser/SourceColumn.java | 32 +-
.../oal/rt/parser/SourceColumnsFactory.java | 6 +-
.../code-templates/dispatcher/dispatch.ftl | 8 +-
.../code-templates/dispatcher/doMetrics.ftl | 42 +-
.../code-templates/metrics-builder/data2Map.ftl | 58 +--
.../code-templates/metrics-builder/map2Data.ftl | 40 +-
.../code-templates/metrics/deserialize.ftl | 40 +-
.../resources/code-templates/metrics/equals.ftl | 38 +-
.../resources/code-templates/metrics/getMeta.ftl | 2 +-
.../resources/code-templates/metrics/hashCode.ftl | 22 +-
.../main/resources/code-templates/metrics/id.ftl | 20 +-
.../code-templates/metrics/remoteHashCode.ftl | 20 +-
.../resources/code-templates/metrics/serialize.ftl | 48 +--
.../resources/code-templates/metrics/toDay.ftl | 48 +--
.../resources/code-templates/metrics/toHour.ftl | 48 +--
.../resources/code-templates/metrics/toMonth.ftl | 48 +--
.../skywalking/oal/rt/parser/ScriptParserTest.java | 23 +-
.../expectedFiles/MetricsImplementorExpected.java | 68 ++--
.../expectedFiles/ServiceDispatcherExpected.java | 10 +-
oap-server/pom.xml | 3 +-
oap-server/server-alarm-plugin/pom.xml | 3 +-
.../oap/server/core/alarm/provider/AlarmCore.java | 3 -
.../core/alarm/provider/AlarmMessageFormatter.java | 6 +-
.../core/alarm/provider/AlarmModuleProvider.java | 44 ++-
.../oap/server/core/alarm/provider/AlarmRule.java | 18 +-
.../core/alarm/provider/AlarmRulesWatcher.java | 1 -
.../server/core/alarm/provider/NotifyHandler.java | 41 +-
.../oap/server/core/alarm/provider/Rules.java | 8 +-
.../server/core/alarm/provider/RulesReader.java | 39 +-
.../server/core/alarm/provider/RunningRule.java | 31 +-
.../oap/server/core/alarm/provider/Threshold.java | 3 -
.../core/alarm/provider/WebhookCallback.java | 14 +-
.../server/core/alarm/provider/AlarmCoreTest.java | 5 +-
.../alarm/provider/AlarmMessageFormatterTest.java | 39 +-
.../alarm/provider/AlarmModuleProviderTest.java | 18 +-
.../core/alarm/provider/AlarmRuleInitTest.java | 5 +-
.../core/alarm/provider/AlarmRulesWatcherTest.java | 71 ++--
.../core/alarm/provider/NotifyHandlerTest.java | 43 ++-
.../oap/server/core/alarm/provider/OPTest.java | 3 -
.../core/alarm/provider/RunningRuleTest.java | 118 ++++--
.../server/core/alarm/provider/ThresholdTest.java | 10 +-
.../core/alarm/provider/WebhookCallbackTest.java | 35 +-
oap-server/server-bootstrap/pom.xml | 3 +-
.../oap/server/starter/OAPServerBootstrap.java | 14 +-
.../starter/config/ApplicationConfigLoader.java | 24 +-
.../config/ConfigFileNotFoundException.java | 5 -
.../oap/server/starter/config/ConfigLoader.java | 4 -
.../resources/endpoint_naming_rules.properties | 1 -
.../server-bootstrap/src/main/resources/log4j2.xml | 2 +-
.../config/ApplicationConfigLoaderTestCase.java | 13 +-
.../cluster-consul-plugin/pom.xml | 3 +-
.../plugin/consul/ClusterModuleConsulConfig.java | 26 +-
.../plugin/consul/ClusterModuleConsulProvider.java | 29 +-
.../cluster/plugin/consul/ConsulCoordinator.java | 39 +-
.../consul/ClusterModuleConsulProviderTest.java | 26 +-
.../plugin/consul/ConsulCoordinatorTest.java | 21 +-
...TClusterModuleConsulProviderFunctionalTest.java | 30 +-
.../cluster-etcd-plugin/pom.xml | 3 +-
.../plugin/etcd/ClusterModuleEtcdConfig.java | 23 +-
.../plugin/etcd/ClusterModuleEtcdProvider.java | 23 +-
.../cluster/plugin/etcd/EtcdCoordinator.java | 20 +-
.../server/cluster/plugin/etcd/EtcdEndpoint.java | 14 +-
.../oap/server/cluster/plugin/etcd/EtcdUtils.java | 8 +-
.../plugin/etcd/ClusterModuleEtcdProviderTest.java | 3 -
.../cluster/plugin/etcd/EtcdCoordinatorTest.java | 12 +-
.../plugin/etcd/ITClusterEtcdPluginTest.java | 8 +-
.../ITClusterModuleEtcdProviderFunctionalTest.java | 20 +-
.../cluster-kubernetes-plugin/pom.xml | 3 +-
.../kubernetes/ClusterModuleKubernetesConfig.java | 2 -
.../ClusterModuleKubernetesProvider.java | 40 +-
.../server/cluster/plugin/kubernetes/Event.java | 2 -
.../plugin/kubernetes/KubernetesCoordinator.java | 50 ++-
.../cluster/plugin/kubernetes/ReusableWatch.java | 1 -
.../dependencies/NamespacedPodListWatch.java | 25 +-
.../kubernetes/dependencies/UidEnvSupplier.java | 6 +-
.../kubernetes/KubernetesCoordinatorTest.java | 62 ++-
.../plugin/kubernetes/fixture/PlainWatch.java | 8 +-
.../cluster-nacos-plugin/pom.xml | 3 +-
.../plugin/nacos/ClusterModuleNacosConfig.java | 15 +-
.../plugin/nacos/ClusterModuleNacosProvider.java | 14 +-
.../cluster/plugin/nacos/NacosCoordinator.java | 14 +-
.../nacos/ClusterModuleNacosProviderTest.java | 9 +-
...ITClusterModuleNacosProviderFunctionalTest.java | 12 +-
.../cluster/plugin/nacos/NacosCoordinatorTest.java | 13 +-
.../cluster-standalone-plugin/pom.xml | 3 +-
.../ClusterModuleStandaloneProvider.java | 21 +-
.../plugin/standalone/StandaloneManager.java | 12 +-
.../plugin/standalone/StandaloneManagerTest.java | 3 +-
.../cluster-zookeeper-plugin/pom.xml | 3 +-
.../zookeeper/ClusterModuleZookeeperConfig.java | 30 +-
.../zookeeper/ClusterModuleZookeeperProvider.java | 39 +-
.../cluster/plugin/zookeeper/NodeNameBuilder.java | 3 -
.../plugin/zookeeper/SWInstanceSerializer.java | 9 +-
.../plugin/zookeeper/ZookeeperCoordinator.java | 46 ++-
.../ClusterModuleZookeeperProviderTest.java | 3 -
...usterModuleZookeeperProviderFunctionalTest.java | 20 +-
.../plugin/zookeeper/NodeNameBuilderTest.java | 6 +-
.../plugin/zookeeper/ZookeeperCoordinatorTest.java | 13 +-
oap-server/server-cluster-plugin/pom.xml | 3 +-
.../server-configuration/configuration-api/pom.xml | 3 +-
.../api/AbstractConfigurationProvider.java | 22 +-
.../configuration/api/ConfigChangeWatcher.java | 20 +-
.../oap/server/configuration/api/ConfigTable.java | 9 +-
.../configuration/api/ConfigWatcherRegister.java | 37 +-
.../configuration/api/ConfigurationModule.java | 7 +-
.../api/DynamicConfigurationService.java | 4 +-
.../api/NoneConfigurationProvider.java | 32 +-
.../api/ConfigWatcherRegisterTest.java | 60 +--
.../configuration-apollo/pom.xml | 3 +-
.../apollo/ApolloConfigWatcherRegister.java | 6 +-
.../apollo/ApolloConfigurationCenterSettings.java | 9 +-
.../apollo/ApolloConfigurationProvider.java | 2 -
.../apollo/ApolloConfigurationTestModule.java | 3 -
.../apollo/ApolloConfigurationTestProvider.java | 15 +-
.../apollo/ITApolloConfigurationTest.java | 98 +----
.../configuration-consul/pom.xml | 3 +-
.../consul/ConsulConfigurationCenterSettings.java | 3 -
.../consul/ConsulConfigurationProvider.java | 2 -
.../consul/ConsulConfigurationWatcherRegister.java | 25 +-
.../consul/ConsulConfigurationProviderTest.java | 3 -
.../consul/ConsulConfigurationTestModule.java | 3 -
.../consul/ConsulConfigurationTestProvider.java | 11 +-
.../ConsulConfigurationWatcherRegisterTest.java | 59 ++-
.../consul/ITConsulConfigurationTest.java | 24 +-
.../configuration-etcd/pom.xml | 3 +-
.../configuration/etcd/EtcdConfigException.java | 3 -
.../etcd/EtcdConfigWatcherRegister.java | 12 +-
.../etcd/EtcdConfigurationProvider.java | 11 +-
.../configuration/etcd/EtcdServerSettings.java | 2 -
.../oap/server/configuration/etcd/EtcdUtils.java | 2 -
.../etcd/EtcdConfigWatcherRegisterTest.java | 10 +-
.../etcd/EtcdConfigurationTestModule.java | 6 +-
.../etcd/EtcdConfigurationTestProvider.java | 30 +-
.../etcd/ITEtcdConfigurationTest.java | 11 +-
.../server/configuration/etcd/TestEtcdUtils.java | 3 -
.../configuration-nacos/pom.xml | 3 +-
.../nacos/NacosConfigWatcherRegister.java | 14 +-
.../nacos/NacosConfigurationProvider.java | 2 -
.../configuration/nacos/NacosServerSettings.java | 3 -
.../nacos/ITNacosConfigurationTest.java | 20 +-
.../nacos/NacosConfigWatcherRegisterTest.java | 12 +-
.../nacos/NacosConfigurationTestModule.java | 3 -
.../nacos/NacosConfigurationTestProvider.java | 15 +-
.../configuration-zookeeper/pom.xml | 3 +-
.../zookeeper/ZookeeperConfigWatcherRegister.java | 6 +-
.../zookeeper/ZookeeperConfigurationProvider.java | 2 -
.../zookeeper/ZookeeperServerSettings.java | 10 +-
.../zookeeper/it/ITZookeeperConfigurationTest.java | 25 +-
.../it/MockZookeeperConfigurationModule.java | 3 -
.../it/MockZookeeperConfigurationProvider.java | 14 +-
.../ut/MockZookeeperConfigWatcherRegister.java | 7 +-
.../ut/ZookeeperConfigWatcherRegisterTestCase.java | 10 +-
.../grpc-configuration-sync/pom.xml | 6 +-
.../grpc/GRPCConfigWatcherRegister.java | 25 +-
.../grpc/GRPCConfigurationProvider.java | 19 +-
.../configuration/grpc/RemoteEndpointSettings.java | 15 +-
oap-server/server-configuration/pom.xml | 3 +-
oap-server/server-core/pom.xml | 9 +-
.../apache/skywalking/oap/server/core/Const.java | 3 -
.../skywalking/oap/server/core/CoreModule.java | 23 +-
.../oap/server/core/CoreModuleConfig.java | 81 ++--
.../oap/server/core/CoreModuleProvider.java | 116 ++++--
.../skywalking/oap/server/core/DataTTLConfig.java | 6 +-
.../skywalking/oap/server/core/RunningMode.java | 4 +-
.../oap/server/core/UnexpectedException.java | 3 -
.../skywalking/oap/server/core/WorkPath.java | 2 -
.../oap/server/core/alarm/AlarmCallback.java | 5 +-
.../oap/server/core/alarm/AlarmEntrance.java | 3 -
.../oap/server/core/alarm/AlarmMessage.java | 6 +-
.../oap/server/core/alarm/AlarmModule.java | 9 +-
.../oap/server/core/alarm/AlarmRecord.java | 53 +--
.../core/alarm/AlarmStandardPersistence.java | 10 +-
.../oap/server/core/alarm/EndpointMetaInAlarm.java | 12 +-
.../oap/server/core/alarm/MetaInAlarm.java | 10 +-
.../oap/server/core/alarm/MetricsNotify.java | 8 +-
.../core/alarm/ServiceInstanceMetaInAlarm.java | 16 +-
.../oap/server/core/alarm/ServiceMetaInAlarm.java | 16 +-
.../server/core/analysis/ApdexThresholdConfig.java | 16 +-
.../core/analysis/ConfigurationDictionary.java | 2 -
.../oap/server/core/analysis/Disable.java | 9 +-
.../oap/server/core/analysis/DisableRegister.java | 21 +-
.../core/analysis/DispatcherDetectorListener.java | 3 -
.../server/core/analysis/DispatcherManager.java | 20 +-
.../oap/server/core/analysis/Downsampling.java | 3 -
.../oap/server/core/analysis/MultipleDisable.java | 5 +-
.../oap/server/core/analysis/SourceDispatcher.java | 3 -
.../oap/server/core/analysis/Stream.java | 8 +-
.../core/analysis/StreamAnnotationListener.java | 16 +-
.../oap/server/core/analysis/StreamProcessor.java | 3 -
.../oap/server/core/analysis/TimeBucket.java | 3 -
.../server/core/analysis/config/NoneStream.java | 2 -
.../oap/server/core/analysis/data/DataCache.java | 3 -
.../core/analysis/data/LimitedSizeDataCache.java | 11 +-
.../analysis/data/LimitedSizeDataCollection.java | 42 +-
.../server/core/analysis/data/MergeDataCache.java | 12 +-
.../core/analysis/data/MergeDataCollection.java | 43 ++-
.../core/analysis/data/NonMergeDataCache.java | 12 +-
.../core/analysis/data/NonMergeDataCollection.java | 43 ++-
.../oap/server/core/analysis/data/QueueData.java | 3 -
.../server/core/analysis/data/SWCollection.java | 3 -
.../oap/server/core/analysis/data/Window.java | 3 -
.../core/analysis/manual/RelationDefineUtil.java | 5 +-
.../database/DatabaseStatementDispatcher.java | 6 +-
.../manual/database/TopNDatabaseStatement.java | 36 +-
.../EndpointCallRelationDispatcher.java | 3 -
.../EndpointRelationServerSideMetrics.java | 89 +++--
.../analysis/manual/log/AbstractLogRecord.java | 81 ++--
.../manual/log/HTTPAccessLogDispatcher.java | 6 +-
.../analysis/manual/log/HTTPAccessLogRecord.java | 3 +-
.../ServiceInstanceCallRelationDispatcher.java | 3 -
.../ServiceInstanceRelationClientSideMetrics.java | 63 +--
.../ServiceInstanceRelationServerSideMetrics.java | 62 ++-
.../service/ServiceCallRelationDispatcher.java | 3 -
.../service/ServiceRelationClientSideMetrics.java | 92 +++--
.../service/ServiceRelationServerSideMetrics.java | 92 +++--
.../analysis/manual/segment/SegmentDispatcher.java | 6 +-
.../analysis/manual/segment/SegmentRecord.java | 107 ++++--
.../server/core/analysis/metrics/ApdexMetrics.java | 45 ++-
.../server/core/analysis/metrics/CPMMetrics.java | 28 +-
.../server/core/analysis/metrics/CountMetrics.java | 23 +-
.../core/analysis/metrics/DoubleAvgMetrics.java | 34 +-
.../core/analysis/metrics/DoubleValueHolder.java | 2 -
.../server/core/analysis/metrics/GroupMetrics.java | 3 -
.../core/analysis/metrics/IntKeyLongValue.java | 24 +-
.../analysis/metrics/IntKeyLongValueHashMap.java | 19 +-
.../core/analysis/metrics/IntValueHolder.java | 2 -
.../core/analysis/metrics/LongAvgMetrics.java | 34 +-
.../core/analysis/metrics/LongValueHolder.java | 2 -
.../core/analysis/metrics/MaxDoubleMetrics.java | 23 +-
.../core/analysis/metrics/MaxLongMetrics.java | 22 +-
.../oap/server/core/analysis/metrics/Metrics.java | 20 +-
.../core/analysis/metrics/MetricsMetaInfo.java | 27 +-
.../core/analysis/metrics/MinDoubleMetrics.java | 17 +-
.../core/analysis/metrics/MinLongMetrics.java | 17 +-
.../analysis/metrics/MultiIntValuesHolder.java | 2 -
.../server/core/analysis/metrics/P50Metrics.java | 2 -
.../server/core/analysis/metrics/P75Metrics.java | 2 -
.../server/core/analysis/metrics/P90Metrics.java | 2 -
.../server/core/analysis/metrics/P95Metrics.java | 2 -
.../server/core/analysis/metrics/P99Metrics.java | 2 -
.../core/analysis/metrics/PercentMetrics.java | 33 +-
.../core/analysis/metrics/PercentileMetrics.java | 34 +-
.../server/core/analysis/metrics/PxxMetrics.java | 33 +-
.../server/core/analysis/metrics/SumMetrics.java | 23 +-
.../analysis/metrics/ThermodynamicMetrics.java | 36 +-
.../server/core/analysis/metrics/WithMetadata.java | 2 -
.../core/analysis/metrics/annotation/Arg.java | 3 -
.../core/analysis/metrics/annotation/ConstOne.java | 8 +-
.../core/analysis/metrics/annotation/Entrance.java | 8 +-
.../analysis/metrics/annotation/Expression.java | 3 -
.../metrics/annotation/MetricsFunction.java | 7 +-
.../analysis/metrics/annotation/SourceFrom.java | 8 +-
.../analysis/metrics/expression/EqualMatch.java | 3 -
.../metrics/expression/GreaterEqualMatch.java | 3 -
.../analysis/metrics/expression/GreaterMatch.java | 3 -
.../metrics/expression/LessEqualMatch.java | 3 -
.../analysis/metrics/expression/LessMatch.java | 3 -
.../oap/server/core/analysis/record/Record.java | 11 +-
.../oap/server/core/analysis/topn/TopN.java | 32 +-
.../core/analysis/worker/AlarmNotifyWorker.java | 8 +-
.../server/core/analysis/worker/ExportWorker.java | 14 +-
.../analysis/worker/MetricsAggregateWorker.java | 42 +-
.../analysis/worker/MetricsPersistentWorker.java | 53 ++-
.../core/analysis/worker/MetricsRemoteWorker.java | 9 +-
.../analysis/worker/MetricsStreamProcessor.java | 44 ++-
.../core/analysis/worker/MetricsTransWorker.java | 29 +-
.../worker/NoneStreamPersistentWorker.java | 5 +-
.../analysis/worker/NoneStreamingProcessor.java | 13 +-
.../core/analysis/worker/PersistenceWorker.java | 12 +-
.../analysis/worker/RecordPersistentWorker.java | 13 +-
.../analysis/worker/RecordStreamProcessor.java | 21 +-
.../core/analysis/worker/TopNStreamProcessor.java | 36 +-
.../server/core/analysis/worker/TopNWorker.java | 44 ++-
.../server/core/annotation/AnnotationListener.java | 3 -
.../oap/server/core/annotation/AnnotationScan.java | 9 +-
.../oap/server/core/cache/CacheUpdateTimer.java | 63 +--
.../server/core/cache/EndpointInventoryCache.java | 29 +-
.../core/cache/NetworkAddressInventoryCache.java | 33 +-
.../oap/server/core/cache/ProfileTaskCache.java | 47 ++-
.../core/cache/ServiceInstanceInventoryCache.java | 35 +-
.../server/core/cache/ServiceInventoryCache.java | 38 +-
.../oap/server/core/cluster/ClusterModule.java | 13 +-
.../oap/server/core/cluster/ClusterNodesQuery.java | 6 +-
.../oap/server/core/cluster/ClusterRegister.java | 3 -
.../oap/server/core/cluster/RemoteInstance.java | 9 +-
.../server/core/cluster/ServiceQueryException.java | 3 -
.../core/cluster/ServiceRegisterException.java | 3 -
.../oap/server/core/command/CommandService.java | 15 +-
.../config/ComponentLibraryCatalogService.java | 25 +-
.../oap/server/core/config/ConfigService.java | 6 +-
.../core/config/DownsamplingConfigService.java | 3 -
.../config/IComponentLibraryCatalogService.java | 3 -
.../config/InitialComponentCatalogException.java | 3 -
.../oap/server/core/exporter/ExportEvent.java | 6 +-
.../oap/server/core/exporter/ExporterModule.java | 6 +-
.../core/exporter/MetricValuesExportService.java | 5 +-
.../server/core/oal/rt/OALCompileException.java | 3 -
.../oap/server/core/oal/rt/OALEngine.java | 2 -
.../oap/server/core/oal/rt/OALEngineLoader.java | 4 +-
.../server/core/profile/ProfileTaskLogRecord.java | 30 +-
.../core/profile/ProfileTaskMutationService.java | 38 +-
.../server/core/profile/ProfileTaskNoneStream.java | 49 +--
.../core/profile/ProfileThreadSnapshotRecord.java | 39 +-
.../profile/analyze/ProfileAnalyzeCollector.java | 3 +-
.../core/profile/analyze/ProfileAnalyzer.java | 34 +-
.../server/core/profile/analyze/ProfileStack.java | 3 +-
.../core/profile/analyze/ProfileStackNode.java | 26 +-
.../profile/entity/ProfileTaskCreationResult.java | 8 +-
.../server/core/query/AggregationQueryService.java | 62 ++-
.../oap/server/core/query/AlarmQueryService.java | 8 +-
.../oap/server/core/query/DurationPoint.java | 3 -
.../oap/server/core/query/DurationUtils.java | 6 +-
.../oap/server/core/query/LogQueryService.java | 42 +-
.../server/core/query/MetadataQueryService.java | 24 +-
.../oap/server/core/query/MetricQueryService.java | 26 +-
.../oap/server/core/query/PaginationUtils.java | 3 -
.../server/core/query/ProfileTaskQueryService.java | 36 +-
.../oap/server/core/query/QueryModule.java | 5 +-
.../core/query/ServiceInstanceTopologyBuilder.java | 40 +-
.../oap/server/core/query/StepToDownsampling.java | 5 +-
.../server/core/query/TopNRecordsQueryService.java | 14 +-
.../oap/server/core/query/TopologyBuilder.java | 32 +-
.../server/core/query/TopologyQueryService.java | 34 +-
.../oap/server/core/query/TraceQueryService.java | 35 +-
.../oap/server/core/query/entity/AlarmMessage.java | 6 +-
.../oap/server/core/query/entity/AlarmTrend.java | 6 +-
.../oap/server/core/query/entity/Alarms.java | 12 +-
.../oap/server/core/query/entity/Attribute.java | 6 +-
.../oap/server/core/query/entity/BasicTrace.java | 21 +-
.../oap/server/core/query/entity/Call.java | 10 +-
.../oap/server/core/query/entity/ClusterBrief.java | 6 +-
.../oap/server/core/query/entity/ContentType.java | 3 -
.../oap/server/core/query/entity/Database.java | 2 +-
.../oap/server/core/query/entity/Endpoint.java | 6 +-
.../oap/server/core/query/entity/EndpointInfo.java | 6 +-
.../oap/server/core/query/entity/IntValues.java | 3 -
.../oap/server/core/query/entity/KVInt.java | 6 +-
.../oap/server/core/query/entity/KeyValue.java | 6 +-
.../oap/server/core/query/entity/Language.java | 10 +-
.../server/core/query/entity/LanguageTrans.java | 3 -
.../oap/server/core/query/entity/Log.java | 6 +-
.../oap/server/core/query/entity/LogEntity.java | 12 +-
.../oap/server/core/query/entity/LogState.java | 3 -
.../oap/server/core/query/entity/Logs.java | 9 +-
.../oap/server/core/query/entity/Node.java | 6 +-
.../oap/server/core/query/entity/Order.java | 6 +-
.../oap/server/core/query/entity/Pagination.java | 6 +-
.../core/query/entity/ProfileAnalyzation.java | 6 +-
.../server/core/query/entity/ProfileStackTree.java | 6 +-
.../oap/server/core/query/entity/ProfileTask.java | 10 +-
.../server/core/query/entity/ProfileTaskLog.java | 9 +-
.../query/entity/ProfileTaskLogOperationType.java | 10 +-
.../oap/server/core/query/entity/QueryOrder.java | 6 +-
.../oap/server/core/query/entity/Ref.java | 6 +-
.../oap/server/core/query/entity/RefType.java | 6 +-
.../oap/server/core/query/entity/Scope.java | 10 +-
.../oap/server/core/query/entity/Service.java | 3 -
.../server/core/query/entity/ServiceInstance.java | 15 +-
.../core/query/entity/ServiceInstanceNode.java | 3 -
.../core/query/entity/ServiceInstanceTopology.java | 6 +-
.../oap/server/core/query/entity/Span.java | 57 ++-
.../oap/server/core/query/entity/Step.java | 9 +-
.../server/core/query/entity/Thermodynamic.java | 27 +-
.../oap/server/core/query/entity/TopNEntity.java | 6 +-
.../oap/server/core/query/entity/TopNRecord.java | 6 +-
.../oap/server/core/query/entity/Topology.java | 6 +-
.../oap/server/core/query/entity/Trace.java | 6 +-
.../oap/server/core/query/entity/TraceBrief.java | 12 +-
.../oap/server/core/query/entity/TraceState.java | 7 +-
.../oap/server/core/query/sql/Function.java | 3 -
.../oap/server/core/query/sql/GroupBy.java | 6 +-
.../oap/server/core/query/sql/KeyValues.java | 16 +-
.../oap/server/core/query/sql/Where.java | 6 +-
.../server/core/register/EndpointInventory.java | 58 +--
.../core/register/NetworkAddressInventory.java | 56 +--
.../oap/server/core/register/NodeType.java | 10 +-
.../oap/server/core/register/RegisterSource.java | 26 +-
.../core/register/ServiceInstanceInventory.java | 104 +++--
.../oap/server/core/register/ServiceInventory.java | 92 +++--
.../service/EndpointInventoryRegister.java | 18 +-
.../service/IEndpointInventoryRegister.java | 3 -
.../service/INetworkAddressInventoryRegister.java | 3 -
.../service/IServiceInstanceInventoryRegister.java | 14 +-
.../service/IServiceInventoryRegister.java | 15 +-
.../service/NetworkAddressInventoryRegister.java | 39 +-
.../service/ServiceInstanceInventoryRegister.java | 28 +-
.../register/service/ServiceInventoryRegister.java | 31 +-
.../register/worker/InventoryStreamProcessor.java | 10 +-
.../register/worker/RegisterDistinctWorker.java | 30 +-
.../register/worker/RegisterPersistentWorker.java | 57 ++-
.../core/register/worker/RegisterRemoteWorker.java | 9 +-
.../oap/server/core/remote/Deserializable.java | 3 -
.../server/core/remote/RemoteSenderService.java | 7 +-
.../server/core/remote/RemoteServiceHandler.java | 46 ++-
.../oap/server/core/remote/Serializable.java | 3 -
.../oap/server/core/remote/client/Address.java | 23 +-
.../core/remote/client/GRPCRemoteClient.java | 60 +--
.../server/core/remote/client/RemoteClient.java | 3 -
.../core/remote/client/RemoteClientManager.java | 28 +-
.../core/remote/client/SelfRemoteClient.java | 30 +-
.../oap/server/core/remote/data/StreamData.java | 15 +-
.../remote/health/HealthCheckServiceHandler.java | 14 +-
.../core/remote/selector/ForeverFirstSelector.java | 11 +-
.../core/remote/selector/HashCodeSelector.java | 8 +-
.../core/remote/selector/RemoteClientSelector.java | 5 +-
.../core/remote/selector/RollingSelector.java | 8 +-
.../oap/server/core/remote/selector/Selector.java | 3 -
.../server/core/server/GRPCHandlerRegister.java | 7 +-
.../core/server/GRPCHandlerRegisterImpl.java | 12 +-
.../server/core/server/JettyHandlerRegister.java | 3 -
.../core/server/JettyHandlerRegisterImpl.java | 9 +-
.../server/auth/AuthenticationInterceptor.java | 5 +-
.../oap/server/core/source/AbstractLog.java | 6 +-
.../skywalking/oap/server/core/source/All.java | 37 +-
.../oap/server/core/source/DatabaseAccess.java | 26 +-
.../server/core/source/DatabaseSlowStatement.java | 32 +-
.../oap/server/core/source/DefaultScopeDefine.java | 32 +-
.../oap/server/core/source/DetectPoint.java | 6 +-
.../oap/server/core/source/Endpoint.java | 54 ++-
.../oap/server/core/source/EndpointRelation.java | 92 +++--
.../server/core/source/EnvoyInstanceMetric.java | 38 +-
.../oap/server/core/source/GCPhrase.java | 3 -
.../oap/server/core/source/HTTPAccessLog.java | 6 +-
.../oap/server/core/source/MemoryPoolType.java | 3 -
.../oap/server/core/source/RequestType.java | 3 -
.../oap/server/core/source/ScopeDeclaration.java | 9 +-
.../oap/server/core/source/ScopeDefaultColumn.java | 2 -
.../skywalking/oap/server/core/source/Segment.java | 60 ++-
.../skywalking/oap/server/core/source/Service.java | 47 ++-
.../oap/server/core/source/ServiceInstance.java | 49 ++-
.../server/core/source/ServiceInstanceCLRCPU.java | 29 +-
.../server/core/source/ServiceInstanceCLRGC.java | 41 +-
.../core/source/ServiceInstanceCLRThread.java | 41 +-
.../server/core/source/ServiceInstanceJVMCPU.java | 30 +-
.../server/core/source/ServiceInstanceJVMGC.java | 41 +-
.../core/source/ServiceInstanceJVMMemory.java | 49 ++-
.../core/source/ServiceInstanceJVMMemoryPool.java | 49 ++-
.../core/source/ServiceInstanceRelation.java | 76 +++-
.../oap/server/core/source/ServiceRelation.java | 64 ++-
.../skywalking/oap/server/core/source/Source.java | 10 +-
.../oap/server/core/source/SourceReceiver.java | 3 -
.../oap/server/core/source/SourceReceiverImpl.java | 6 +-
.../oap/server/core/storage/AbstractDAO.java | 3 -
.../server/core/storage/ComparableStorageData.java | 2 -
.../skywalking/oap/server/core/storage/DAO.java | 3 -
.../oap/server/core/storage/IBatchDAO.java | 6 +-
.../oap/server/core/storage/IHistoryDeleteDAO.java | 3 -
.../oap/server/core/storage/IMetricsDAO.java | 6 +-
.../oap/server/core/storage/INoneStreamDAO.java | 5 +-
.../oap/server/core/storage/IRecordDAO.java | 3 -
.../oap/server/core/storage/IRegisterDAO.java | 5 +-
.../oap/server/core/storage/IRegisterLockDAO.java | 2 -
.../oap/server/core/storage/PersistenceTimer.java | 40 +-
.../oap/server/core/storage/StorageBuilder.java | 3 -
.../oap/server/core/storage/StorageDAO.java | 3 -
.../oap/server/core/storage/StorageData.java | 3 -
.../oap/server/core/storage/StorageException.java | 3 -
.../oap/server/core/storage/StorageModule.java | 46 ++-
.../oap/server/core/storage/annotation/Column.java | 10 +-
.../server/core/storage/annotation/IDColumn.java | 2 -
.../oap/server/core/storage/annotation/Query.java | 3 -
.../server/core/storage/annotation/Storage.java | 3 -
.../core/storage/annotation/ValueColumnIds.java | 6 +-
.../storage/cache/IEndpointInventoryCacheDAO.java | 3 -
.../cache/INetworkAddressInventoryCacheDAO.java | 3 -
.../cache/IServiceInstanceInventoryCacheDAO.java | 6 +-
.../storage/cache/IServiceInventoryCacheDAO.java | 3 -
.../oap/server/core/storage/model/ColumnName.java | 2 -
.../server/core/storage/model/DataTypeMapping.java | 3 -
.../server/core/storage/model/IModelGetter.java | 3 -
.../server/core/storage/model/IModelOverride.java | 2 -
.../server/core/storage/model/IModelSetter.java | 3 -
.../oap/server/core/storage/model/Model.java | 6 +-
.../oap/server/core/storage/model/ModelColumn.java | 3 -
.../server/core/storage/model/ModelInstaller.java | 12 +-
.../oap/server/core/storage/model/ModelName.java | 7 +-
.../server/core/storage/model/StorageModels.java | 29 +-
.../storage/profile/IProfileTaskLogQueryDAO.java | 9 +-
.../core/storage/profile/IProfileTaskQueryDAO.java | 23 +-
.../profile/IProfileThreadSnapshotQueryDAO.java | 10 +-
.../core/storage/query/IAggregationQueryDAO.java | 23 +-
.../server/core/storage/query/IAlarmQueryDAO.java | 3 -
.../server/core/storage/query/ILogQueryDAO.java | 12 +-
.../core/storage/query/IMetadataQueryDAO.java | 11 +-
.../core/storage/query/IMetricsQueryDAO.java | 3 -
.../core/storage/query/ITopNRecordsQueryDAO.java | 7 +-
.../core/storage/query/ITopologyQueryDAO.java | 24 +-
.../server/core/storage/query/ITraceQueryDAO.java | 17 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 23 +-
.../server/core/storage/ttl/DayTTLCalculator.java | 6 +-
.../server/core/storage/ttl/GeneralStorageTTL.java | 9 +-
.../server/core/storage/ttl/HourTTLCalculator.java | 6 +-
.../core/storage/ttl/MinuteTTLCalculator.java | 9 +-
.../core/storage/ttl/MonthTTLCalculator.java | 6 +-
.../core/storage/ttl/RecordTTLCalculator.java | 5 +-
.../core/storage/ttl/SecondTTLCalculator.java | 6 +-
.../oap/server/core/storage/ttl/StorageTTL.java | 3 -
.../oap/server/core/storage/ttl/TTLCalculator.java | 3 -
.../server/core/storage/type/StorageDataType.java | 3 -
.../oap/server/core/worker/AbstractWorker.java | 8 +-
.../server/core/worker/IWorkerInstanceGetter.java | 3 -
.../server/core/worker/IWorkerInstanceSetter.java | 3 -
.../oap/server/core/worker/RemoteHandleWorker.java | 3 -
.../server/core/worker/WorkerInstancesService.java | 8 +-
.../core/analysis/ApdexThresholdConfigTest.java | 3 +-
.../data/LimitedSizeDataCollectionTest.java | 30 +-
.../core/analysis/metrics/ApdexMetricsTest.java | 24 +-
.../core/analysis/metrics/CountMetricsTest.java | 24 +-
.../metrics/IntKeyLongValueHashMapTestCase.java | 7 +-
.../core/analysis/metrics/LongAvgMetricsTest.java | 24 +-
.../core/analysis/metrics/MaxLongMetricsTest.java | 23 +-
.../server/core/analysis/metrics/MetricsTest.java | 30 +-
.../core/analysis/metrics/MinLongMetricsTest.java | 25 +-
.../core/analysis/metrics/PercentMetricsTest.java | 48 +--
.../analysis/metrics/PercentileMetricsTest.java | 58 ++-
.../core/analysis/metrics/PxxMetricsTest.java | 26 +-
.../analysis/metrics/ThermodynamicMetricsTest.java | 31 +-
.../metrics/expression/EqualMatchTest.java | 5 +-
.../config/ComponentLibraryCatalogFileTest.java | 3 -
.../core/profile/analyze/ProfileStackAnalyze.java | 7 +-
.../profile/analyze/ProfileStackAnalyzeHolder.java | 1 +
.../core/profile/analyze/ProfileStackData.java | 1 +
.../analyze/ProfileStackElementMatcher.java | 16 +-
.../core/remote/RemoteServiceHandlerTestCase.java | 85 ++--
.../remote/client/GRPCRemoteClientRealClient.java | 23 +-
.../remote/client/GRPCRemoteClientRealServer.java | 3 -
.../remote/client/GRPCRemoteClientTestCase.java | 57 ++-
.../remote/client/RemoteClientManagerTestCase.java | 42 +-
.../core/storage/StorageInstallerTestCase.java | 15 +-
oap-server/server-library/library-buffer/pom.xml | 3 +-
.../oap/server/library/buffer/BufferData.java | 6 +-
.../library/buffer/BufferDataCollection.java | 6 +-
.../oap/server/library/buffer/BufferFileUtils.java | 8 +-
.../oap/server/library/buffer/BufferStream.java | 20 +-
.../oap/server/library/buffer/DataStream.java | 18 +-
.../server/library/buffer/DataStreamReader.java | 29 +-
.../server/library/buffer/DataStreamWriter.java | 13 +-
.../oap/server/library/buffer/Offset.java | 32 +-
.../oap/server/library/buffer/OffsetStream.java | 26 +-
.../library/buffer/BufferFileUtilsTestCase.java | 9 +-
oap-server/server-library/library-client/pom.xml | 3 +-
.../oap/server/library/client/Client.java | 3 -
.../oap/server/library/client/ClientException.java | 3 -
.../client/elasticsearch/ElasticSearchClient.java | 93 +++--
.../ElasticSearchClientException.java | 3 -
.../elasticsearch/ElasticSearchInsertRequest.java | 6 +-
.../elasticsearch/ElasticSearchUpdateRequest.java | 6 +-
.../oap/server/library/client/grpc/GRPCClient.java | 24 +-
.../library/client/grpc/GRPCClientConfig.java | 3 -
.../library/client/grpc/GRPCClientException.java | 3 -
.../library/client/jdbc/JDBCClientException.java | 3 -
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 30 +-
.../library/client/request/InsertRequest.java | 3 -
.../library/client/request/PrepareRequest.java | 3 -
.../library/client/request/UpdateRequest.java | 3 -
.../elasticsearch/ITElasticSearchClient.java | 71 ++--
.../ITElasticSearchClientOfNamespace.java | 4 -
oap-server/server-library/library-module/pom.xml | 3 +-
.../library/module/ApplicationConfiguration.java | 3 -
.../oap/server/library/module/BootstrapFlow.java | 15 +-
.../library/module/CycleDependencyException.java | 4 -
.../oap/server/library/module/ModuleConfig.java | 3 -
.../library/module/ModuleConfigException.java | 3 -
.../oap/server/library/module/ModuleDefine.java | 23 +-
.../server/library/module/ModuleDefineHolder.java | 3 -
.../oap/server/library/module/ModuleManager.java | 14 +-
.../library/module/ModuleNotFoundException.java | 1 -
.../module/ModuleNotFoundRuntimeException.java | 4 -
.../oap/server/library/module/ModuleProvider.java | 25 +-
.../library/module/ModuleProviderHolder.java | 3 -
.../server/library/module/ModuleServiceHolder.java | 3 -
.../library/module/ModuleStartException.java | 3 -
.../oap/server/library/module/Service.java | 4 +-
.../module/ServiceNotProvidedRuntimeException.java | 1 -
.../module/ApplicationConfigurationTest.java | 8 +-
.../oap/server/library/module/BaseModuleA.java | 11 +-
.../oap/server/library/module/BaseModuleB.java | 11 +-
.../library/module/ModuleABusiness1Impl.java | 7 +-
.../library/module/ModuleABusiness2Impl.java | 4 -
.../oap/server/library/module/ModuleAProvider.java | 24 +-
.../library/module/ModuleBBusiness1Impl.java | 4 -
.../library/module/ModuleBBusiness2Impl.java | 4 -
.../oap/server/library/module/ModuleBProvider.java | 24 +-
.../server/library/module/ModuleManagerTest.java | 10 +-
.../oap/server/library/module/TestModule.java | 6 +-
.../server/library/module/TestModuleProvider.java | 29 +-
oap-server/server-library/library-server/pom.xml | 3 +-
.../oap/server/library/server/Server.java | 3 -
.../oap/server/library/server/ServerException.java | 3 -
.../oap/server/library/server/ServerHandler.java | 3 -
.../library/server/grpc/CustomThreadFactory.java | 14 +-
.../server/library/server/grpc/GRPCHandler.java | 3 -
.../oap/server/library/server/grpc/GRPCServer.java | 55 ++-
.../library/server/grpc/GRPCServerException.java | 3 -
.../server/jetty/ArgumentsParseException.java | 3 -
.../server/library/server/jetty/JettyHandler.java | 3 -
.../library/server/jetty/JettyJsonHandler.java | 57 ++-
.../server/library/server/jetty/JettyServer.java | 27 +-
.../library/server/jetty/JettyServerConfig.java | 3 -
.../library/server/jetty/JettyServerException.java | 3 -
oap-server/server-library/library-util/pom.xml | 3 +-
.../oap/server/library/util/Address.java | 6 +-
.../oap/server/library/util/BooleanUtils.java | 3 -
.../oap/server/library/util/CollectionUtils.java | 7 +-
.../library/util/ConnectStringParseException.java | 2 -
.../oap/server/library/util/ConnectUtils.java | 6 +-
.../oap/server/library/util/ResourceUtils.java | 8 +-
.../oap/server/library/util/BooleanUtilsTest.java | 7 +-
.../server/library/util/CollectionUtilsTest.java | 6 +-
.../server/library/util/ConnectUtilTestCase.java | 6 +-
.../util/PropertyPlaceholderHelperTest.java | 12 +-
.../oap/server/library/util/ResourceUtilsTest.java | 6 +-
.../oap/server/library/util/TimestampUtils.java | 6 +-
oap-server/server-library/pom.xml | 3 +-
oap-server/server-query-plugin/pom.xml | 3 +-
.../query-graphql-plugin/pom.xml | 3 +-
.../oap/query/graphql/GraphQLQueryConfig.java | 2 -
.../oap/query/graphql/GraphQLQueryHandler.java | 18 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 90 +++--
.../query/graphql/resolver/AggregationQuery.java | 18 +-
.../oap/query/graphql/resolver/AlarmQuery.java | 13 +-
.../oap/query/graphql/resolver/LogQuery.java | 18 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 21 +-
.../oap/query/graphql/resolver/MetricQuery.java | 22 +-
.../oap/query/graphql/resolver/Mutation.java | 2 -
.../query/graphql/resolver/ProfileMutation.java | 23 +-
.../oap/query/graphql/resolver/ProfileQuery.java | 9 +-
.../oap/query/graphql/resolver/Query.java | 2 -
.../query/graphql/resolver/TopNRecordsQuery.java | 21 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 12 +-
.../oap/query/graphql/resolver/TraceQuery.java | 24 +-
.../query/graphql/type/BatchMetricConditions.java | 6 +-
.../oap/query/graphql/type/LogQueryCondition.java | 9 +-
.../oap/query/graphql/type/MetricCondition.java | 3 +-
.../graphql/type/ProfileTaskCreationRequest.java | 3 +-
.../query/graphql/type/TopNRecordsCondition.java | 3 +-
.../query/graphql/type/TraceQueryCondition.java | 7 +-
.../envoy-metrics-receiver-plugin/pom.xml | 3 +-
.../envoy/AccessLogServiceGRPCHandler.java | 45 ++-
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 7 +-
.../receiver/envoy/EnvoyMetricReceiverModule.java | 5 +-
.../envoy/EnvoyMetricReceiverProvider.java | 40 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 56 ++-
.../server/receiver/envoy/als/ALSHTTPAnalysis.java | 8 +-
.../envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 220 ++++++-----
.../server/receiver/envoy/als/ServiceMetaInfo.java | 22 +-
.../envoy/MetricServiceGRPCHandlerTestMain.java | 27 +-
.../receiver/envoy/als/DependencyResourceTest.java | 42 +-
.../receiver/envoy/als/K8sHTTPAnalysisTest.java | 27 +-
.../jaeger-receiver-plugin/pom.xml | 3 +-
.../server/receiver/jaeger/JaegerGRPCHandler.java | 32 +-
.../receiver/jaeger/JaegerReceiverConfig.java | 3 +-
.../receiver/jaeger/JaegerReceiverModule.java | 5 +-
.../receiver/jaeger/JaegerReceiverProvider.java | 40 +-
oap-server/server-receiver-plugin/pom.xml | 3 +-
.../skywalking-clr-receiver-plugin/pom.xml | 3 +-
.../oap/server/receiver/clr/module/CLRModule.java | 5 +-
.../receiver/clr/provider/CLRModuleProvider.java | 32 +-
.../handler/CLRMetricReportServiceHandler.java | 5 +-
.../clr/provider/handler/CLRSourceDispatcher.java | 6 +-
.../pom.xml | 9 +-
.../module/IstioTelemetryReceiverModule.java | 3 +-
.../provider/IstioTelemetryGRPCHandler.java | 54 ++-
.../provider/IstioTelemetryReceiverProvider.java | 38 +-
.../handler/IstioTelemetryHandlerMainTest.java | 8 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 3 +-
.../oap/server/receiver/jvm/module/JVMModule.java | 8 +-
.../receiver/jvm/provider/JVMModuleProvider.java | 39 +-
.../handler/JVMMetricReportServiceHandler.java | 11 +-
.../jvm/provider/handler/JVMSourceDispatcher.java | 28 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 3 +-
.../server/receiver/mesh/EndpointNameFormater.java | 17 +-
.../receiver/mesh/MeshDataBufferFileCache.java | 41 +-
.../aop/server/receiver/mesh/MeshGRPCHandler.java | 27 +-
.../aop/server/receiver/mesh/MeshModuleConfig.java | 19 +-
.../server/receiver/mesh/MeshReceiverModule.java | 3 +-
.../server/receiver/mesh/MeshReceiverProvider.java | 40 +-
.../mesh/ServiceMeshMetricDataDecorator.java | 23 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 53 ++-
.../receiver/profile/module/ProfileModule.java | 2 -
.../profile/provider/ProfileModuleProvider.java | 17 +-
.../handler/ProfileTaskServiceHandler.java | 3 -
.../skywalking-register-receiver-plugin/pom.xml | 3 +-
.../receiver/register/module/RegisterModule.java | 8 +-
.../register/provider/RegisterModuleProvider.java | 33 +-
.../handler/v6/grpc/RegisterServiceHandler.java | 54 ++-
.../v6/grpc/ServiceInstancePingServiceHandler.java | 24 +-
.../skywalking-sharing-server-plugin/pom.xml | 3 +-
.../sharing/server/CoreRegisterLinker.java | 27 +-
.../server/ReceiverGRPCHandlerRegister.java | 19 +-
.../server/ReceiverJettyHandlerRegister.java | 9 +-
.../sharing/server/SharingServerConfig.java | 6 +-
.../sharing/server/SharingServerModule.java | 14 +-
.../server/SharingServerModuleProvider.java | 38 +-
.../skywalking-so11y-receiver-plugin/pom.xml | 3 +-
.../server/receiver/so11y/So11yReceiverModule.java | 2 -
.../so11y/So11yReceiverModuleProvider.java | 331 ++++++++--------
.../skywalking-trace-receiver-plugin/pom.xml | 3 +-
.../server/receiver/trace/module/TraceModule.java | 6 +-
.../provider/DBLatencyThresholdsAndWatcher.java | 12 +-
.../trace/provider/TraceModuleProvider.java | 43 ++-
.../trace/provider/TraceServiceModuleConfig.java | 50 ++-
.../provider/UninstrumentedGatewaysConfig.java | 11 +-
.../v6/grpc/TraceSegmentReportServiceHandler.java | 23 +-
.../parser/ISegmentParserListenerManager.java | 3 -
.../provider/parser/ISegmentParserService.java | 3 -
.../trace/provider/parser/SegmentParseV2.java | 59 +--
.../parser/SegmentParserListenerManager.java | 3 -
.../provider/parser/SegmentParserServiceImpl.java | 8 +-
.../trace/provider/parser/SegmentSource.java | 3 -
.../parser/decorator/ReferenceDecorator.java | 6 +-
.../provider/parser/decorator/SegmentCoreInfo.java | 6 +-
.../parser/decorator/SegmentDecorator.java | 6 +-
.../provider/parser/decorator/SpanDecorator.java | 6 +-
.../provider/parser/decorator/StandardBuilder.java | 3 -
.../parser/listener/EntrySpanListener.java | 6 +-
.../provider/parser/listener/ExitSpanListener.java | 6 +-
.../parser/listener/FirstSpanListener.java | 6 +-
.../parser/listener/GlobalTraceIdsListener.java | 3 -
.../parser/listener/LocalSpanListener.java | 6 +-
.../provider/parser/listener/SpanListener.java | 3 -
.../parser/listener/SpanListenerFactory.java | 3 -
.../listener/endpoint/MultiScopesSpanListener.java | 50 ++-
.../parser/listener/endpoint/SourceBuilder.java | 93 +++--
.../listener/segment/SegmentSpanListener.java | 24 +-
.../listener/segment/TraceSegmentSampler.java | 10 +-
.../ServiceInstanceMappingSpanListener.java | 25 +-
.../service/ServiceMappingSpanListener.java | 30 +-
.../parser/standardization/IdExchanger.java | 3 -
.../standardization/ReferenceIdExchanger.java | 41 +-
.../standardization/SegmentStandardization.java | 12 +-
.../SegmentStandardizationWorker.java | 22 +-
.../parser/standardization/SpanExchanger.java | 43 ++-
.../listener/segment/TraceSegmentSamplerTest.java | 56 ++-
.../zipkin-receiver-plugin/pom.xml | 3 +-
.../receiver/zipkin/ZipkinReceiverConfig.java | 6 +-
.../receiver/zipkin/ZipkinReceiverModule.java | 7 +-
.../receiver/zipkin/ZipkinReceiverProvider.java | 32 +-
.../zipkin/analysis/ZipkinSkyWalkingTransfer.java | 8 +-
.../zipkin/analysis/ZipkinTraceOSInfoBuilder.java | 3 -
.../zipkin/analysis/cache/CacheFactory.java | 3 -
.../receiver/zipkin/analysis/cache/ISpanCache.java | 3 -
.../analysis/cache/caffeine/CaffeineSpanCache.java | 18 +-
.../receiver/zipkin/analysis/data/ZipkinTrace.java | 8 +-
.../zipkin/analysis/transform/SegmentBuilder.java | 74 ++--
.../transform/Zipkin2SkyWalkingTransfer.java | 7 +-
.../server/receiver/zipkin/handler/SpanEncode.java | 3 -
.../receiver/zipkin/handler/SpanProcessor.java | 10 +-
.../zipkin/handler/SpanV1JettyHandler.java | 16 +-
.../zipkin/handler/SpanV2JettyHandler.java | 19 +-
.../server/receiver/zipkin/trace/SpanForward.java | 24 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 51 ++-
oap-server/server-starter-es7/pom.xml | 3 +-
.../oap/server/starter/OAPServerStartUp.java | 4 -
oap-server/server-starter/pom.xml | 3 +-
.../oap/server/starter/OAPServerStartUp.java | 4 -
oap-server/server-storage-plugin/pom.xml | 3 +-
.../storage-elasticsearch-plugin/pom.xml | 3 +-
.../StorageModuleElasticsearchConfig.java | 78 ++--
.../StorageModuleElasticsearchProvider.java | 39 +-
.../elasticsearch/base/BatchProcessEsDAO.java | 27 +-
.../elasticsearch/base/ColumnTypeEsMapping.java | 6 +-
.../storage/plugin/elasticsearch/base/EsDAO.java | 12 +-
.../elasticsearch/base/HistoryDeleteEsDAO.java | 16 +-
.../elasticsearch/base/MatchCNameBuilder.java | 3 -
.../plugin/elasticsearch/base/MetricsEsDAO.java | 22 +-
.../plugin/elasticsearch/base/NoneStreamEsDAO.java | 5 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 9 +-
.../plugin/elasticsearch/base/RegisterEsDAO.java | 15 +-
.../plugin/elasticsearch/base/StorageEsDAO.java | 19 +-
.../elasticsearch/base/StorageEsInstaller.java | 20 +-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 6 +-
.../cache/EndpointInventoryCacheEsDAO.java | 17 +-
.../cache/NetworkAddressInventoryCacheEsDAO.java | 23 +-
.../cache/ServiceInstanceInventoryCacheDAO.java | 20 +-
.../cache/ServiceInventoryCacheEsDAO.java | 29 +-
.../elasticsearch/lock/RegisterLockDAOImpl.java | 15 +-
.../elasticsearch/lock/RegisterLockIndex.java | 3 -
.../elasticsearch/lock/RegisterLockInstaller.java | 5 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 56 +--
.../elasticsearch/query/AlarmQueryEsDAO.java | 18 +-
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 45 ++-
.../elasticsearch/query/MetadataQueryEsDAO.java | 62 +--
.../elasticsearch/query/MetricsQueryEsDAO.java | 37 +-
.../elasticsearch/query/ProfileTaskLogEsDAO.java | 18 +-
.../elasticsearch/query/ProfileTaskQueryEsDAO.java | 32 +-
.../query/ProfileThreadSnapshotQueryEsDAO.java | 11 +-
.../elasticsearch/query/TopNRecordsQueryEsDAO.java | 18 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 68 ++--
.../elasticsearch/query/TraceQueryEsDAO.java | 67 ++--
.../elasticsearch/ttl/ElasticsearchStorageTTL.java | 14 +-
.../elasticsearch/ttl/EsHourTTLCalculator.java | 6 +-
.../elasticsearch/ttl/EsMinuteTTLCalculator.java | 6 +-
.../elasticsearch/ttl/EsRecordTTLCalculator.java | 5 +-
.../ElasticSearchColumnTypeMappingTestCase.java | 6 +-
.../base/TimeSeriesUtilsTestCase.java | 6 +-
.../storage-elasticsearch7-plugin/pom.xml | 3 +-
.../storage/plugin/elasticsearch7/Es7DAO.java | 3 -
.../StorageModuleElasticsearch7Config.java | 3 -
.../StorageModuleElasticsearch7Provider.java | 35 +-
.../elasticsearch7/base/StorageEs7Installer.java | 6 +-
.../cache/EndpointInventoryCacheEs7DAO.java | 4 -
.../cache/NetworkAddressInventoryCacheEs7DAO.java | 7 +-
.../cache/ServiceInstanceInventoryCacheEs7DAO.java | 4 -
.../cache/ServiceInventoryCacheEs7DAO.java | 7 +-
.../client/ElasticSearch7Client.java | 80 ++--
.../client/ElasticSearch7InsertRequest.java | 4 -
.../client/ElasticSearch7UpdateRequest.java | 4 -
.../plugin/elasticsearch7/dao/MetricsEs7DAO.java | 7 +-
.../plugin/elasticsearch7/dao/StorageEs7DAO.java | 21 +-
.../lock/RegisterLockEs77DAOImpl.java | 4 -
.../lock/RegisterLockEs7Installer.java | 4 -
.../query/AggregationQueryEs7DAO.java | 25 +-
.../elasticsearch7/query/AlarmQueryEs7DAO.java | 12 +-
.../elasticsearch7/query/LogQueryEs7DAO.java | 37 +-
.../elasticsearch7/query/MetadataQueryEs7DAO.java | 12 +-
.../elasticsearch7/query/MetricsQueryEs7DAO.java | 18 +-
.../query/ProfileThreadSnapshotQueryEs7DAO.java | 1 +
.../elasticsearch7/query/TraceQueryEs7DAO.java | 22 +-
.../storage-jaeger-plugin/pom.xml | 3 +-
.../server/storage/plugin/jaeger/JaegerSpan.java | 66 +++-
.../storage/plugin/jaeger/JaegerSpanRecord.java | 119 ++++--
.../plugin/jaeger/JaegerSpanRecordDispatcher.java | 5 +-
.../JaegerStorageModuleElasticsearchProvider.java | 13 +-
.../elasticsearch/JaegerTraceQueryEsDAO.java | 79 ++--
.../storage-jdbc-hikaricp-plugin/pom.xml | 9 +-
.../storage/plugin/jdbc/ArrayParamBuilder.java | 3 -
.../oap/server/storage/plugin/jdbc/SQLBuilder.java | 5 +-
.../server/storage/plugin/jdbc/SQLExecutor.java | 12 +-
.../server/storage/plugin/jdbc/TableMetaInfo.java | 3 -
.../storage/plugin/jdbc/h2/H2StorageConfig.java | 3 -
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 77 +++-
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 29 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 23 +-
.../storage/plugin/jdbc/h2/dao/H2BatchDAO.java | 36 +-
.../jdbc/h2/dao/H2EndpointInventoryCacheDAO.java | 14 +-
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 10 +-
.../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 12 +-
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 29 +-
.../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 21 +-
.../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 46 +--
.../h2/dao/H2NetworkAddressInventoryCacheDAO.java | 28 +-
.../plugin/jdbc/h2/dao/H2NoneStreamDAO.java | 2 -
.../jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java | 14 +-
.../plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java | 27 +-
.../h2/dao/H2ProfileThreadSnapshotQueryDAO.java | 29 +-
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 9 +-
.../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java | 23 +-
.../plugin/jdbc/h2/dao/H2RegisterLockDAO.java | 12 +-
.../jdbc/h2/dao/H2RegisterLockInstaller.java | 18 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 38 +-
.../h2/dao/H2ServiceInstanceInventoryCacheDAO.java | 14 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 29 +-
.../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 19 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 30 +-
.../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 13 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 102 ++---
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 13 +-
.../jdbc/mysql/MySQLAggregationQueryDAO.java | 18 +-
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 31 +-
.../plugin/jdbc/mysql/MySQLLogQueryDAO.java | 10 +-
.../plugin/jdbc/mysql/MySQLStorageConfig.java | 6 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 42 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 55 ++-
.../plugin/jdbc/mysql/MySQLTraceQueryDAO.java | 13 +-
.../plugin/jdbc/ArrayParamBuilderTestCase.java | 17 +-
.../PreventRedistributionMySQLDriverTest.java | 8 +-
.../storage-zipkin-plugin/pom.xml | 3 +-
.../server/storage/plugin/zipkin/ZipkinSpan.java | 66 +++-
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 119 ++++--
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 5 +-
.../ZipkinStorageModuleElasticsearchProvider.java | 13 +-
.../elasticsearch/ZipkinTraceQueryEsDAO.java | 66 +++-
oap-server/server-telemetry/pom.xml | 3 +-
oap-server/server-telemetry/telemetry-api/pom.xml | 3 +-
.../oap/server/telemetry/TelemetryModule.java | 10 +-
.../oap/server/telemetry/api/CounterMetrics.java | 4 -
.../oap/server/telemetry/api/GaugeMetrics.java | 8 -
.../oap/server/telemetry/api/HistogramMetrics.java | 6 +-
.../oap/server/telemetry/api/MetricFamily.java | 11 +-
.../oap/server/telemetry/api/MetricsCollector.java | 2 -
.../oap/server/telemetry/api/MetricsCreator.java | 19 +-
.../oap/server/telemetry/api/MetricsTag.java | 2 +-
.../telemetry/api/TelemetryRelatedContext.java | 5 +-
.../telemetry/none/MetricsCollectorNoop.java | 5 +-
.../server/telemetry/none/MetricsCreatorNoop.java | 35 +-
.../telemetry/none/NoneTelemetryProvider.java | 29 +-
.../server-telemetry/telemetry-prometheus/pom.xml | 3 +-
.../server/telemetry/prometheus/BaseMetrics.java | 15 +-
.../telemetry/prometheus/PrometheusConfig.java | 5 +-
.../prometheus/PrometheusCounterMetrics.java | 20 +-
.../prometheus/PrometheusGaugeMetrics.java | 30 +-
.../prometheus/PrometheusHistogramMetrics.java | 21 +-
.../prometheus/PrometheusMetricsCreator.java | 11 +-
.../prometheus/PrometheusTelemetryProvider.java | 31 +-
.../server-telemetry/telemetry-so11y/pom.xml | 3 +-
.../telemetry/so11y/So11yMetricsCollector.java | 13 +-
.../telemetry/so11y/So11yMetricsCreator.java | 8 +-
.../telemetry/so11y/So11yTelemetryProvider.java | 32 +-
oap-server/server-testing/pom.xml | 3 +-
.../server/testing/module/ModuleDefineTesting.java | 9 +-
.../testing/module/ModuleManagerTesting.java | 16 +-
.../testing/module/ModuleProviderTesting.java | 18 +-
.../testing/module/ModuleManagerTestCase.java | 6 +-
pom.xml | 14 +-
skywalking-ui | 2 +-
test/e2e-mesh/e2e-istio/scripts/compile_build.sh | 2 +-
.../e2e-6.x-agent-7.x-oap-compatibility/pom.xml | 6 +-
.../e2e/sample/client/SampleClientApplication.java | 3 -
.../e2e/sample/client/TestController.java | 3 -
.../apache/skywalking/e2e/sample/client/User.java | 3 -
.../skywalking/e2e/sample/client/UserRepo.java | 3 -
.../skywalking/e2e/SampleVerificationITCase.java | 157 ++++----
.../e2e/sample/client/SampleClientApplication.java | 3 -
.../e2e/sample/client/TestController.java | 3 -
.../apache/skywalking/e2e/sample/client/User.java | 3 -
.../skywalking/e2e/sample/client/UserRepo.java | 3 -
.../skywalking/e2e/SampleVerificationITCase.java | 128 +++---
test/e2e/e2e-agent-reboot/pom.xml | 3 +-
.../e2e/sample/client/SampleClientApplication.java | 3 -
.../e2e/sample/client/TestController.java | 3 -
.../apache/skywalking/e2e/sample/client/User.java | 3 -
.../skywalking/e2e/sample/client/UserRepo.java | 3 -
.../apache/skywalking/e2e/AgentRebootITCase.java | 137 +++----
.../org/apache/skywalking/e2e/AbstractQuery.java | 3 -
.../org/apache/skywalking/e2e/GQLResponse.java | 6 +-
.../apache/skywalking/e2e/SimpleQueryClient.java | 205 +++++-----
.../e2e/assertor/VariableExpressParser.java | 7 +-
.../exception/VariableNotFoundException.java | 3 -
.../e2e/exception/AssertFailedException.java | 6 +-
.../e2e/metrics/AllOfMetricsMatcher.java | 10 +-
.../e2e/metrics/AtLeastOneOfMetricsMatcher.java | 9 +-
.../org/apache/skywalking/e2e/metrics/Metrics.java | 7 +-
.../apache/skywalking/e2e/metrics/MetricsData.java | 3 -
.../skywalking/e2e/metrics/MetricsMatcher.java | 32 +-
.../skywalking/e2e/metrics/MetricsQuery.java | 10 +-
.../skywalking/e2e/metrics/MetricsValue.java | 7 +-
.../e2e/metrics/MetricsValueMatcher.java | 10 +-
.../skywalking/e2e/metrics/MultiMetricsData.java | 6 +-
.../org/apache/skywalking/e2e/service/Service.java | 8 +-
.../skywalking/e2e/service/ServiceMatcher.java | 10 +-
.../skywalking/e2e/service/ServicesData.java | 7 +-
.../skywalking/e2e/service/ServicesMatcher.java | 7 +-
.../skywalking/e2e/service/ServicesQuery.java | 3 -
.../skywalking/e2e/service/endpoint/Endpoint.java | 8 +-
.../e2e/service/endpoint/EndpointMatcher.java | 6 +-
.../e2e/service/endpoint/EndpointQuery.java | 8 +-
.../skywalking/e2e/service/endpoint/Endpoints.java | 7 +-
.../e2e/service/endpoint/EndpointsMatcher.java | 10 +-
.../skywalking/e2e/service/instance/Attribute.java | 8 +-
.../e2e/service/instance/AttributeMatcher.java | 11 +-
.../skywalking/e2e/service/instance/Instance.java | 10 +-
.../e2e/service/instance/InstanceMatcher.java | 12 +-
.../skywalking/e2e/service/instance/Instances.java | 3 -
.../e2e/service/instance/InstancesMatcher.java | 8 +-
.../e2e/service/instance/InstancesQuery.java | 6 +-
.../java/org/apache/skywalking/e2e/topo/Call.java | 10 +-
.../apache/skywalking/e2e/topo/CallMatcher.java | 13 +-
.../java/org/apache/skywalking/e2e/topo/Node.java | 10 +-
.../apache/skywalking/e2e/topo/NodeMatcher.java | 13 +-
.../skywalking/e2e/topo/ServiceInstanceNode.java | 3 -
.../e2e/topo/ServiceInstanceNodeMatcher.java | 3 -
.../e2e/topo/ServiceInstanceTopoData.java | 8 +-
.../e2e/topo/ServiceInstanceTopoMatcher.java | 6 +-
.../e2e/topo/ServiceInstanceTopoQuery.java | 3 -
.../e2e/topo/ServiceInstanceTopoResponse.java | 3 -
.../org/apache/skywalking/e2e/topo/TopoData.java | 8 +-
.../apache/skywalking/e2e/topo/TopoMatcher.java | 11 +-
.../org/apache/skywalking/e2e/topo/TopoQuery.java | 3 -
.../apache/skywalking/e2e/topo/TopoResponse.java | 3 -
.../java/org/apache/skywalking/e2e/trace/Span.java | 6 +-
.../apache/skywalking/e2e/trace/SpanMatcher.java | 8 +-
.../java/org/apache/skywalking/e2e/trace/Tag.java | 3 -
.../org/apache/skywalking/e2e/trace/Trace.java | 12 +-
.../apache/skywalking/e2e/trace/TraceMatcher.java | 15 +-
.../apache/skywalking/e2e/trace/TracesData.java | 3 -
.../apache/skywalking/e2e/trace/TracesMatcher.java | 3 -
.../apache/skywalking/e2e/trace/TracesQuery.java | 3 -
.../e2e/verification/AbstractMatcher.java | 3 -
.../org/apache/skywalking/e2e/TestMatcher.java | 31 +-
.../apache/skywalking/e2e/TestMetricsMatcher.java | 3 -
.../e2e/TestServiceInstanceTopoMatcher.java | 59 ++-
.../org/apache/skywalking/e2e/TestTopoMatcher.java | 34 +-
.../e2e/cluster/Service1Application.java | 3 -
.../skywalking/e2e/cluster/TestController.java | 7 +-
.../org/apache/skywalking/e2e/cluster/User.java | 3 -
.../apache/skywalking/e2e/GatewayApplication.java | 3 -
.../e2e/cluster/Service0Application.java | 3 -
.../skywalking/e2e/cluster/TestController.java | 3 -
.../org/apache/skywalking/e2e/cluster/User.java | 3 -
.../apache/skywalking/e2e/cluster/UserRepo.java | 3 -
.../skywalking/e2e/ClusterVerificationITCase.java | 165 ++++----
.../e2e/cluster/Service1Application.java | 3 -
.../skywalking/e2e/cluster/TestController.java | 12 +-
.../org/apache/skywalking/e2e/cluster/User.java | 3 -
.../e2e/cluster/Service0Application.java | 3 -
.../skywalking/e2e/cluster/TestController.java | 3 -
.../org/apache/skywalking/e2e/cluster/User.java | 3 -
.../apache/skywalking/e2e/cluster/UserRepo.java | 3 -
.../skywalking/e2e/ClusterVerificationITCase.java | 165 ++++----
test/e2e/e2e-mysql/pom.xml | 13 +-
.../e2e/sample/client/SampleClientApplication.java | 3 -
.../e2e/sample/client/TestController.java | 3 -
.../apache/skywalking/e2e/sample/client/User.java | 3 -
.../skywalking/e2e/sample/client/UserRepo.java | 3 -
.../skywalking/e2e/SampleVerificationITCase.java | 157 ++++----
.../apache/skywalking/e2e/profile/CreateUser.java | 3 -
.../skywalking/e2e/profile/ProfileApplication.java | 3 -
.../skywalking/e2e/profile/TestController.java | 10 +-
.../org/apache/skywalking/e2e/profile/User.java | 3 -
.../apache/skywalking/e2e/profile/UserRepo.java | 3 -
.../e2e-profile/e2e-profile-test-runner/pom.xml | 46 ++-
.../src/docker/rc.d/rc0-prepare.sh | 3 -
.../skywalking/e2e/profile/ProfileClient.java | 94 ++---
.../creation/ProfileTaskCreationRequest.java | 8 +-
.../creation/ProfileTaskCreationResult.java | 6 +-
.../creation/ProfileTaskCreationResultMatcher.java | 3 -
.../creation/ProfileTaskCreationResultWrapper.java | 2 -
.../skywalking/e2e/profile/query/ProfileTask.java | 6 +-
.../e2e/profile/query/ProfileTaskLog.java | 3 -
.../e2e/profile/query/ProfileTaskLogMatcher.java | 3 -
.../e2e/profile/query/ProfileTaskMatcher.java | 6 +-
.../e2e/profile/query/ProfileTaskQuery.java | 2 -
.../skywalking/e2e/profile/query/ProfileTasks.java | 7 +-
.../e2e/profile/query/ProfilesTasksMatcher.java | 8 +-
.../skywalking/e2e/profile/query/Traces.java | 3 +-
...ProfileVerificationITCase.profileAnayzation.yml | 2 +-
.../skywalking/e2e/ProfileVerificationITCase.java | 119 +++---
.../e2e/sample/client/SampleClientApplication.java | 3 -
.../e2e/sample/client/TestController.java | 3 -
.../apache/skywalking/e2e/sample/client/User.java | 3 -
.../skywalking/e2e/sample/client/UserRepo.java | 3 -
.../skywalking/e2e/SampleVerificationITCase.java | 157 ++++----
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml | 4 +-
.../apache/skywalking/e2e/StorageTTLITCase.java | 153 +++-----
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../src/main/assembly/assembly.xml | 6 +-
.../src/main/java/Application.java | 1 -
.../src/main/java/controller/CaseController.java | 6 +-
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../skywalking/plugin/test/mockcollector/Main.java | 49 ++-
.../test/mockcollector/entity/RegistryItem.java | 1 +
.../entity/RegistryItemSerializer.java | 1 +
.../plugin/test/mockcollector/entity/Segment.java | 4 +-
.../test/mockcollector/entity/SegmentItem.java | 1 +
.../test/mockcollector/entity/SegmentItems.java | 1 +
.../entity/SegmentItemsSerializer.java | 1 +
.../plugin/test/mockcollector/entity/Span.java | 11 +-
.../test/mockcollector/entity/ValidateData.java | 1 +
.../entity/ValidateDataSerializer.java | 7 +-
.../service/ClearReceiveDataService.java | 1 +
.../service/GrpcAddressHttpService.java | 1 +
.../service/MockCLRMetricReportService.java | 4 +-
.../service/MockInstanceDiscoveryService.java | 23 +-
.../service/MockInstancePingService.java | 4 +-
.../service/MockJVMMetricReportService.java | 4 +-
.../mockcollector/service/MockRegisterService.java | 42 +-
.../service/MockTraceSegmentService.java | 48 ++-
.../mockcollector/service/ReceiveDataService.java | 1 +
.../test/mockcollector/service/Sequences.java | 1 +
.../test/mockcollector/util/ConfigReader.java | 5 +-
.../src/main/resources/config.properties | 1 -
.../mock-collector/src/main/resources/log4j2.xml | 4 +-
test/plugin/runner-helper/pom.xml | 3 +-
.../test/helper/AbstractRunningGenerator.java | 6 +-
.../plugin/test/helper/ConfigurationImpl.java | 65 ++--
.../test/helper/DockerComposeRunningGenerator.java | 24 +-
.../helper/DockerContainerRunningGenerator.java | 6 +-
.../plugin/test/helper/IConfiguration.java | 1 +
.../apache/skywalking/plugin/test/helper/Main.java | 1 +
.../skywalking/plugin/test/helper/RunningType.java | 1 +
.../helper/ScenarioRunningScriptGenerator.java | 1 +
.../exception/ConfigureFileNotFoundException.java | 1 +
.../exception/GenerateAdditionFileException.java | 1 +
.../helper/exception/GenerateFailedException.java | 1 +
.../plugin/test/helper/util/StringUtils.java | 1 +
.../plugin/test/helper/vo/CaseConfiguration.java | 1 +
.../plugin/test/helper/vo/DependencyComponent.java | 1 +
.../plugin/test/helper/vo/DockerService.java | 1 +
.../runner-helper/src/main/resources/log4j2.xml | 8 +-
.../DockerComposeV2RunningGeneratorTest.java | 8 +-
.../DockerContainerRunningGeneratorTest.java | 1 +
.../test/helper/vo/CaseIConfigurationTest.java | 1 +
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/activemq/Application.java | 1 -
.../activemq/controller/CaseController.java | 15 +-
.../src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/toolkit/trace/ActiveSpan.java | 2 -
.../apm/toolkit/trace/CallableWrapper.java | 4 +-
.../apm/toolkit/trace/RunnableWrapper.java | 5 +-
.../apm/toolkit/trace/SupplierWrapper.java | 4 +-
.../apache/skywalking/apm/toolkit/trace/Tag.java | 10 +-
.../apache/skywalking/apm/toolkit/trace/Tags.java | 4 +-
.../apache/skywalking/apm/toolkit/trace/Trace.java | 3 -
.../skywalking/apm/toolkit/trace/TraceContext.java | 8 +-
.../apm/toolkit/trace/TraceCrossThread.java | 4 +-
.../toolkit/controller/TestController.java | 5 -
.../testcase/toolkit/controller/TestService.java | 18 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/armeria/Application.java | 3 -
.../apm/testcase/armeria/ClientApplication.java | 6 +-
.../apm/testcase/armeria/ServerApplication.java | 16 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/armeria/Application.java | 3 -
.../apm/testcase/armeria/ClientApplication.java | 6 +-
.../apm/testcase/armeria/ServerApplication.java | 16 +-
.../skywalking/apm/testcase/avro/Application.java | 1 -
.../avro-dist/src/main/assembly/assembly.xml | 6 +-
.../scenarios/avro-scenario/avro-server/pom.xml | 3 +-
.../skywalking/apm/testcase/avro/Application.java | 4 +-
test/plugin/scenarios/canal-scenario/pom.xml | 2 +-
.../canal-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/canal/Application.java | 1 -
.../testcase/canal/controller/CaseController.java | 8 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/cassandra/Application.java | 3 -
.../cassandra/controller/CaseController.java | 3 +-
.../config/customize_enhance.xml | 7 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/customize/Application.java | 1 -
.../customize/controller/CustomizeController.java | 25 +-
.../apm/testcase/customize/model/Model0.java | 4 -
.../apm/testcase/customize/model/Model1.java | 4 -
.../testcase/customize/service/TestService1.java | 7 +-
.../testcase/customize/service/TestService2.java | 4 -
.../src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/dubbo/Application.java | 6 +-
.../testcase/dubbo/controller/CaseController.java | 3 -
.../apm/testcase/dubbo/services/GreetService.java | 3 -
.../dubbo/services/impl/GreetServiceImpl.java | 6 +-
.../src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/dubbo/Application.java | 6 +-
.../testcase/dubbo/controller/CaseController.java | 3 -
.../apm/testcase/dubbo/services/GreetService.java | 3 -
.../dubbo/services/impl/GreetServiceImpl.java | 6 +-
.../apm/testcase/ehcache/v2/CaseServlet.java | 13 +-
.../testcase/ehcache/v2/HealthCheckServlet.java | 4 +-
.../src/main/resources/cache.xml | 15 +-
.../src/main/webapp/WEB-INF/web.xml | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../elasticsearch/controller/CaseController.java | 33 +-
.../src/main/assembly/assembly.xml | 6 +-
.../elasticsearch/config/ElasticsearchConfig.java | 4 +-
.../elasticsearch/controller/CaseController.java | 14 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/elasticsearch/Application.java | 3 -
.../elasticsearch/config/ElasticsearchConfig.java | 4 +-
.../elasticsearch/controller/CaseController.java | 15 +-
.../feign-scenario/src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/feign/controller/RestRequest.java | 8 +-
.../gateway-dist/src/main/assembly/assembly.xml | 6 +-
.../sc/gateway/projectA/ApiKeyResolver.java | 6 +-
.../testcase/sc/gateway/projectA/Test1Filter.java | 3 +-
.../testcase/sc/gateway/projectA/Test2Filter.java | 2 +-
.../sc/gateway/projectA/TestFilterConfig.java | 4 +-
.../src/main/resources/application.properties | 1 -
.../grpc-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/grpc/Application.java | 1 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 21 +-
.../testcase/grpc/controller/CaseController.java | 14 +-
.../grpc/provider/ProviderConfiguration.java | 11 +-
.../provider/interceptor/ProviderInterceptor.java | 23 +-
.../service/GreeterBlockingErrorServiceImpl.java | 2 +-
.../service/GreeterBlockingServiceImpl.java | 3 +-
.../grpc/provider/service/GreeterServiceImpl.java | 5 +-
.../gson-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/gson/Application.java | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../testcase/httpasyncclient/BackController.java | 1 +
.../testcase/httpasyncclient/FrontController.java | 1 +
.../HttpasyncclientApplication.java | 1 +
.../apm/testcase/httpclient/CaseServlet.java | 8 +-
.../testcase/httpclient/HealthCheckServlet.java | 7 +-
.../httpclient/ServletForContextPropagate.java | 7 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/hystrix/Application.java | 1 -
.../hystrix/controller/CaseController.java | 15 +-
.../testcase/hystrix/controller/TestACommand.java | 7 +-
.../testcase/hystrix/controller/TestBCommand.java | 12 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/jdkhttp/Application.java | 1 -
.../jdkhttp/controller/CaseController.java | 9 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/jdk/threading/Application.java | 4 -
.../jedis-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/jedis/Application.java | 1 -
.../jedis/controller/RedisCommandExecutor.java | 2 +-
.../jetty-dist/src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/jettyclient/Application.java | 1 +
.../jettyclient/controller/CaseController.java | 3 +-
.../src/main/resources/application.properties | 1 -
.../jetty-scenario/jettyserver-scenario/pom.xml | 3 +-
.../apm/testcase/jettyserver/Application.java | 4 +-
.../testcase/jettyserver/servlet/CaseServlet.java | 3 +-
.../kafka-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/kafka/Application.java | 3 -
.../testcase/kafka/controller/CaseController.java | 18 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/lettuce/Application.java | 1 -
.../lettuce/controller/LettuceController.java | 7 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../mongodb/controller/CaseController.java | 2 +-
.../src/main/resources/application.properties | 8 +-
.../mysql-scenario/src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/mysql/Application.java | 1 -
.../testcase/mysql/controller/CaseController.java | 4 +-
.../src/main/resources/jdbc.properties | 1 -
.../apm/testcase/netty/socketio/CaseServlet.java | 9 +-
.../netty/socketio/HealthCheckServlet.java | 4 +-
.../testcase/netty/socketio/SocketIOStarter.java | 4 -
.../testcase/okhttp/controller/CaseController.java | 12 +-
.../src/main/resources/application.properties | 1 -
.../oracle-scenario/src/main/assembly/assembly.xml | 6 +-
.../testcase/oracle/controller/CaseController.java | 6 +-
.../scenarios/play-scenario/conf/logback.xml | 28 +-
.../play-scenario/project/build.properties | 1 -
.../play-scenario/src/main/assembly/assembly.xml | 6 +-
.../src/main/assembly/assembly.xml | 6 +-
.../postgresql/controller/CaseController.java | 1 +
.../testcase/postgresql/controller/ConstSql.java | 5 +-
.../postgresql/controller/PostgresqlConfig.java | 1 +
.../postgresql/controller/SQLExecutor.java | 4 +-
.../src/main/assembly/assembly.xml | 6 +-
.../testcase/postgresql/controller/ConstSql.java | 5 +-
.../postgresql/controller/PostgresqlConfig.java | 1 +
.../postgresql/controller/SQLExecutor.java | 4 +-
.../pulsar-scenario/src/main/assembly/assembly.xml | 6 +-
.../testcase/pulsar/controller/CaseController.java | 39 +-
.../src/main/resources/application.properties | 1 -
.../apm/testcase/rabbitmq/Application.java | 2 -
.../rabbitmq/controller/CaseController.java | 53 ++-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/redisson/Application.java | 3 -
.../redisson/controller/CaseController.java | 8 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../provider/CodeFirstJaxrsHelloImpl.java | 7 +-
.../provider/CodeFirstSpringmvcHelloImpl.java | 4 +-
.../apm/testcase/servicecomb/schema/Hello.java | 1 -
.../main/resources/META-INF/spring/pojo.bean.xml | 2 +-
.../main/resources/config/log4j.demo.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../provider/CodeFirstJaxrsHelloImpl.java | 8 +-
.../provider/CodeFirstSpringmvcHelloImpl.java | 4 +-
.../apm/testcase/servicecomb/schema/Hello.java | 1 -
.../main/resources/META-INF/spring/pojo.bean.xml | 2 +-
.../main/resources/config/log4j.demo.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/shardingsphere/Application.java | 9 +-
.../shardingsphere/controller/CaseController.java | 9 +-
.../shardingsphere/service/api/entity/Order.java | 22 +-
.../service/api/entity/OrderItem.java | 28 +-
.../service/api/repository/CommonRepository.java | 14 +-
.../service/api/service/CommonService.java | 10 +-
.../service/api/service/CommonServiceImpl.java | 30 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 20 +-
.../jdbc/JDBCOrderItemRepositoryImpl.java | 49 +--
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 46 +--
.../service/repository/service/RawPojoService.java | 17 +-
.../PreciseModuloShardingDatabaseAlgorithm.java | 6 +-
.../PreciseModuloShardingTableAlgorithm.java | 3 +-
.../RangeModuloShardingDatabaseAlgorithm.java | 6 +-
.../RangeModuloShardingTableAlgorithm.java | 6 +-
.../service/utility/config/DataSourceUtil.java | 12 +-
.../utility/config/ExampleConfiguration.java | 6 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/shardingsphere/Application.java | 11 +-
.../shardingsphere/controller/CaseController.java | 5 +-
.../shardingsphere/service/api/entity/Order.java | 22 +-
.../service/api/entity/OrderItem.java | 28 +-
.../service/api/repository/CommonRepository.java | 14 +-
.../service/api/service/CommonService.java | 10 +-
.../service/api/service/CommonServiceImpl.java | 30 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 24 +-
.../jdbc/JDBCOrderItemRepositoryImpl.java | 49 +--
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 46 +--
.../service/repository/service/RawPojoService.java | 17 +-
.../PreciseModuloShardingDatabaseAlgorithm.java | 8 +-
.../PreciseModuloShardingTableAlgorithm.java | 5 +-
.../RangeModuloShardingDatabaseAlgorithm.java | 10 +-
.../RangeModuloShardingTableAlgorithm.java | 10 +-
.../service/utility/config/DataSourceUtil.java | 12 +-
.../utility/config/ExampleConfiguration.java | 6 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/shardingsphere/Application.java | 11 +-
.../shardingsphere/controller/CaseController.java | 5 +-
.../shardingsphere/service/api/entity/Order.java | 22 +-
.../service/api/entity/OrderItem.java | 28 +-
.../service/api/repository/CommonRepository.java | 14 +-
.../service/api/service/CommonService.java | 10 +-
.../service/api/service/CommonServiceImpl.java | 30 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 24 +-
.../jdbc/JDBCOrderItemRepositoryImpl.java | 49 +--
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 46 +--
.../service/repository/service/RawPojoService.java | 17 +-
.../PreciseModuloShardingDatabaseAlgorithm.java | 8 +-
.../PreciseModuloShardingTableAlgorithm.java | 5 +-
.../RangeModuloShardingDatabaseAlgorithm.java | 10 +-
.../RangeModuloShardingTableAlgorithm.java | 10 +-
.../service/utility/config/DataSourceUtil.java | 12 +-
.../utility/config/ExampleConfiguration.java | 6 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/sofarpc/SofaRpcApplication.java | 24 +-
.../sofarpc/controller/CaseController.java | 3 -
.../src/main/assembly/assembly.xml | 6 +-
.../skywalking/apm/testcase/solrj/Application.java | 2 -
.../testcase/solrj/controller/CaseController.java | 13 +-
.../apm/testcase/spring3/CaseController.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 4 +-
.../apm/testcase/restapi/RestCaseController.java | 21 +-
.../resttemplate/RestTemplateController.java | 5 +-
.../testcase/spring3/service/TestServiceBean.java | 4 +-
.../apm/testcase/restapi/RestCaseController.java | 21 +-
.../resttemplate/RestTemplateController.java | 6 +-
.../testcase/spring3/service/TestServiceBean.java | 4 +-
.../testcase/implinterface/TestCaseController.java | 4 +-
.../testcase/implinterface/TestCaseInterface.java | 4 +-
.../apm/testcase/restapi/RestCaseController.java | 9 +-
.../resttemplate/RestTemplateController.java | 5 +-
.../testcase/spring3/service/TestServiceBean.java | 4 +-
.../apm/testcase/spring/async/AsyncBean.java | 6 +-
.../apm/testcase/spring/async/AsyncConfig.java | 3 -
.../apm/testcase/spring/async/AsyncServlet.java | 7 +-
.../apm/testcase/spring/async/CaseServlet.java | 14 +-
.../testcase/spring/async/HealthCheckServlet.java | 9 +-
.../apm/testcase/spring/async/HttpBean.java | 21 +-
.../src/main/assembly/assembly.xml | 6 +-
.../testcase/spring/transaction/Application.java | 4 +-
.../spring/transaction/config/JdbcConfig.java | 8 +-
.../transaction/config/TransactionConfig.java | 9 +-
.../transaction/controller/CaseController.java | 12 +-
.../testcase/spring/transaction/dao/DemoDao.java | 5 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java | 4 +-
.../spring/transaction/service/DemoService.java | 5 +-
.../transaction/service/impl/DemoServiceImpl.java | 4 +-
.../src/main/resources/application.properties | 1 -
.../src/main/assembly/assembly.xml | 6 +-
.../amp/testcase/undertow/Application.java | 35 +-
.../webflux-dist/src/main/assembly/assembly.xml | 6 +-
.../projectA/controller/TestController.java | 5 +-
.../sc/webflux/projectA/utils/HttpUtils.java | 3 +-
.../sc/webflux/projectB/config/CustomFilter.java | 5 +-
.../projectB/route/RoutingConfiguration.java | 4 +-
.../sc/webflux/projectB/route/TestHandler.java | 4 +-
.../src/main/assembly/assembly.xml | 6 +-
.../apm/testcase/zookeeper/Application.java | 1 -
.../testcase/zookeeper/controller/Zookeeper.java | 4 +-
.../zookeeper/controller/ZookeeperController.java | 7 +-
.../src/main/resources/application.properties | 1 -
.../skywalking/plugin/test/agent/tool/Main.java | 9 +-
.../tool/validator/assertor/ApplicationAssert.java | 8 +-
.../agent/tool/validator/assertor/DataAssert.java | 1 +
.../tool/validator/assertor/ExpressParser.java | 10 +-
.../tool/validator/assertor/InstanceAssert.java | 13 +-
.../validator/assertor/OperationNameAssert.java | 10 +-
.../assertor/ParentSegmentIdExpressParser.java | 5 +-
.../validator/assertor/RegistryItemsAssert.java | 1 +
.../tool/validator/assertor/SegmentAssert.java | 14 +-
.../validator/assertor/SegmentItemsAssert.java | 4 +-
.../tool/validator/assertor/SegmentRefAssert.java | 25 +-
.../assertor/element/ElementAssertor.java | 1 +
.../validator/assertor/element/EqualsAssertor.java | 4 +-
.../assertor/element/GreatThanAssertor.java | 6 +-
.../assertor/element/GreetEqualAssertor.java | 3 +-
.../validator/assertor/element/NoopAssertor.java | 4 +-
.../assertor/element/NotEqualsAssertor.java | 4 +-
.../assertor/element/NotNullAssertor.java | 4 +-
.../validator/assertor/element/NullAssertor.java | 4 +-
.../ActualRegistryOperationNameEmptyException.java | 7 +-
.../exception/ActualSegmentItemEmptyException.java | 3 +-
.../ActualSegmentRefIsEmptyException.java | 3 +-
.../exception/LogEventKeyNotEqualsException.java | 3 +-
.../exception/LogEventSizeNotEqualsException.java | 3 +-
.../exception/LogEventValueNotEqualsException.java | 6 +-
.../exception/LogSizeNotEqualsException.java | 3 +-
.../exception/ParentSegmentNotFoundException.java | 3 +-
.../exception/RefSizeNotEqualsException.java | 3 +-
.../RegistryApplicationNotFoundException.java | 6 +-
.../RegistryApplicationSizeNotEqualsException.java | 7 +-
...stryInstanceOfApplicationNotFoundException.java | 7 +-
.../RegistryInstanceSizeNotEqualsException.java | 7 +-
.../RegistryOperationNameNotFoundException.java | 6 +-
...erationNamesOfApplicationNotFoundException.java | 7 +-
.../exception/SegmentItemNotFoundException.java | 3 +-
.../exception/SegmentNotFoundException.java | 14 +-
.../exception/SegmentRefAssertFailedException.java | 3 +-
.../exception/SegmentRefNotFoundException.java | 11 +-
.../SegmentRefSizeNotEqualsException.java | 3 +-
.../exception/SegmentSizeNotEqualsException.java | 8 +-
.../exception/SpanSizeNotEqualsException.java | 3 +-
.../exception/TagSizeNotEqualsException.java | 3 +-
.../exception/TagValueNotEqualsException.java | 6 +-
.../exception/ValueAssertFailedException.java | 3 +-
.../test/agent/tool/validator/entity/Data.java | 3 +-
.../agent/tool/validator/entity/DataForRead.java | 1 +
.../agent/tool/validator/entity/KeyValuePair.java | 4 +-
.../test/agent/tool/validator/entity/LogEvent.java | 4 +-
.../tool/validator/entity/RegistryApplication.java | 4 +-
.../tool/validator/entity/RegistryInstance.java | 7 +-
.../agent/tool/validator/entity/RegistryItems.java | 1 +
.../validator/entity/RegistryItemsForRead.java | 4 +-
.../validator/entity/RegistryOperationName.java | 7 +-
.../test/agent/tool/validator/entity/Segment.java | 1 +
.../tool/validator/entity/SegmentForRead.java | 117 ++++--
.../agent/tool/validator/entity/SegmentItem.java | 4 +-
.../tool/validator/entity/SegmentItemForRead.java | 4 +-
.../agent/tool/validator/entity/SegmentRef.java | 4 +-
.../test/agent/tool/validator/entity/Span.java | 1 +
.../validator/exception/AssertFailedException.java | 5 +-
.../plugin/validator/src/main/resources/log4j2.xml | 8 +-
.../tool/validator/assertor/DataAssertTest.java | 3 +-
2712 files changed, 19807 insertions(+), 19941 deletions(-)
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java