You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/02/11 09:11:00 UTC
[skywalking] branch master updated: Set up more strict code styles
and fix existing issues (#4337)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 5b255ba Set up more strict code styles and fix existing issues (#4337)
5b255ba is described below
commit 5b255ba3e3b50e0e0196b28cdca21dcd5c9c3da2
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Feb 11 17:10:49 2020 +0800
Set up more strict code styles and fix existing issues (#4337)
Motivation:
Review code styles with some bots automatically.
Modifications:
Set up ReviewDog in GitHub Action to review code style.
Add more check rules to checkstyle plugin.
Result:
Obvious code styles can be reviewed and commented automatically.
---
.../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 | 101 +++--
.../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 | 17 +-
.../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 | 80 ++--
.../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 +-
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 +++---
test/e2e/e2e-protocol/src/main/proto | 2 +-
.../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, 19839 insertions(+), 19957 deletions(-)
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
index 984bead..5fe6e98 100644
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
+++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
@@ -16,17 +16,15 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
import org.apache.log4j.helpers.PatternConverter;
import org.apache.log4j.spi.LoggingEvent;
/**
- * Default implementation outputs "TID: N/A".
- * But, if in sky-walking agent active mode, output will become the real ids.
+ * Default implementation outputs "TID: N/A". But, if in sky-walking agent active mode, output will become the real
+ * ids.
* <p>
- * Created by wusheng on 2016/12/7.
*/
public class TraceIdPatternConverter extends PatternConverter {
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
index 54ab282..172d2a4 100644
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
+++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
import org.apache.log4j.PatternLayout;
@@ -25,8 +24,6 @@ import org.apache.log4j.helpers.PatternParser;
/**
* The log4j extend pattern. By using this pattern, if sky-walking agent is also active, {@link
* PatternParser#finalizeConverter(char)} method will be override dynamic. <p>
- *
- * @author wusheng
*/
public class TraceIdPatternLayout extends PatternLayout {
@Override
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
index a8ea3a0..173cb52 100644
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
+++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.log4j.v1.x;
import org.apache.log4j.helpers.PatternParser;
@@ -24,7 +23,6 @@ import org.apache.log4j.helpers.PatternParser;
/**
* Base on '%T', use {@link TraceIdPatternConverter} to convert the '%t' to traceId.
* <p>
- * Created by wusheng on 2016/12/7.
*/
public class TraceIdPatternParser extends PatternParser {
public TraceIdPatternParser(String pattern) {
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
index b1bf6f3..bc3d017 100644
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
+++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
-/**
- * Created by wusheng on 2016/12/11.
- */
public class Log4j2OutputAppender {
/**
- * As default, append "TID: N/A" to the output message,
- * if sky-walking agent in active mode, append the real traceId in the recent Context, if existed, or empty String.
+ * As default, append "TID: N/A" to the output message, if sky-walking agent in active mode, append the real traceId
+ * in the recent Context, if existed, or empty String.
*
* @param toAppendTo origin output message.
*/
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
index 3bf772a..f61c2c2 100644
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
+++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.log4j.v2.x;
import org.apache.logging.log4j.core.LogEvent;
@@ -25,12 +24,9 @@ import org.apache.logging.log4j.core.pattern.ConverterKeys;
import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
/**
- * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}.
- * It convert the pattern key: traceId.
- * Use '%traceId' in log4j2's config.
- * '%traceId' will output as TID:xxxx
+ * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}. It convert the pattern key: traceId.
+ * Use '%traceId' in log4j2's config. '%traceId' will output as TID:xxxx
* <p>
- * Created by wusheng on 2016/12/7.
*/
@Plugin(name = "TraceIdConverter", category = "Converter")
@ConverterKeys({"traceId"})
@@ -39,7 +35,7 @@ public class TraceIdConverter extends LogEventPatternConverter {
/**
* Constructs an instance of LoggingEventPatternConverter.
*
- * @param name name of converter.
+ * @param name name of converter.
* @param style CSS style for output.
*/
protected TraceIdConverter(String name, String style) {
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
index 6a1cb18..bde970e 100644
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
+++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
@@ -16,19 +16,15 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.logback.v1.x;
import ch.qos.logback.classic.pattern.ClassicConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
-/**
- * Created by wusheng on 2016/12/7.
- */
public class LogbackPatternConverter extends ClassicConverter {
/**
- * As default, return "TID: N/A" to the output message,
- * if sky-walking agent in active mode, return the real traceId in the recent Context, if existed.
+ * As default, return "TID: N/A" to the output message, if sky-walking agent in active mode, return the real traceId
+ * in the recent Context, if existed.
*
* @param iLoggingEvent the event
* @return the traceId: N/A, empty String, or the real traceId.
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
index 3e991fe..b350909 100644
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
+++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
@@ -16,17 +16,14 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.logback.v1.x;
import ch.qos.logback.classic.PatternLayout;
/**
- * Based on the logback-compoenent convert register mechanism,
- * register {@link LogbackPatternConverter} as a new convert, match to "tid".
- * You can use "%tid" in logback config file, "Pattern" section.
+ * Based on the logback-compoenent convert register mechanism, register {@link LogbackPatternConverter} as a new
+ * convert, match to "tid". You can use "%tid" in logback config file, "Pattern" section.
* <p>
- * Created by wusheng on 2016/12/7.
*/
public class TraceIdPatternLogbackLayout extends PatternLayout {
static {
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java
index 3469edd..b5f2571 100644
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java
+++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java
@@ -27,9 +27,6 @@ import net.logstash.logback.composite.FieldNamesAware;
import net.logstash.logback.composite.JsonWritingUtils;
import net.logstash.logback.fieldnames.LogstashFieldNames;
-/**
- * @author wuxingye
- */
public class TraceIdJsonProvider extends AbstractFieldJsonProvider<ILoggingEvent> implements FieldNamesAware<LogstashFieldNames> {
public static final String TRACING_ID = "TID";
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
index c54541d..b45921e 100644
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
+++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
@@ -16,20 +16,17 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc;
import ch.qos.logback.classic.pattern.MDCConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.util.OptionHelper;
-/**
- * @author zhangkewei
- */
public class LogbackMDCPatternConverter extends MDCConverter {
- private static final String CONVERT_KEY = "tid";
+ private static final String CONVERT_KEY = "tid";
private boolean convert4TID = false;
+
@Override
public void start() {
super.start();
@@ -38,6 +35,7 @@ public class LogbackMDCPatternConverter extends MDCConverter {
convert4TID = true;
}
}
+
@Override
public String convert(ILoggingEvent iLoggingEvent) {
return convert4TID ? convertTID(iLoggingEvent) : super.convert(iLoggingEvent);
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
index c970abb..737a05b 100644
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
+++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
@@ -16,14 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc;
import ch.qos.logback.classic.PatternLayout;
/**
* Override "X",SuperClass run before Subclass.
- * @author zhangkewei
*/
public class TraceIdMDCPatternLogbackLayout extends PatternLayout {
static {
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
index c48da9f..401315f 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.SpanContext;
@@ -25,9 +24,6 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
-/**
- * Created by wusheng on 2016/12/21.
- */
public class ByteBufferContext implements SpanContext {
static final Charset CHARSET = Charset.forName("UTF-8");
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
index 884d8ef..f030807 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import java.lang.annotation.ElementType;
@@ -25,12 +24,13 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * The <code>NeedSnifferActivation</code> annotation is flag for reader and maintainers,
- * which represents this method should be activated/intercepted in sniffer.
- *
- * @author wusheng
+ * The <code>NeedSnifferActivation</code> annotation is flag for reader and maintainers, which represents this method
+ * should be activated/intercepted in sniffer.
*/
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Target({
+ ElementType.METHOD,
+ ElementType.CONSTRUCTOR
+})
@Retention(RetentionPolicy.SOURCE)
public @interface NeedSnifferActivation {
String value() default "What should interceptor do?";
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
index bb5ac6b..fc59c8f 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.ActiveSpan;
@@ -24,10 +23,8 @@ import io.opentracing.SpanContext;
import java.util.Map;
/**
- * The <code>SkywalkingActiveSpan</code> is an extension of {@link SkywalkingSpan},
- * but because of Java inheritance restrict, only can do with a facade mode.
- *
- * @author wusheng
+ * The <code>SkywalkingActiveSpan</code> is an extension of {@link SkywalkingSpan}, but because of Java inheritance
+ * restrict, only can do with a facade mode.
*/
public class SkywalkingActiveSpan implements ActiveSpan {
private SkywalkingSpan span;
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
index 7f76a14..39ff824 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.SpanContext;
@@ -25,8 +24,6 @@ import java.util.Map;
/**
* Skywalking tracer context based on {@link ThreadLocal} auto mechanism.
- *
- * @author wusheng
*/
public class SkywalkingContext implements SpanContext {
public static final SkywalkingContext INSTANCE = new SkywalkingContext();
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
index 37fdcaf..9f8ef0d 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
@@ -16,22 +16,16 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.ActiveSpan;
-/**
- * @author wusheng
- */
public class SkywalkingContinuation implements ActiveSpan.Continuation {
- @NeedSnifferActivation("1. ContextManager#capture" +
- "2. set ContextSnapshot to the dynamic field")
+ @NeedSnifferActivation("1. ContextManager#capture" + "2. set ContextSnapshot to the dynamic field")
public SkywalkingContinuation() {
}
- @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" +
- "2. ContextManager#continued")
+ @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" + "2. ContextManager#continued")
@Override
public ActiveSpan activate() {
SkywalkingSpanBuilder builder = new SkywalkingSpanBuilder("Thread/" + Thread.currentThread().getName());
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
index 61f9dd5..c6d833b 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.Span;
@@ -24,23 +23,15 @@ import io.opentracing.SpanContext;
import java.util.HashMap;
import java.util.Map;
-/**
- * @author wusheng
- */
public class SkywalkingSpan implements Span {
- @NeedSnifferActivation(
- "1.ContextManager#createSpan (Entry,Exit,Local based on builder)." +
- "2.set the span reference to the dynamic field of enhanced SkywalkingSpan") SkywalkingSpan(
- SkywalkingSpanBuilder builder) {
+ @NeedSnifferActivation("1.ContextManager#createSpan (Entry,Exit,Local based on builder)." + "2.set the span reference to the dynamic field of enhanced SkywalkingSpan")
+ SkywalkingSpan(SkywalkingSpanBuilder builder) {
}
/**
* Create a shell span for {@link SkywalkingTracer#activeSpan()}
- *
- * @param tracer
*/
- @NeedSnifferActivation(
- "1. set the span reference to the dynamic field of enhanced SkywalkingSpan")
+ @NeedSnifferActivation("1. set the span reference to the dynamic field of enhanced SkywalkingSpan")
public SkywalkingSpan(SkywalkingTracer tracer) {
}
@@ -59,12 +50,8 @@ public class SkywalkingSpan implements Span {
/**
* Stop the active span
- *
- * @param finishMicros
*/
- @NeedSnifferActivation(
- "1.ContextManager#stopSpan(AbstractSpan span)" +
- "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan")
+ @NeedSnifferActivation("1.ContextManager#stopSpan(AbstractSpan span)" + "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan")
@Override
public void finish(long finishMicros) {
@@ -87,18 +74,19 @@ public class SkywalkingSpan implements Span {
return SkywalkingContext.INSTANCE;
}
- @NeedSnifferActivation(
- "1. ContextManager#activeSpan()" +
- "2. SkywalkingSpan#setTag(String, String)")
- @Override public Span setTag(String key, String value) {
+ @NeedSnifferActivation("1. ContextManager#activeSpan()" + "2. SkywalkingSpan#setTag(String, String)")
+ @Override
+ public Span setTag(String key, String value) {
return this;
}
- @Override public Span setTag(String key, boolean value) {
+ @Override
+ public Span setTag(String key, boolean value) {
return setTag(key, String.valueOf(value));
}
- @Override public Span setTag(String key, Number value) {
+ @Override
+ public Span setTag(String key, Number value) {
return setTag(key, String.valueOf(value));
}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
index e335c3a..20af251 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.ActiveSpan;
@@ -30,9 +29,6 @@ import io.opentracing.tag.Tags;
import java.util.LinkedList;
import java.util.List;
-/**
- * @author wusheng
- */
public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
private List<Tag> tags = new LinkedList<Tag>();
private String operationName;
@@ -66,10 +62,6 @@ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
/**
* Ignore the reference type. the span always the entry or has a parent span.
- *
- * @param referenceType
- * @param referencedContext
- * @return
*/
@Override
public Tracer.SpanBuilder addReference(String referenceType, SpanContext referencedContext) {
@@ -94,8 +86,9 @@ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
isEntry = false;
isExit = false;
}
- } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) || Tags.PEER_HOST_IPV6.getKey().equals(key)
- || Tags.PEER_HOSTNAME.getKey().equals(key)) {
+ } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) || Tags.PEER_HOST_IPV6.getKey()
+ .equals(key) || Tags.PEER_HOSTNAME.getKey()
+ .equals(key)) {
peer = value;
} else if (Tags.PEER_SERVICE.getKey().equals(key)) {
operationName = value;
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
index 96d1324..dcdf6c0 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.ActiveSpan;
@@ -25,9 +24,6 @@ import io.opentracing.SpanContext;
import io.opentracing.Tracer;
import io.opentracing.propagation.Format;
-/**
- * @author wusheng
- */
public class SkywalkingTracer implements Tracer {
public SpanBuilder buildSpan(String operationName) {
@@ -54,7 +50,7 @@ public class SkywalkingTracer implements Tracer {
@Override
public ActiveSpan makeActive(Span span) {
if (span instanceof SkywalkingSpan) {
- return new SkywalkingActiveSpan((SkywalkingSpan)span);
+ return new SkywalkingActiveSpan((SkywalkingSpan) span);
} else {
throw new IllegalArgumentException("span must be a type of SkywalkingSpan");
}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java
index cc3f8ed..04253b7 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
-/**
- * @author wusheng
- */
public class Tag {
private String key;
private String value;
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java
index 4719891..9197865 100644
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java
+++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.opentracing;
import io.opentracing.SpanContext;
import java.util.HashMap;
import java.util.Map;
-/**
- * Created by wusheng on 2016/12/21.
- */
public class TextMapContext implements SpanContext {
public TextMapContext() {
}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java
index a34707f..2878905 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.trace;
/**
* provide custom api that set tag for current active span.
- *
- * @author zhangxin
*/
public class ActiveSpan {
/**
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java
index 32c8f31..57b66fd 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java
@@ -15,13 +15,11 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.toolkit.trace;
import java.util.concurrent.Callable;
-/**
- * @author carlvine500
- */
@TraceCrossThread
public class CallableWrapper<V> implements Callable<V> {
final Callable<V> callable;
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java
index 60cd912..25e204c 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.skywalking.apm.toolkit.trace;
-/**
- * @author lican
- */
@TraceCrossThread
public class RunnableWrapper implements Runnable {
final Runnable runnable;
@@ -31,7 +29,6 @@ public class RunnableWrapper implements Runnable {
return new RunnableWrapper(r);
}
-
@Override
public void run() {
this.runnable.run();
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java
index 31eda09..1595772 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java
@@ -15,13 +15,11 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.toolkit.trace;
import java.util.function.Supplier;
-/**
- * @author sxzaihua
- */
@TraceCrossThread
public class SupplierWrapper<V> implements Supplier<V> {
final Supplier<V> supplier;
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
index a916c28..ea43c38 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java
@@ -24,10 +24,9 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Tag the current active span with key {@link #key()} and value {@link #value()},
- * if there is no active span, this annotation takes no effect.
+ * Tag the current active span with key {@link #key()} and value {@link #value()}, if there is no active span, this
+ * annotation takes no effect.
*
- * @author kezhenxu94
* @see Tags
*/
@Target(ElementType.METHOD)
@@ -39,9 +38,8 @@ public @interface Tag {
String key();
/**
- * @return the value of the tag to be injected into the current active span,
- * in the form of the customized enhancement rules, for more information,
- * refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure
+ * @return the value of the tag to be injected into the current active span, in the form of the customized
+ * enhancement rules, for more information, refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure
*/
String value();
}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java
index 4b763f0..b597071 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java
@@ -24,8 +24,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * A wrapper annotation for {@link Tag} that allows to
- * apply multiple tags to a single method span,
+ * A wrapper annotation for {@link Tag} that allows to apply multiple tags to a single method span,
*
* <pre>
* @Tag(key = "tag1", value = "arg[0]")
@@ -35,7 +34,6 @@ import java.lang.annotation.Target;
* }
* </pre>
*
- * @author kezhenxu94
* @see Tag
*/
@Target(ElementType.METHOD)
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java
index b76236d..a06bdab 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.trace;
import java.lang.annotation.ElementType;
@@ -28,8 +27,6 @@ import java.lang.annotation.Target;
* The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will
* fetch by {@link #operationName()}. if the value of {@link #operationName()} is blank string. the operation name will
* be set the class name + method name.
- *
- * @author zhangxin
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
index a890b6f..fb9a66e 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.toolkit.trace;
/**
- * Try to access the sky-walking tracer context.
- * The context is not existed, always.
- * only the middleware, component, or rpc-framework are supported in the current invoke stack, in the same thread,
- * the context will be available.
+ * Try to access the sky-walking tracer context. The context is not existed, always. only the middleware, component, or
+ * rpc-framework are supported in the current invoke stack, in the same thread, the context will be available.
* <p>
- * Created by xin on 2016/12/15.
*/
public class TraceContext {
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java
index 1eaf87a..e6049c6 100644
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java
+++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.toolkit.trace;
import java.lang.annotation.ElementType;
@@ -22,9 +23,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-/**
- * @author carlvine500
- */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface TraceCrossThread {
diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
index 00b501b..20e8a91 100755
--- a/apm-checkstyle/checkStyle.xml
+++ b/apm-checkstyle/checkStyle.xml
@@ -20,13 +20,18 @@
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://checkstyle.org/dtds/configuration_1_3.dtd">
-<!--Refer http://checkstyle.sourceforge.net/reports/google-java-style.html#s2.2-file-encoding -->
<module name="Checker">
<property name="localeLanguage" value="en"/>
- <!--To configure the check to report on the first instance in each file-->
- <module name="FileTabCharacter"/>
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <module name="RegexpHeader">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="multiLines" value="1, 2, 3, 18"/>
+ </module>
<module name="RegexpSingleline">
<property name="format" value="System\.out\.println"/>
@@ -34,6 +39,13 @@
</module>
<module name="RegexpSingleline">
+ <property name="format" value="^\s*\*\s*@author"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="ASF project doesn't allow @author copyright."/>
+ </module>
+
+ <module name="RegexpSingleline">
<property name="format"
value=".*[\u3400-\u4DB5\u4E00-\u9FA5\u9FA6-\u9FBB\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9\uFF00-\uFFEF\u2E80-\u2EFF\u3000-\u303F\u31C0-\u31EF]+.*"/>
<property name="message" value="Not allow chinese character !"/>
@@ -45,10 +57,11 @@
<module name="TreeWalker">
- <module name="UnusedImports">
- <property name="processJavadoc" value="true"/>
- </module>
+ <module name="UnusedImports"/>
<module name="RedundantImport"/>
+ <module name="AvoidStarImport"/>
+
+ <module name="NonEmptyAtclauseDescription"/>
<!--Checks that classes that override equals() also override hashCode()-->
<module name="EqualsHashCode"/>
@@ -95,32 +108,25 @@
<!--whitespace-->
<module name="GenericWhitespace"/>
- <module name="NoWhitespaceBefore"/>
- <module name="NoWhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="allowEmptyConstructors" value="true"/>
- <property name="allowEmptyMethods" value="true"/>
- </module>
- <module name="Indentation"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
<module name="MethodParamPad"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="TypecastParenPad"/>
+ <module name="EmptyLineSeparator">
+ <property name="allowNoEmptyLineBetweenFields" value="true"/>
+ <property name="allowMultipleEmptyLines" value="false"/>
+ <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+ </module>
<module name="ImportControl">
- <property name="file" value="apm-checkstyle/importControl.xml" />
- <property name="path" value="apm-sniffer/(apm-sdk-plugin|bootstrap-plugins|optional-plugins)/.+/src/main/.+Instrumentation.java$" />
+ <property name="file" value="apm-checkstyle/importControl.xml"/>
+ <property name="path" value="apm-sniffer/(apm-sdk-plugin|bootstrap-plugins|optional-plugins)/.+/src/main/.+Instrumentation.java$"/>
</module>
<module name="ImportControl">
- <property name="file" value="apm-checkstyle/importControl.xml" />
- <property name="path" value="apm-sniffer/apm-toolkit-activation/.+/src/main/.+Activation.java$" />
+ <property name="file" value="apm-checkstyle/importControl.xml"/>
+ <property name="path" value="apm-sniffer/apm-toolkit-activation/.+/src/main/.+Activation.java$"/>
</module>
</module>
-
- <module name="RegexpHeader">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- <property name="multiLines" value="1, 2, 3, 18"/>
- </module>
-
</module>
diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml
index 909c562..a5a3e20 100644
--- a/apm-commons/apm-datacarrier/pom.xml
+++ b/apm-commons/apm-datacarrier/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.apache.skywalking</groupId>
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java
index 40f8238..7288339 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java
@@ -18,9 +18,14 @@
package org.apache.skywalking.apm.commons.datacarrier;
-import org.apache.skywalking.apm.commons.datacarrier.buffer.*;
-import org.apache.skywalking.apm.commons.datacarrier.consumer.*;
-import org.apache.skywalking.apm.commons.datacarrier.partition.*;
+import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
+import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumeDriver;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPool;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.IDriver;
+import org.apache.skywalking.apm.commons.datacarrier.partition.IDataPartitioner;
+import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
/**
* DataCarrier main class. use this instance to set Producer/Consumer Model.
@@ -61,8 +66,6 @@ public class DataCarrier<T> {
/**
* override the strategy at runtime. Notice, {@link Channels} will override several channels one by one.
- *
- * @param strategy
*/
public DataCarrier setBufferStrategy(BufferStrategy strategy) {
this.channels.setStrategy(strategy);
@@ -72,7 +75,6 @@ public class DataCarrier<T> {
/**
* produce data to buffer, using the given {@link BufferStrategy}.
*
- * @param data
* @return false means produce data failure. The data will not be consumed.
*/
public boolean produce(T data) {
@@ -89,7 +91,7 @@ public class DataCarrier<T> {
* set consumeDriver to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work.
*
* @param consumerClass class of consumer
- * @param num number of consumer threads
+ * @param num number of consumer threads
*/
public DataCarrier consume(Class<? extends IConsumer<T>> consumerClass, int num, long consumeCycle) {
if (driver != null) {
@@ -105,7 +107,7 @@ public class DataCarrier<T> {
* millis consume cycle.
*
* @param consumerClass class of consumer
- * @param num number of consumer threads
+ * @param num number of consumer threads
*/
public DataCarrier consume(Class<? extends IConsumer<T>> consumerClass, int num) {
return this.consume(consumerClass, num, 20);
@@ -115,8 +117,7 @@ public class DataCarrier<T> {
* set consumeDriver to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work.
*
* @param consumer single instance of consumer, all consumer threads will all use this instance.
- * @param num number of consumer threads
- * @return
+ * @param num number of consumer threads
*/
public DataCarrier consume(IConsumer<T> consumer, int num, long consumeCycle) {
if (driver != null) {
@@ -132,8 +133,7 @@ public class DataCarrier<T> {
* millis consume cycle.
*
* @param consumer single instance of consumer, all consumer threads will all use this instance.
- * @param num number of consumer threads
- * @return
+ * @param num number of consumer threads
*/
public DataCarrier consume(IConsumer<T> consumer, int num) {
return this.consume(consumer, num, 20);
@@ -142,9 +142,6 @@ public class DataCarrier<T> {
/**
* Set a consumer pool to manage the channels of this DataCarrier. Then consumerPool could use its own consuming
* model to adjust the consumer thread and throughput.
- *
- * @param consumerPool
- * @return
*/
public DataCarrier consume(ConsumerPool consumerPool, IConsumer<T> consumer) {
driver = consumerPool;
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java
index bdcdf18..5ede4d2 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java
@@ -20,8 +20,6 @@ package org.apache.skywalking.apm.commons.datacarrier;
/**
* Read value from system env.
- *
- * @author wusheng
*/
public class EnvUtil {
public static int getInt(String envName, int defaultValue) {
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java
index 4ce61dd..1867099 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java
@@ -23,11 +23,9 @@ import java.util.concurrent.ArrayBlockingQueue;
/**
* The buffer implementation based on JDK ArrayBlockingQueue.
- *
+ * <p>
* This implementation has better performance in server side. We are still trying to research whether this is suitable
* for agent side, which is more sensitive about blocks.
- *
- * @author wusheng
*/
public class ArrayBlockingQueueBuffer<T> implements QueueBuffer<T> {
private BufferStrategy strategy;
@@ -40,7 +38,8 @@ public class ArrayBlockingQueueBuffer<T> implements QueueBuffer<T> {
this.bufferSize = bufferSize;
}
- @Override public boolean save(T data) {
+ @Override
+ public boolean save(T data) {
switch (strategy) {
case IF_POSSIBLE:
return queue.offer(data);
@@ -55,15 +54,18 @@ public class ArrayBlockingQueueBuffer<T> implements QueueBuffer<T> {
return true;
}
- @Override public void setStrategy(BufferStrategy strategy) {
+ @Override
+ public void setStrategy(BufferStrategy strategy) {
this.strategy = strategy;
}
- @Override public void obtain(List<T> consumeList) {
+ @Override
+ public void obtain(List<T> consumeList) {
queue.drainTo(consumeList);
}
- @Override public int getBufferSize() {
+ @Override
+ public int getBufferSize() {
return bufferSize;
}
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java
index b4419a7..d1f9217 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java
@@ -23,8 +23,6 @@ import org.apache.skywalking.apm.commons.datacarrier.common.AtomicRangeInteger;
/**
* Self implementation ring queue.
- *
- * @author wusheng
*/
public class Buffer<T> implements QueueBuffer<T> {
private final Object[] buffer;
@@ -41,7 +39,6 @@ public class Buffer<T> implements QueueBuffer<T> {
this.strategy = strategy;
}
-
public boolean save(T data) {
int i = index.getAndIncrement();
if (buffer[i] != null) {
@@ -74,7 +71,7 @@ public class Buffer<T> implements QueueBuffer<T> {
void obtain(List<T> consumeList, int start, int end) {
for (int i = start; i < end; i++) {
if (buffer[i] != null) {
- consumeList.add((T)buffer[i]);
+ consumeList.add((T) buffer[i]);
buffer[i] = null;
}
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java
index a26a324..acb5b97 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java
@@ -16,13 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.buffer;
-/**
- * Created by wusheng on 2016/10/25.
- */
public enum BufferStrategy {
- BLOCKING,
- IF_POSSIBLE
+ BLOCKING, IF_POSSIBLE
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java
index 1f13cc2..26c7ab0 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java
@@ -68,8 +68,6 @@ public class Channels<T> {
/**
* override the strategy at runtime. Notice, this will override several channels one by one. So, when running
* setStrategy, each channel may use different BufferStrategy
- *
- * @param strategy
*/
public void setStrategy(BufferStrategy strategy) {
for (QueueBuffer<T> buffer : bufferChannels) {
@@ -79,8 +77,6 @@ public class Channels<T> {
/**
* get channelSize
- *
- * @return
*/
public int getChannelSize() {
return this.bufferChannels.length;
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java
index 5789919..372606a 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java
@@ -22,12 +22,11 @@ import java.util.List;
/**
* Queue buffer interface.
- *
- * @author wusheng
*/
public interface QueueBuffer<T> {
/**
* Save data into the queue;
+ *
* @param data to add.
* @return true if saved
*/
@@ -35,13 +34,11 @@ public interface QueueBuffer<T> {
/**
* Set different strategy when queue is full.
- * @param strategy
*/
void setStrategy(BufferStrategy strategy);
/**
* Obtain the existing data from the queue
- * @param consumeList
*/
void obtain(List<T> consumeList);
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java
index 4d31823..f722a0d 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.common;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicIntegerArray;
-/**
- * Created by lkxiaolou
- */
public class AtomicRangeInteger extends Number implements Serializable {
private static final long serialVersionUID = -4099792402691141643L;
private AtomicIntegerArray values;
@@ -48,7 +44,8 @@ public class AtomicRangeInteger extends Number implements Serializable {
if (next > endValue && this.values.compareAndSet(VALUE_OFFSET, next, startValue)) {
return endValue;
}
- } while (next > endValue);
+ }
+ while (next > endValue);
return next - 1;
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java
index 0043f09..2d2195d 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java
@@ -18,7 +18,8 @@
package org.apache.skywalking.apm.commons.datacarrier.consumer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.Callable;
import org.apache.skywalking.apm.commons.datacarrier.EnvUtil;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
@@ -26,10 +27,8 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
* BulkConsumePool works for consuming data from multiple channels(DataCarrier instances), with multiple {@link
* MultipleChannelsConsumer}s.
- *
+ * <p>
* In typical case, the number of {@link MultipleChannelsConsumer} should be less than the number of channels.
- *
- * @author wusheng
*/
public class BulkConsumePool implements ConsumerPool {
private List<MultipleChannelsConsumer> allConsumers;
@@ -45,7 +44,8 @@ public class BulkConsumePool implements ConsumerPool {
}
}
- @Override synchronized public void add(String name, Channels channels, IConsumer consumer) {
+ @Override
+ synchronized public void add(String name, Channels channels, IConsumer consumer) {
MultipleChannelsConsumer multipleChannelsConsumer = getLowestPayload();
multipleChannelsConsumer.addNewTarget(channels, consumer);
}
@@ -67,20 +67,22 @@ public class BulkConsumePool implements ConsumerPool {
}
/**
- * @param channels
- * @return
+ *
*/
- @Override public boolean isRunning(Channels channels) {
+ @Override
+ public boolean isRunning(Channels channels) {
return isStarted;
}
- @Override public void close(Channels channels) {
+ @Override
+ public void close(Channels channels) {
for (MultipleChannelsConsumer consumer : allConsumers) {
consumer.shutdown();
}
}
- @Override public void begin(Channels channels) {
+ @Override
+ public void begin(Channels channels) {
if (isStarted) {
return;
}
@@ -104,7 +106,8 @@ public class BulkConsumePool implements ConsumerPool {
this.consumeCycle = consumeCycle;
}
- @Override public ConsumerPool call() {
+ @Override
+ public ConsumerPool call() {
return new BulkConsumePool(name, size, consumeCycle);
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java
index 3d60ef6..66545da 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
-/**
- * Created by wusheng on 2016/11/15.
- */
public class ConsumerCannotBeCreatedException extends RuntimeException {
ConsumerCannotBeCreatedException(Throwable t) {
super(t);
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java
index a098274..46b23b9 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java
@@ -22,10 +22,8 @@ import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
- * The Consumer pool could support data consumer from multiple {@link DataCarrier}s,
- * by using different consume thread management models.
- *
- * @author wusheng
+ * The Consumer pool could support data consumer from multiple {@link DataCarrier}s, by using different consume thread
+ * management models.
*/
public interface ConsumerPool extends IDriver {
void add(String name, Channels channels, IConsumer consumer);
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
index 7f86873..7c7a7d0 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
@@ -18,14 +18,13 @@
package org.apache.skywalking.apm.commons.datacarrier.consumer;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
* Consumer Pool Factory provides global management for all Consumer Pool.
- *
- * @author wusheng
*/
public enum ConsumerPoolFactory {
INSTANCE;
@@ -56,7 +55,8 @@ public enum ConsumerPoolFactory {
public static final ConsumerPool DEFAULT_POOL = new ConsumerPool() {
private Map<Channels, ConsumeDriver> allDrivers = new HashMap<Channels, ConsumeDriver>();
- @Override synchronized public void add(String name, Channels channels, IConsumer consumer) {
+ @Override
+ synchronized public void add(String name, Channels channels, IConsumer consumer) {
if (!allDrivers.containsKey(channels)) {
ConsumeDriver consumeDriver = new ConsumeDriver(name, channels, consumer, 1, 20);
allDrivers.put(channels, consumeDriver);
@@ -65,21 +65,22 @@ public enum ConsumerPoolFactory {
/**
* Always return true.
- * @param channels
- * @return
*/
- @Override public boolean isRunning(Channels channels) {
+ @Override
+ public boolean isRunning(Channels channels) {
return true;
}
- @Override public void close(Channels channels) {
+ @Override
+ public void close(Channels channels) {
ConsumeDriver driver = allDrivers.get(channels);
if (driver != null) {
driver.close(channels);
}
}
- @Override public void begin(Channels channels) {
+ @Override
+ public void begin(Channels channels) {
ConsumeDriver driver = allDrivers.get(channels);
if (driver != null) {
driver.begin(channels);
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java
index 15c01f5..5f35408 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.ArrayList;
@@ -24,9 +23,6 @@ import java.util.List;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Buffer;
import org.apache.skywalking.apm.commons.datacarrier.buffer.QueueBuffer;
-/**
- * Created by wusheng on 2016/10/25.
- */
public class ConsumerThread<T> extends Thread {
private volatile boolean running;
private IConsumer<T> consumer;
@@ -43,8 +39,6 @@ public class ConsumerThread<T> extends Thread {
/**
* add whole buffer to consume
- *
- * @param sourceBuffer
*/
void addDataSource(QueueBuffer<T> sourceBuffer) {
this.dataSources.add(new DataSource(sourceBuffer));
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
index 2b00c5e..3c6dc0d 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
@@ -16,14 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.List;
-/**
- * Created by wusheng on 2016/10/25.
- */
public interface IConsumer<T> {
void init();
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java
index 74368ce..66845e5 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java
@@ -22,11 +22,11 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
* The driver of consumer.
- *
- * @author wusheng
*/
public interface IDriver {
boolean isRunning(Channels channels);
+
void close(Channels channels);
+
void begin(Channels channels);
}
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java
index 708325e..b70bb8f 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java
@@ -26,8 +26,6 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.QueueBuffer;
/**
* MultipleChannelsConsumer represent a single consumer thread, but support multiple channels with their {@link
* IConsumer}s
- *
- * @author wusheng
*/
public class MultipleChannelsConsumer extends Thread {
private volatile boolean running;
@@ -91,9 +89,6 @@ public class MultipleChannelsConsumer extends Thread {
/**
* Add a new target channels.
- *
- * @param channels
- * @param consumer
*/
public void addNewTarget(Channels channels, IConsumer consumer) {
Group group = new Group(channels, consumer);
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java
index 7c74e84..fc985c9 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java
@@ -16,20 +16,16 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.partition;
import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
-/**
- * Created by wusheng on 2016/10/25.
- */
public interface IDataPartitioner<T> {
int partition(int total, T data);
/**
* @return an integer represents how many times should retry when {@link BufferStrategy#IF_POSSIBLE}.
- *
+ * <p>
* Less or equal 1, means not support retry.
*/
int maxRetryCount();
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
index 90ee56c..5d1e84a 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.partition;
/**
* use threadid % total to partition
- *
- * Created by wusheng on 2016/10/25.
*/
public class ProducerThreadPartitioner<T> implements IDataPartitioner<T> {
private int retryTime = 3;
@@ -36,7 +33,7 @@ public class ProducerThreadPartitioner<T> implements IDataPartitioner<T> {
@Override
public int partition(int total, T data) {
- return (int)Thread.currentThread().getId() % total;
+ return (int) Thread.currentThread().getId() % total;
}
@Override
diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java
index b01c24d..ff3bdf5 100644
--- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java
+++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java
@@ -16,14 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.partition;
/**
* use normal int to rolling.
- *
- *
- * Created by wusheng on 2016/10/25.
*/
public class SimpleRollingPartitioner<T> implements IDataPartitioner<T> {
private volatile int i = 0;
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
index 1da8b8c..ee11a77 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier;
import java.util.ArrayList;
@@ -31,17 +30,17 @@ import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
-/**
- * Created by wusheng on 2016/10/25.
- */
public class DataCarrierTest {
@Test
public void testCreateDataCarrier() throws IllegalAccessException {
DataCarrier<SampleData> carrier = new DataCarrier<SampleData>(5, 100);
- Assert.assertEquals(((Integer)(MemberModifier.field(DataCarrier.class, "bufferSize").get(carrier))).intValue(), 100);
- Assert.assertEquals(((Integer)(MemberModifier.field(DataCarrier.class, "channelSize").get(carrier))).intValue(), 5);
+ Assert.assertEquals(((Integer) (MemberModifier.field(DataCarrier.class, "bufferSize")
+ .get(carrier))).intValue(), 100);
+ Assert.assertEquals(((Integer) (MemberModifier.field(DataCarrier.class, "channelSize")
+ .get(carrier))).intValue(), 5);
- Channels<SampleData> channels = (Channels<SampleData>)(MemberModifier.field(DataCarrier.class, "channels").get(carrier));
+ Channels<SampleData> channels = (Channels<SampleData>) (MemberModifier.field(DataCarrier.class, "channels")
+ .get(carrier));
Assert.assertEquals(5, channels.getChannelSize());
QueueBuffer<SampleData> buffer = channels.getBuffer(0);
@@ -49,11 +48,16 @@ public class DataCarrierTest {
Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy").get(buffer), BufferStrategy.BLOCKING);
carrier.setBufferStrategy(BufferStrategy.IF_POSSIBLE);
- Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy").get(buffer), BufferStrategy.IF_POSSIBLE);
+ Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy")
+ .get(buffer), BufferStrategy.IF_POSSIBLE);
- Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner").get(channels).getClass(), SimpleRollingPartitioner.class);
+ Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner")
+ .get(channels)
+ .getClass(), SimpleRollingPartitioner.class);
carrier.setPartitioner(new ProducerThreadPartitioner<SampleData>());
- Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner").get(channels).getClass(), ProducerThreadPartitioner.class);
+ Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner")
+ .get(channels)
+ .getClass(), ProducerThreadPartitioner.class);
}
@Test
@@ -64,7 +68,8 @@ public class DataCarrierTest {
Assert.assertTrue(carrier.produce(new SampleData().setName("c")));
Assert.assertTrue(carrier.produce(new SampleData().setName("d")));
- Channels<SampleData> channels = (Channels<SampleData>)(MemberModifier.field(DataCarrier.class, "channels").get(carrier));
+ Channels<SampleData> channels = (Channels<SampleData>) (MemberModifier.field(DataCarrier.class, "channels")
+ .get(carrier));
QueueBuffer<SampleData> buffer1 = channels.getBuffer(0);
List result = new ArrayList();
@@ -91,7 +96,8 @@ public class DataCarrierTest {
Assert.assertFalse(carrier.produce(new SampleData().setName("d" + i + "_2")));
}
- Channels<SampleData> channels = (Channels<SampleData>)(MemberModifier.field(DataCarrier.class, "channels").get(carrier));
+ Channels<SampleData> channels = (Channels<SampleData>) (MemberModifier.field(DataCarrier.class, "channels")
+ .get(carrier));
QueueBuffer<SampleData> buffer1 = channels.getBuffer(0);
List result = new ArrayList();
buffer1.obtain(result);
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java
index 640b23d..9b1a852 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java
@@ -28,10 +28,6 @@ import org.powermock.modules.junit4.PowerMockRunner;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
-/**
- * @author dengming
- * 2019-04-20
- */
@RunWith(PowerMockRunner.class)
@PrepareForTest(EnvUtil.class)
public class EnvUtilTest {
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java
index 4df3a0f..6c57d75 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java
@@ -168,12 +168,11 @@ public class LinkedArrayBenchmark {
}
public static void main(String[] args) throws RunnerException {
- Options opt = new OptionsBuilder()
- .include(LinkedArrayBenchmark.class.getName())
- .addProfiler(GCProfiler.class)
- .jvmArgsAppend("-Xmx512m", "-Xms512m")
- .forks(1)
- .build();
+ Options opt = new OptionsBuilder().include(LinkedArrayBenchmark.class.getName())
+ .addProfiler(GCProfiler.class)
+ .jvmArgsAppend("-Xmx512m", "-Xms512m")
+ .forks(1)
+ .build();
new Runner(opt).run();
}
/*
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java
index 56b8938..812a56f 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier;
-/**
- * Created by wusheng on 2016/10/25.
- */
public class SampleData {
private int intValue;
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java
index a865af6..68ed6ac 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.common;
import org.junit.Assert;
@@ -27,9 +26,6 @@ import org.openjdk.jmh.runner.RunnerException;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
-/**
- * Created by xin on 2017/7/14.
- */
public class AtomicRangeIntegerTest {
private static AtomicRangeInteger ATOMIC_V3 = new AtomicRangeInteger(0, 100);
@@ -46,8 +42,8 @@ public class AtomicRangeIntegerTest {
Assert.assertEquals(1, atomicI.get());
Assert.assertEquals(1, atomicI.intValue());
Assert.assertEquals(1, atomicI.longValue());
- Assert.assertEquals(1, (int)atomicI.floatValue());
- Assert.assertEquals(1, (int)atomicI.doubleValue());
+ Assert.assertEquals(1, (int) atomicI.floatValue());
+ Assert.assertEquals(1, (int) atomicI.doubleValue());
}
@Test
@@ -69,15 +65,14 @@ public class AtomicRangeIntegerTest {
}
public static void main(String[] args) throws RunnerException {
- Options opt = new OptionsBuilder()
- .include(AtomicRangeIntegerTest.class.getSimpleName())
- .forks(1)
- .warmupIterations(3)
- .threads(128)
- .syncIterations(false)
- .output("/tmp/jmh.log")
- .measurementIterations(5)
- .build();
+ Options opt = new OptionsBuilder().include(AtomicRangeIntegerTest.class.getSimpleName())
+ .forks(1)
+ .warmupIterations(3)
+ .threads(128)
+ .syncIterations(false)
+ .output("/tmp/jmh.log")
+ .measurementIterations(5)
+ .build();
new Runner(opt).run();
}
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java
index 4ce2878..e7cb5af 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java
@@ -16,14 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.common;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Created by wusheng on 2016/10/25.
* This is moved from SkyWalking 6.1
*/
public class AtomicRangeIntegerV1 extends Number implements Serializable {
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java
index 15bb9c1..e623c94 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java
@@ -16,14 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.common;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Created by lkxiaolou
* This comes from PR#2874
*/
public class AtomicRangeIntegerV2 extends Number implements Serializable {
@@ -45,7 +43,8 @@ public class AtomicRangeIntegerV2 extends Number implements Serializable {
if (next > endValue && this.value.compareAndSet(next, startValue)) {
return endValue;
}
- } while (next > endValue);
+ }
+ while (next > endValue);
return next - 1;
}
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java
index ec59162..b96e08b 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java
@@ -16,20 +16,16 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
+import org.apache.skywalking.apm.commons.datacarrier.SampleData;
+import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
-import org.apache.skywalking.apm.commons.datacarrier.SampleData;
-import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
-/**
- * Created by wusheng on 2016/10/26.
- */
public class ConsumeDriverTest {
@Test
public void testBeginConsumeDriver() throws IllegalAccessException {
@@ -37,7 +33,8 @@ public class ConsumeDriverTest {
ConsumeDriver<SampleData> pool = new ConsumeDriver<SampleData>("default", channels, new SampleConsumer(), 2, 20);
pool.begin(channels);
- ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool);
+ ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads")
+ .get(pool);
Assert.assertEquals(2, threads.length);
Assert.assertTrue(threads[0].isAlive());
Assert.assertTrue(threads[1].isAlive());
@@ -51,10 +48,11 @@ public class ConsumeDriverTest {
Thread.sleep(5000);
pool.close(channels);
- ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool);
+ ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads")
+ .get(pool);
Assert.assertEquals(2, threads.length);
- Assert.assertFalse((Boolean)MemberModifier.field(ConsumerThread.class, "running").get(threads[0]));
- Assert.assertFalse((Boolean)MemberModifier.field(ConsumerThread.class, "running").get(threads[1]));
+ Assert.assertFalse((Boolean) MemberModifier.field(ConsumerThread.class, "running").get(threads[0]));
+ Assert.assertFalse((Boolean) MemberModifier.field(ConsumerThread.class, "running").get(threads[1]));
}
}
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java
index 737eb23..5ef4b09 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java
@@ -21,12 +21,10 @@ package org.apache.skywalking.apm.commons.datacarrier.consumer;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-/**
- * @author dengming
- * 2019-04-20
- */
public class ConsumerPoolFactoryTest {
@Before
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java
index b9dfd8f..e92c35e 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.ArrayList;
@@ -29,9 +28,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
-/**
- * Created by wusheng on 2016/10/26.
- */
public class ConsumerTest {
public static LinkedBlockingQueue<SampleData> BUFFER = new LinkedBlockingQueue<SampleData>();
@@ -48,12 +44,12 @@ public class ConsumerTest {
consumer.i = 100;
carrier.consume(SampleConsumer.class, 1);
- Assert.assertEquals(1, ((SampleConsumer)getConsumer(carrier)).i);
+ Assert.assertEquals(1, ((SampleConsumer) getConsumer(carrier)).i);
SampleConsumer2 consumer2 = new SampleConsumer2();
consumer2.i = 100;
carrier.consume(consumer2, 1);
- Assert.assertEquals(100, ((SampleConsumer2)getConsumer(carrier)).i);
+ Assert.assertEquals(100, ((SampleConsumer2) getConsumer(carrier)).i);
carrier.shutdownConsumers();
}
@@ -129,9 +125,10 @@ public class ConsumerTest {
}
private IConsumer getConsumer(DataCarrier<SampleData> carrier) throws IllegalAccessException {
- ConsumeDriver pool = (ConsumeDriver)MemberModifier.field(DataCarrier.class, "driver").get(carrier);
- ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool);
+ ConsumeDriver pool = (ConsumeDriver) MemberModifier.field(DataCarrier.class, "driver").get(carrier);
+ ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads")
+ .get(pool);
- return (IConsumer)MemberModifier.field(ConsumerThread.class, "consumer").get(threads[0]);
+ return (IConsumer) MemberModifier.field(ConsumerThread.class, "consumer").get(threads[0]);
}
}
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java
index 13274cd..b23ef03 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.consumer;
import java.util.List;
import org.apache.skywalking.apm.commons.datacarrier.SampleData;
-/**
- * Created by wusheng on 2016/10/26.
- */
public class SampleConsumer implements IConsumer<SampleData> {
public int i = 1;
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java
index 7cba146..d0a38ab 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java
@@ -16,20 +16,16 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.partition;
import org.apache.skywalking.apm.commons.datacarrier.SampleData;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Created by wusheng on 2016/10/25.
- */
public class ProducerThreadPartitionerTest {
@Test
public void testPartition() {
- int partitionNum = (int)Thread.currentThread().getId() % 10;
+ int partitionNum = (int) Thread.currentThread().getId() % 10;
ProducerThreadPartitioner<SampleData> partitioner = new ProducerThreadPartitioner<SampleData>();
Assert.assertEquals(partitioner.partition(10, new SampleData()), partitionNum);
Assert.assertEquals(partitioner.partition(10, new SampleData()), partitionNum);
diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java
index cd17879..92284f5 100644
--- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java
+++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.commons.datacarrier.partition;
import org.apache.skywalking.apm.commons.datacarrier.SampleData;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Created by wusheng on 2016/10/25.
- */
public class SimpleRollingPartitionerTest {
@Test
public void testPartition() {
diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml
index 41967ff..27b5db4 100644
--- a/apm-commons/apm-util/pom.xml
+++ b/apm-commons/apm-util/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.apache.skywalking</groupId>
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java
index a7be27e..f4efb0d 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.util;
import java.lang.reflect.Field;
@@ -34,7 +33,6 @@ import java.util.logging.Logger;
/**
* Init a class's static fields by a {@link Properties}, including static fields and static inner classes.
* <p>
- * Created by wusheng on 2017/1/9.
*/
public class ConfigInitializer {
private static final Logger logger = Logger.getLogger(ConfigInitializer.class.getName());
@@ -56,7 +54,7 @@ public class ConfigInitializer {
* Such as plugin.opgroup.resttemplate.rule[abc]=/url/path
*/
// Deduct two generic types of the map
- ParameterizedType genericType = (ParameterizedType)field.getGenericType();
+ ParameterizedType genericType = (ParameterizedType) field.getGenericType();
Type[] argumentTypes = genericType.getActualTypeArguments();
Type keyType = null;
@@ -66,7 +64,7 @@ public class ConfigInitializer {
keyType = argumentTypes[0];
valueType = argumentTypes[1];
}
- Map map = (Map)field.get(null);
+ Map map = (Map) field.get(null);
// Set the map from config key and properties
setForMapType(configKey, map, properties, keyType, valueType);
} else {
@@ -91,7 +89,8 @@ public class ConfigInitializer {
/**
* Convert string value to typical type.
- * @param type type to convert
+ *
+ * @param type type to convert
* @param value string value to be converted
* @return converted value or null
*/
@@ -116,9 +115,9 @@ public class ConfigInitializer {
} else if (List.class.equals(type)) {
result = convert2List(value);
} else if (type instanceof Class) {
- Class<?> clazz = (Class<?>)type;
+ Class<?> clazz = (Class<?>) type;
if (clazz.isEnum()) {
- result = Enum.valueOf((Class<Enum>)type, value.toUpperCase());
+ result = Enum.valueOf((Class<Enum>) type, value.toUpperCase());
}
}
return result;
@@ -126,15 +125,15 @@ public class ConfigInitializer {
/**
* Set map items.
- * @param configKey config key must not be null
- * @param map map to set must not be null
+ *
+ * @param configKey config key must not be null
+ * @param map map to set must not be null
* @param properties properties must not be null
- * @param keyType key type of the map
- * @param valueType value type of the map
+ * @param keyType key type of the map
+ * @param valueType value type of the map
*/
private static void setForMapType(String configKey, Map<Object, Object> map, Properties properties,
- final Type keyType,
- final Type valueType) {
+ final Type keyType, final Type valueType) {
Objects.requireNonNull(configKey);
Objects.requireNonNull(map);
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
index f300644..808bc42 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.util;
import java.lang.management.ManagementFactory;
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java
index 7f96b25..e2f25d0 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java
@@ -18,18 +18,21 @@
package org.apache.skywalking.apm.util;
-/**
- * @author jian.tan
- */
public class PlaceholderConfigurerSupport {
- /** Default placeholder prefix: {@value} */
+ /**
+ * Default placeholder prefix: {@value}
+ */
public static final String DEFAULT_PLACEHOLDER_PREFIX = "${";
- /** Default placeholder suffix: {@value} */
+ /**
+ * Default placeholder suffix: {@value}
+ */
public static final String DEFAULT_PLACEHOLDER_SUFFIX = "}";
- /** Default value separator: {@value} */
+ /**
+ * Default value separator: {@value}
+ */
public static final String DEFAULT_VALUE_SEPARATOR = ":";
}
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java
index 10de122..4e985ba 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java
@@ -31,9 +31,7 @@ import java.util.Set;
*/
public enum PropertyPlaceholderHelper {
- INSTANCE(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX,
- PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_SUFFIX,
- PlaceholderConfigurerSupport.DEFAULT_VALUE_SEPARATOR, true);
+ INSTANCE(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX, PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_SUFFIX, PlaceholderConfigurerSupport.DEFAULT_VALUE_SEPARATOR, true);
private final String placeholderPrefix;
@@ -48,15 +46,15 @@ public enum PropertyPlaceholderHelper {
/**
* Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix.
*
- * @param placeholderPrefix the prefix that denotes the start of a placeholder
- * @param placeholderSuffix the suffix that denotes the end of a placeholder
- * @param valueSeparator the separating character between the placeholder variable and the associated default value,
- * if any
+ * @param placeholderPrefix the prefix that denotes the start of a placeholder
+ * @param placeholderSuffix the suffix that denotes the end of a placeholder
+ * @param valueSeparator the separating character between the placeholder variable and the
+ * associated default value, if any
* @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should be ignored ({@code
- * true}) or cause an exception ({@code false})
+ * true}) or cause an exception ({@code false})
*/
- PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
- String valueSeparator, boolean ignoreUnresolvablePlaceholders) {
+ PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix, String valueSeparator,
+ boolean ignoreUnresolvablePlaceholders) {
if (StringUtil.isEmpty(placeholderPrefix) || StringUtil.isEmpty(placeholderSuffix)) {
throw new UnsupportedOperationException("'placeholderPrefix or placeholderSuffix' must not be null");
}
@@ -83,7 +81,7 @@ public enum PropertyPlaceholderHelper {
* Replaces all placeholders of format {@code ${name}} with the corresponding property from the supplied {@link
* Properties}.
*
- * @param value the value containing the placeholders to be replaced
+ * @param value the value containing the placeholders to be replaced
* @param properties the {@code Properties} to use for replacement
* @return the supplied value with placeholders replaced inline
*/
@@ -111,7 +109,7 @@ public enum PropertyPlaceholderHelper {
* Replaces all placeholders of format {@code ${name}} with the value returned from the supplied {@link
* PlaceholderResolver}.
*
- * @param value the value containing the placeholders to be replaced
+ * @param value the value containing the placeholders to be replaced
* @param placeholderResolver the {@code PlaceholderResolver} to use for replacement
* @return the supplied value with placeholders replaced inline
*/
@@ -131,8 +129,7 @@ public enum PropertyPlaceholderHelper {
String placeholder = result.substring(startIndex + this.placeholderPrefix.length(), endIndex);
String originalPlaceholder = placeholder;
if (!visitedPlaceholders.add(originalPlaceholder)) {
- throw new IllegalArgumentException(
- "Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
+ throw new IllegalArgumentException("Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
}
// Recursive invocation, parsing placeholders contained in the placeholder key.
placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders);
@@ -159,8 +156,7 @@ public enum PropertyPlaceholderHelper {
// Proceed with unprocessed value.
startIndex = result.indexOf(this.placeholderPrefix, endIndex + this.placeholderSuffix.length());
} else {
- throw new IllegalArgumentException("Could not resolve placeholder '" +
- placeholder + "'" + " in value \"" + value + "\"");
+ throw new IllegalArgumentException("Could not resolve placeholder '" + placeholder + "'" + " in value \"" + value + "\"");
}
visitedPlaceholders.remove(originalPlaceholder);
} else {
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java
index d03e832..e3d6136 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java
@@ -18,9 +18,6 @@
package org.apache.skywalking.apm.util;
-/**
- * @author wusheng
- */
public class RunnableWithExceptionProtection implements Runnable {
private Runnable run;
private CallbackWhenException callback;
diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
index 497e815..1350206 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
@@ -18,26 +18,29 @@
package org.apache.skywalking.apm.util;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
import java.util.regex.Pattern;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
/**
* Group patterns use {@link java.util.regex.Pattern} as core, could group the input strings to matched group or return
* original string.
- *
- * @author wusheng
*/
+@ToString
public class StringFormatGroup {
private final List<PatternRule> rules;
public StringFormatGroup() {
- rules = new ArrayList<PatternRule>();
+ rules = new ArrayList<>();
}
/**
* Add a new match rule. The rule will follow the order of being added.
*
- * @param name will be used when ruleRegex matched.
+ * @param name will be used when ruleRegex matched.
* @param ruleRegex to match target string.
*/
public void addRule(String name, String ruleRegex) {
@@ -65,52 +68,22 @@ public class StringFormatGroup {
return new FormatResult(false, string);
}
- @Override public String toString() {
- return "StringFormatGroup{" +
- "rules=" + rules +
- '}';
- }
-
+ @Getter
+ @RequiredArgsConstructor
public static class FormatResult {
- private boolean match;
- private String name;
-
- public FormatResult(boolean match, String name) {
- this.match = match;
- this.name = name;
- }
-
- public boolean isMatch() {
- return match;
- }
-
- public String getName() {
- return name;
- }
+ private final boolean match;
+ private final String name;
}
+ @Getter
+ @ToString
private static class PatternRule {
- private String name;
- private Pattern pattern;
+ private final String name;
+ private final Pattern pattern;
private PatternRule(String name, String ruleRegex) {
this.name = name;
pattern = Pattern.compile(ruleRegex);
}
-
- public String getName() {
- return name;
- }
-
- public Pattern getPattern() {
- return pattern;
- }
-
- @Override public String toString() {
- return "PatternRule{" +
- "name='" + name + '\'' +
- ", pattern=" + pattern +
- '}';
- }
}
}
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java
index 75a69c8..2dbb590 100644
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java
+++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.util;
import org.junit.Assert;
@@ -26,9 +25,6 @@ import org.junit.Test;
import java.util.List;
import java.util.Properties;
-/**
- * Created by wusheng on 2017/2/27.
- */
public class ConfigInitializerTest {
@Test
public void testInitialize() throws IllegalAccessException {
@@ -47,7 +43,7 @@ public class ConfigInitializerTest {
Assert.assertEquals(1000, TestPropertiesObject.Level1Object.Level2Object.INT_ATTR);
Assert.assertEquals(1000L, TestPropertiesObject.Level1Object.Level2Object.LONG_ATTR);
Assert.assertEquals(true, TestPropertiesObject.Level1Object.Level2Object.BOOLEAN_ATTR);
- Assert.assertArrayEquals(new String[]{}, TestPropertiesObject.Level1Object.LIST_EMPTY_ATTR.toArray());
+ Assert.assertArrayEquals(new String[] {}, TestPropertiesObject.Level1Object.LIST_EMPTY_ATTR.toArray());
Assert.assertEquals(TestColorEnum.RED, TestPropertiesObject.Level1Object.Level2Object.ENUM_ATTR);
//make sure that when descs is empty,toString() work right;
Assert.assertEquals(new ConfigDesc().toString(), "");
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
index b228104..7bf0742 100644
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
+++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
@@ -21,9 +21,6 @@ package org.apache.skywalking.apm.util;
import org.junit.Assert;
import org.junit.Test;
-/**
- * @author lican
- */
public class MachineInfoTest {
@Test
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java
index 5f0c1e4..b3cbfa9 100644
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java
+++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java
@@ -21,9 +21,6 @@ package org.apache.skywalking.apm.util;
import org.junit.Assert;
import org.junit.Test;
-/**
- * @author lican
- */
public class RunnableWithExceptionProtectionTest {
@Test
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java
index 4640220..c573e54 100644
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java
+++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java
@@ -19,10 +19,16 @@
package org.apache.skywalking.apm.util;
import java.util.concurrent.TimeUnit;
-import org.junit.*;
-import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.runner.*;
-import org.openjdk.jmh.runner.options.*;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
public class StringFormatGroupTest {
@Benchmark
@@ -49,20 +55,16 @@ public class StringFormatGroupTest {
}
/**
- * The report below shows this pattern match performance is much about rule numbers.
- * This is a single thread test.
- *
- * @throws RunnerException
+ * The report below shows this pattern match performance is much about rule numbers. This is a single thread test.
*/
@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.MICROSECONDS)
public void performanceBenchmark() throws RunnerException {
- Options opt = new OptionsBuilder()
- .include(StringFormatGroupTest.class.getSimpleName())
- .forks(1)
- .warmupIterations(0)
- .measurementIterations(5)
- .build();
+ Options opt = new OptionsBuilder().include(StringFormatGroupTest.class.getSimpleName())
+ .forks(1)
+ .warmupIterations(0)
+ .measurementIterations(5)
+ .build();
new Runner(opt).run();
}
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java
index e5158a3..e1b968d 100644
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java
+++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.util;
import org.junit.Assert;
import org.junit.Test;
-/**
- * Created by wusheng on 2017/2/27.
- */
public class StringUtilTest {
@Test
public void testIsEmpty() {
diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml
index 5c0330e..c55a705 100644
--- a/apm-commons/pom.xml
+++ b/apm-commons/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
diff --git a/apm-dist-es7/pom.xml b/apm-dist-es7/pom.xml
index b505db5..5cda4f0 100644
--- a/apm-dist-es7/pom.xml
+++ b/apm-dist-es7/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -107,7 +108,9 @@
</goals>
<configuration>
<tasks>
- <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
+ <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz"
+ tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz"
+ overwrite="true"/>
</tasks>
</configuration>
</execution>
diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml
index 3221a1d..bc8c255 100644
--- a/apm-protocol/apm-network/pom.xml
+++ b/apm-protocol/apm-network/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-protocol</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -80,10 +81,12 @@
protobuf-java directly, you will be transitively depending on the
protobuf-java version that grpc depends on.
-->
- <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
+ <protocArtifact>
+ com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
+ <pluginArtifact>
+ io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
<executions>
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java
index 899c281..e9b5b01 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java
@@ -20,8 +20,6 @@ package org.apache.skywalking.apm.network;
/**
* The version of the protocol between agent and backend.
- *
- * @author kezhenxu94
*/
public enum ProtocolVersion {
V2(2);
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java
index 6e6f7ac..0745cc0 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java
@@ -15,12 +15,11 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.network.constants;
/**
* profile task limit constants
- *
- * @author MrPro
*/
public class ProfileConstants {
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
index b2f118d..1a6d2db 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.network.trace.component;
/**
- * The <code>Component</code> represents component library,
- * which has been supported by skywalking sniffer.
- *
+ * The <code>Component</code> represents component library, which has been supported by skywalking sniffer.
+ * <p>
* The supported list is in {@link ComponentsDefine}.
- *
- * @author wusheng
*/
public interface Component {
int getId();
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
index 4081223..296b8dd 100755
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.network.trace.component;
/**
* The supported list of skywalking java sniffer.
- *
- * @author wusheng
*/
public class ComponentsDefine {
@@ -64,11 +61,11 @@ public class ComponentsDefine {
public static final OfficialComponent SERVICECOMB = new OfficialComponent(28, "ServiceComb");
- public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix");
+ public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix");
- public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis");
+ public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis");
- public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver");
+ public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver");
public static final OfficialComponent MYSQL_JDBC_DRIVER = new OfficialComponent(33, "mysql-connector-java");
@@ -90,39 +87,39 @@ public class ComponentsDefine {
public static final OfficialComponent MONGO_DRIVER = new OfficialComponent(42, "mongodb-driver");
- public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC");
+ public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC");
+
+ public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45, "activemq-producer");
- public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45,"activemq-producer");
+ public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46, "activemq-consumer");
- public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46,"activemq-consumer");
+ public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client");
- public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client");
+ public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow");
- public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow");
+ public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52, "rabbitmq-producer");
- public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52,"rabbitmq-producer");
+ public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53, "rabbitmq-consumer");
- public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53,"rabbitmq-consumer");
+ public static final OfficialComponent CANAL = new OfficialComponent(54, "Canal");
- public static final OfficialComponent CANAL = new OfficialComponent(54,"Canal");
-
- public static final OfficialComponent GSON = new OfficialComponent(55,"Gson");
-
- public static final OfficialComponent REDISSON = new OfficialComponent(56, "Redisson");
+ public static final OfficialComponent GSON = new OfficialComponent(55, "Gson");
- public static final OfficialComponent LETTUCE = new OfficialComponent(57, "Lettuce");
+ public static final OfficialComponent REDISSON = new OfficialComponent(56, "Redisson");
- public static final OfficialComponent ZOOKEEPER = new OfficialComponent(58, "Zookeeper");
+ public static final OfficialComponent LETTUCE = new OfficialComponent(57, "Lettuce");
- public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x");
+ public static final OfficialComponent ZOOKEEPER = new OfficialComponent(58, "Zookeeper");
+
+ public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x");
public static final OfficialComponent SHARDING_SPHERE = new OfficialComponent(60, "ShardingSphere");
- public static final OfficialComponent SPRING_CLOUD_GATEWAY = new OfficialComponent(61, "spring-cloud-gateway");
+ public static final OfficialComponent SPRING_CLOUD_GATEWAY = new OfficialComponent(61, "spring-cloud-gateway");
- public static final OfficialComponent RESTEASY = new OfficialComponent(62, "RESTEasy");
+ public static final OfficialComponent RESTEASY = new OfficialComponent(62, "RESTEasy");
- public static final OfficialComponent SOLRJ = new OfficialComponent(63, "solrj");
+ public static final OfficialComponent SOLRJ = new OfficialComponent(63, "solrj");
public static final OfficialComponent SPRING_ASYNC = new OfficialComponent(65, "SpringAsync");
@@ -133,7 +130,7 @@ public class ComponentsDefine {
public static final OfficialComponent PLAY = new OfficialComponent(68, "Play");
public static final OfficialComponent CASSANDRA_JAVA_DRIVER = new OfficialComponent(69, "cassandra-java-driver");
-
+
public static final OfficialComponent LIGHT_4J = new OfficialComponent(71, "Light4J");
public static final OfficialComponent PULSAR_PRODUCER = new OfficialComponent(73, "pulsar-producer");
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
index 3c94ae4..57be115 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.network.trace.component;
-/**
- * @author wusheng
- */
public class OfficialComponent implements Component {
private int id;
private String name;
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java
index 0e98338..658cdeb 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java
@@ -18,11 +18,9 @@
package org.apache.skywalking.apm.network.trace.component.command;
-import org.apache.skywalking.apm.network.common.*;
+import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.KeyStringValuePair;
-/**
- * @author peng-yongsheng
- */
public abstract class BaseCommand {
private final String command;
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java
index 7824f49..ebf4e54 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java
@@ -19,9 +19,6 @@ package org.apache.skywalking.apm.network.trace.component.command;
import org.apache.skywalking.apm.network.common.Command;
-/**
- * @author kezhenxu94
- */
public class CommandDeserializer {
public static BaseCommand deserialize(final Command command) {
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java
index 8c8a00b..b91b838 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java
@@ -20,9 +20,6 @@ package org.apache.skywalking.apm.network.trace.component.command;
import org.apache.skywalking.apm.network.common.Command;
-/**
- * @author peng-yongsheng
- */
public interface Deserializable<T extends BaseCommand> {
T deserialize(Command command);
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java
index 83fc129..6dda8ff 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java
@@ -18,13 +18,12 @@
package org.apache.skywalking.apm.network.trace.component.command;
-import org.apache.skywalking.apm.network.common.*;
+import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.KeyStringValuePair;
/**
- * Remove the specified endpoint names from endpoint metadata cache, and re-register it.
- * If not specified, clear whole endpoint metadata cache.
- *
- * @author peng-yongsheng
+ * Remove the specified endpoint names from endpoint metadata cache, and re-register it. If not specified, clear whole
+ * endpoint metadata cache.
*/
public class EndpointResetCommand extends BaseCommand implements Serializable {
@@ -32,7 +31,8 @@ public class EndpointResetCommand extends BaseCommand implements Serializable {
super("EndpointMetadataReset", serialNumber);
}
- @Override public Command.Builder serialize() {
+ @Override
+ public Command.Builder serialize() {
return commandBuilder();
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java
index 7c06828..2e187d0 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java
@@ -22,8 +22,6 @@ import org.apache.skywalking.apm.network.common.Command;
/**
* Clear the service instance metadata cache, and re-register it.
- *
- * @author peng-yongsheng
*/
public class InstanceResetCommand extends BaseCommand implements Serializable {
@@ -31,7 +29,8 @@ public class InstanceResetCommand extends BaseCommand implements Serializable {
super("InstanceMetadataReset", serialNumber);
}
- @Override public Command.Builder serialize() {
+ @Override
+ public Command.Builder serialize() {
return commandBuilder();
}
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java
index 2faca48..04a41b8 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java
@@ -18,13 +18,12 @@
package org.apache.skywalking.apm.network.trace.component.command;
-import org.apache.skywalking.apm.network.common.*;
+import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.KeyStringValuePair;
/**
- * Remove the specified network addresses from network address metadata cache, and re-register it.
- * If not specified, clear whole network address metadata cache.
- *
- * @author peng-yongsheng
+ * Remove the specified network addresses from network address metadata cache, and re-register it. If not specified,
+ * clear whole network address metadata cache.
*/
public class NetworkResetCommand extends BaseCommand implements Serializable {
@@ -32,7 +31,8 @@ public class NetworkResetCommand extends BaseCommand implements Serializable {
super("NetworkAddressMetadataReset", serialNumber);
}
- @Override public Command.Builder serialize() {
+ @Override
+ public Command.Builder serialize() {
return commandBuilder();
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java
index f595fda..0bd6855 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java
@@ -23,9 +23,6 @@ import org.apache.skywalking.apm.network.common.KeyStringValuePair;
import java.util.List;
-/**
- * @author MrPro
- */
public class ProfileTaskCommand extends BaseCommand implements Serializable, Deserializable<ProfileTaskCommand> {
public static final Deserializable<ProfileTaskCommand> DESERIALIZER = new ProfileTaskCommand("", "", "", 0, 0, 0, 0, 0, 0);
public static final String NAME = "ProfileTaskQuery";
@@ -40,7 +37,8 @@ public class ProfileTaskCommand extends BaseCommand implements Serializable, Des
private long startTime;
private long createTime;
- public ProfileTaskCommand(String serialNumber, String taskId, String endpointName, int duration, int minDurationThreshold, int dumpPeriod, int maxSamplingCount, long startTime, long createTime) {
+ public ProfileTaskCommand(String serialNumber, String taskId, String endpointName, int duration,
+ int minDurationThreshold, int dumpPeriod, int maxSamplingCount, long startTime, long createTime) {
super(NAME, serialNumber);
this.taskId = taskId;
this.endpointName = endpointName;
@@ -94,13 +92,17 @@ public class ProfileTaskCommand extends BaseCommand implements Serializable, Des
public Command.Builder serialize() {
final Command.Builder builder = commandBuilder();
builder.addArgs(KeyStringValuePair.newBuilder().setKey("TaskId").setValue(taskId))
- .addArgs(KeyStringValuePair.newBuilder().setKey("EndpointName").setValue(endpointName))
- .addArgs(KeyStringValuePair.newBuilder().setKey("Duration").setValue(String.valueOf(duration)))
- .addArgs(KeyStringValuePair.newBuilder().setKey("MinDurationThreshold").setValue(String.valueOf(minDurationThreshold)))
- .addArgs(KeyStringValuePair.newBuilder().setKey("DumpPeriod").setValue(String.valueOf(dumpPeriod)))
- .addArgs(KeyStringValuePair.newBuilder().setKey("MaxSamplingCount").setValue(String.valueOf(maxSamplingCount)))
- .addArgs(KeyStringValuePair.newBuilder().setKey("StartTime").setValue(String.valueOf(startTime)))
- .addArgs(KeyStringValuePair.newBuilder().setKey("CreateTime").setValue(String.valueOf(createTime)));
+ .addArgs(KeyStringValuePair.newBuilder().setKey("EndpointName").setValue(endpointName))
+ .addArgs(KeyStringValuePair.newBuilder().setKey("Duration").setValue(String.valueOf(duration)))
+ .addArgs(KeyStringValuePair.newBuilder()
+ .setKey("MinDurationThreshold")
+ .setValue(String.valueOf(minDurationThreshold)))
+ .addArgs(KeyStringValuePair.newBuilder().setKey("DumpPeriod").setValue(String.valueOf(dumpPeriod)))
+ .addArgs(KeyStringValuePair.newBuilder()
+ .setKey("MaxSamplingCount")
+ .setValue(String.valueOf(maxSamplingCount)))
+ .addArgs(KeyStringValuePair.newBuilder().setKey("StartTime").setValue(String.valueOf(startTime)))
+ .addArgs(KeyStringValuePair.newBuilder().setKey("CreateTime").setValue(String.valueOf(createTime)));
return builder;
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java
index 9aaae54..20abf88 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java
@@ -20,9 +20,6 @@ package org.apache.skywalking.apm.network.trace.component.command;
import org.apache.skywalking.apm.network.common.Command;
-/**
- * @author peng-yongsheng
- */
public interface Serializable {
Command.Builder serialize();
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java
index 360c246..a80f822 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java
@@ -25,8 +25,6 @@ import java.util.List;
/**
* Clear the service metadata cache and other metadata caches belong to it, and re-register them.
- *
- * @author peng-yongsheng
*/
public class ServiceResetCommand extends BaseCommand implements Serializable, Deserializable<ServiceResetCommand> {
public static final Deserializable<ServiceResetCommand> DESERIALIZER = new ServiceResetCommand("");
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java
index 0a074f6..6bf9f59 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java
@@ -18,12 +18,11 @@
package org.apache.skywalking.apm.network.trace.component.command;
-import org.apache.skywalking.apm.network.common.*;
+import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.KeyStringValuePair;
/**
* Trace ignore sync, each configuration downstream is the full amount of data related to the received agent.
- *
- * @author peng-yongsheng
*/
public class TraceIgnoreCommand extends BaseCommand implements Serializable {
@@ -31,7 +30,8 @@ public class TraceIgnoreCommand extends BaseCommand implements Serializable {
super("TraceIgnore", serialNumber);
}
- @Override public Command.Builder serialize() {
+ @Override
+ public Command.Builder serialize() {
return commandBuilder();
}
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java
index d8265c8..b014da4 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java
@@ -19,9 +19,6 @@ package org.apache.skywalking.apm.network.trace.component.command;
import org.apache.skywalking.apm.network.common.Command;
-/**
- * @author kezhenxu94
- */
public class UnsupportedCommandException extends RuntimeException {
private final Command command;
diff --git a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java
index 91f128a..06af572 100644
--- a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java
+++ b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java
@@ -24,9 +24,6 @@ import org.apache.skywalking.apm.network.trace.component.command.ServiceResetCom
import org.junit.Assert;
import org.junit.Test;
-/**
- * @author jsbxyyx
- */
public class ServiceResetCommandTest {
@Test
@@ -43,8 +40,8 @@ public class ServiceResetCommandTest {
ServiceResetCommand command = new ServiceResetCommand("aa");
Command command1 = Command.newBuilder()
- .addArgs(KeyStringValuePair.newBuilder().setKey("aa").setValue("aa").build())
- .build();
+ .addArgs(KeyStringValuePair.newBuilder().setKey("aa").setValue("aa").build())
+ .build();
boolean exception = false;
try {
command.deserialize(command1);
@@ -59,8 +56,11 @@ public class ServiceResetCommandTest {
ServiceResetCommand command = new ServiceResetCommand("aa");
Command command2 = Command.newBuilder()
- .addArgs(KeyStringValuePair.newBuilder().setKey("SerialNumber").setValue("aa").build())
- .build();
+ .addArgs(KeyStringValuePair.newBuilder()
+ .setKey("SerialNumber")
+ .setValue("aa")
+ .build())
+ .build();
ServiceResetCommand deserialize2 = command.deserialize(command2);
Assert.assertEquals("aa", deserialize2.getSerialNumber());
}
diff --git a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
index d27914b..350f533 100644
--- a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
+++ b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.network.trace.proto;
import io.grpc.ManagedChannel;
@@ -27,33 +26,32 @@ import io.grpc.internal.DnsNameResolverProvider;
import io.grpc.netty.NettyChannelBuilder;
import io.grpc.stub.StreamObserver;
import org.apache.skywalking.apm.network.common.Commands;
+import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
import org.apache.skywalking.apm.network.language.agent.v2.TraceSegmentReportServiceGrpc;
import org.junit.Assert;
-import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
-/**
- * @author wusheng
- */
public class GRPCNoServerTest {
public static void main(String[] args) throws InterruptedException {
- ManagedChannelBuilder<?> channelBuilder =
- NettyChannelBuilder.forAddress("127.0.0.1", 8080)
- .nameResolverFactory(new DnsNameResolverProvider())
- .maxInboundMessageSize(1024 * 1024 * 50)
- .usePlaintext();
+ ManagedChannelBuilder<?> channelBuilder = NettyChannelBuilder.forAddress("127.0.0.1", 8080)
+ .nameResolverFactory(new DnsNameResolverProvider())
+ .maxInboundMessageSize(1024 * 1024 * 50)
+ .usePlaintext();
ManagedChannel channel = channelBuilder.build();
TraceSegmentReportServiceGrpc.TraceSegmentReportServiceStub serviceStub = TraceSegmentReportServiceGrpc.newStub(channel);
final Status[] status = {null};
StreamObserver<UpstreamSegment> streamObserver = serviceStub.collect(new StreamObserver<Commands>() {
- @Override public void onNext(Commands value) {
+ @Override
+ public void onNext(Commands value) {
}
- @Override public void onError(Throwable t) {
- status[0] = ((StatusRuntimeException)t).getStatus();
+ @Override
+ public void onError(Throwable t) {
+ status[0] = ((StatusRuntimeException) t).getStatus();
}
- @Override public void onCompleted() {
+ @Override
+ public void onCompleted() {
}
});
diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml
index 367b575..f5fd77e 100644
--- a/apm-protocol/pom.xml
+++ b/apm-protocol/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index 386bead..bb60cc0 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -181,7 +182,8 @@
</filter>
</filters>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
@@ -197,7 +199,7 @@
</goals>
<configuration>
<tasks>
- <delete dir="${project.basedir}/../../packages" />
+ <delete dir="${project.basedir}/../../packages"/>
</tasks>
</configuration>
</execution>
@@ -206,14 +208,22 @@
<phase>package</phase>
<configuration>
<target>
- <echo message="unjar" />
- <unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar" dest="${project.build.directory}/unpacked/" />
- <echo message="rename service providers in META-INF/services" />
- <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib" />
- <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so" />
- <move file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll" tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll" />
- <echo message="jar back" />
- <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar" basedir="${project.build.directory}/unpacked" />
+ <echo message="unjar"/>
+ <unzip src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ dest="${project.build.directory}/unpacked/"/>
+ <echo message="rename service providers in META-INF/services"/>
+ <move
+ file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
+ tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib"/>
+ <move
+ file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so"
+ tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so"/>
+ <move
+ file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll"
+ tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll"/>
+ <echo message="jar back"/>
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ basedir="${project.build.directory}/unpacked"/>
</target>
</configuration>
<goals>
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
index 11d8d65..02f3f46 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
@@ -15,6 +15,7 @@
* limitations under the License.
*
*/
+
package org.apache.skywalking.apm.agent.core.base64;
import java.nio.charset.StandardCharsets;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java
index 50ab184..b9249ba 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.boot;
-/**
- * @author wusheng
- */
public class AgentPackageNotFoundException extends Exception {
public AgentPackageNotFoundException(String message) {
super(message);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java
index f391a2e..b4bafe5 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.boot;
import java.net.URISyntaxException;
@@ -27,9 +26,6 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-/**
- * @author wusheng
- */
public class AgentPackagePath {
private static final ILog logger = LogManager.getLogger(AgentPackagePath.class);
@@ -63,9 +59,7 @@ public class AgentPackagePath {
File agentJarFile = null;
try {
agentJarFile = new File(new URL(urlString).toURI());
- } catch (MalformedURLException e) {
- logger.error(e, "Can not locate agent jar file by url:" + urlString);
- } catch (URISyntaxException e) {
+ } catch (MalformedURLException | URISyntaxException e) {
logger.error(e, "Can not locate agent jar file by url:" + urlString);
}
if (agentJarFile.exists()) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java
index 57932ca..eae8a5c 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.boot;
/**
- * The <code>BootService</code> is an interface to all remote, which need to boot when plugin mechanism begins to
- * work.
+ * The <code>BootService</code> is an interface to all remote, which need to boot when plugin mechanism begins to work.
* {@link #boot()} will be called when <code>BootService</code> start up.
- *
- * @author wusheng
*/
public interface BootService {
void prepare() throws Throwable;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java
index 11de381..0b5694f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java
@@ -23,9 +23,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-/**
- * @author wusheng
- */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface DefaultImplementor {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java
index 588ca9a..e255d94 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java
@@ -21,19 +21,18 @@ package org.apache.skywalking.apm.agent.core.boot;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
-/**
- * @author zhangkewei
- */
public class DefaultNamedThreadFactory implements ThreadFactory {
private static final AtomicInteger BOOT_SERVICE_SEQ = new AtomicInteger(0);
private final AtomicInteger threadSeq = new AtomicInteger(0);
private final String namePrefix;
+
public DefaultNamedThreadFactory(String name) {
namePrefix = "SkywalkingAgent-" + BOOT_SERVICE_SEQ.incrementAndGet() + "-" + name + "-";
}
+
@Override
public Thread newThread(Runnable r) {
- Thread t = new Thread(r,namePrefix + threadSeq.getAndIncrement());
+ Thread t = new Thread(r, namePrefix + threadSeq.getAndIncrement());
t.setDaemon(true);
return t;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java
index f3b6367..11e8464 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java
@@ -23,9 +23,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-/**
- * @author wusheng
- */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface OverrideImplementor {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java
index 5f8a9bd..a913322 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java
@@ -18,9 +18,6 @@
package org.apache.skywalking.apm.agent.core.boot;
-/**
- * @author wusheng
- */
public class ServiceConflictException extends RuntimeException {
public ServiceConflictException(String message) {
super(message);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java
index 638bcc6..97cc0e5 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java
@@ -19,7 +19,6 @@
package org.apache.skywalking.apm.agent.core.boot;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -30,10 +29,7 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
import org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader;
/**
- * The <code>ServiceManager</code> bases on {@link ServiceLoader},
- * load all {@link BootService} implementations.
- *
- * @author wusheng
+ * The <code>ServiceManager</code> bases on {@link ServiceLoader}, load all {@link BootService} implementations.
*/
public enum ServiceManager {
INSTANCE;
@@ -60,13 +56,10 @@ public enum ServiceManager {
}
private Map<Class, BootService> loadAllServices() {
- Map<Class, BootService> bootedServices = new LinkedHashMap<Class, BootService>();
- List<BootService> allServices = new LinkedList<BootService>();
+ Map<Class, BootService> bootedServices = new LinkedHashMap<>();
+ List<BootService> allServices = new LinkedList<>();
load(allServices);
- Iterator<BootService> serviceIterator = allServices.iterator();
- while (serviceIterator.hasNext()) {
- BootService bootService = serviceIterator.next();
-
+ for (final BootService bootService : allServices) {
Class<? extends BootService> bootServiceClass = bootService.getClass();
boolean isDefaultImplementor = bootServiceClass.isAnnotationPresent(DefaultImplementor.class);
if (isDefaultImplementor) {
@@ -86,12 +79,14 @@ public enum ServiceManager {
} else {
Class<? extends BootService> targetService = overrideImplementor.value();
if (bootedServices.containsKey(targetService)) {
- boolean presentDefault = bootedServices.get(targetService).getClass().isAnnotationPresent(DefaultImplementor.class);
+ boolean presentDefault = bootedServices.get(targetService)
+ .getClass()
+ .isAnnotationPresent(DefaultImplementor.class);
if (presentDefault) {
bootedServices.put(targetService, bootService);
} else {
- throw new ServiceConflictException("Service " + bootServiceClass + " overrides conflict, " +
- "exist more than one service want to override :" + targetService);
+ throw new ServiceConflictException(
+ "Service " + bootServiceClass + " overrides conflict, " + "exist more than one service want to override :" + targetService);
}
} else {
bootedServices.put(targetService, bootService);
@@ -137,17 +132,16 @@ public enum ServiceManager {
* Find a {@link BootService} implementation, which is already started.
*
* @param serviceClass class name.
- * @param <T> {@link BootService} implementation class.
+ * @param <T> {@link BootService} implementation class.
* @return {@link BootService} instance
*/
public <T extends BootService> T findService(Class<T> serviceClass) {
- return (T)bootedServices.get(serviceClass);
+ return (T) bootedServices.get(serviceClass);
}
void load(List<BootService> allServices) {
- Iterator<BootService> iterator = ServiceLoader.load(BootService.class, AgentClassLoader.getDefault()).iterator();
- while (iterator.hasNext()) {
- allServices.add(iterator.next());
+ for (final BootService bootService : ServiceLoader.load(BootService.class, AgentClassLoader.getDefault())) {
+ allServices.add(bootService);
}
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java
index e8b6e1e..311239d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java
@@ -21,16 +21,12 @@ import org.apache.skywalking.apm.network.common.Command;
/**
* Indicates that the execution of a command failed
- *
- * @author Zhang Xin
- * @author kezhenxu94
*/
public class CommandExecutionException extends Throwable {
private final Command command;
/**
- * Constructs a new {@code ExecuteFailedException} with null detail message
- * and the command whose execution failed
+ * Constructs a new {@code ExecuteFailedException} with null detail message and the command whose execution failed
*
* @param command the command whose execution failed
*/
@@ -39,8 +35,7 @@ public class CommandExecutionException extends Throwable {
}
/**
- * Constructs a new {@code ExecuteFailedException} with given detail message
- * and the command whose execution failed
+ * Constructs a new {@code ExecuteFailedException} with given detail message and the command whose execution failed
*
* @param message the detail message of the exception
* @param command the command whose execution failed
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java
index 58fc449..1a60706 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java
@@ -20,11 +20,8 @@ package org.apache.skywalking.apm.agent.core.commands;
import org.apache.skywalking.apm.network.trace.component.command.BaseCommand;
/**
- * Command executor that can handle a given command, implementations are required to be stateless,
- * i.e. the previous execution of a command cannot affect the next execution of another command.
- *
- * @author Zhang Xin
- * @author kezhenxu94
+ * Command executor that can handle a given command, implementations are required to be stateless, i.e. the previous
+ * execution of a command cannot affect the next execution of another command.
*/
public interface CommandExecutor {
/**
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java
index 09db961..7ce5727 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java
@@ -30,16 +30,11 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Command executor service, acts like a routing executor that controls all commands' execution,
- * is responsible for managing all the mappings between commands and their executors,
- * one can simply invoke {@link #execute(BaseCommand)} and it will routes the
- * command to corresponding executor.
- *
- * Registering command executor for new command in {@link #commandExecutorMap}
- * is required to support new command.
- *
- * @author Zhang Xin
- * @author kezhenxu94
+ * Command executor service, acts like a routing executor that controls all commands' execution, is responsible for
+ * managing all the mappings between commands and their executors, one can simply invoke {@link #execute(BaseCommand)}
+ * and it will routes the command to corresponding executor.
+ * <p>
+ * Registering command executor for new command in {@link #commandExecutorMap} is required to support new command.
*/
@DefaultImplementor
public class CommandExecutorService implements BootService, CommandExecutor {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java
index 966ea58..14c03a5 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java
@@ -20,9 +20,6 @@ package org.apache.skywalking.apm.agent.core.commands;
import java.util.Deque;
import java.util.concurrent.LinkedBlockingDeque;
-/**
- * @author Zhang Xin
- */
public class CommandSerialNumberCache {
private static final int DEFAULT_MAX_CAPACITY = 64;
private final Deque<String> queue;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java
index cde041f..ed18f84 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java
@@ -111,8 +111,8 @@ public class CommandService implements BootService, Runnable {
boolean success = this.commands.offer(baseCommand);
if (!success && LOGGER.isWarnEnable()) {
- LOGGER.warn("Command[{}, {}] cannot add to command list. because the command list is full.",
- baseCommand.getCommand(), baseCommand.getSerialNumber());
+ LOGGER.warn("Command[{}, {}] cannot add to command list. because the command list is full.", baseCommand
+ .getCommand(), baseCommand.getSerialNumber());
}
} catch (UnsupportedCommandException e) {
if (LOGGER.isWarnEnable()) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java
index eb6212c..f2838d6 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java
@@ -28,8 +28,6 @@ import org.apache.skywalking.apm.network.trace.component.command.ProfileTaskComm
/**
* Command executor that executes the {@link ProfileTaskCommand} command
- *
- * @author MrPro
*/
public class ProfileTaskCommandExecutor implements CommandExecutor {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java
index 99f2b64..4443ffb 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java
@@ -32,9 +32,6 @@ import org.apache.skywalking.apm.network.trace.component.command.ServiceResetCom
/**
* Command executor that executes the {@link ServiceResetCommand} command
- *
- * @author Zhang Xin
- * @author kezhenxu94
*/
public class ServiceResetCommandExecutor implements CommandExecutor {
private static final ILog LOGGER = LogManager.getLogger(ServiceResetCommandExecutor.class);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index d356e2b..ee4f87e 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.conf;
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
@@ -29,8 +28,6 @@ import java.util.Map;
/**
* This is the core config in sniffer agent.
- *
- * @author wusheng
*/
public class Config {
@@ -135,7 +132,8 @@ public class Config {
public static class Profile {
/**
- * If true, skywalking agent will enable profile when user create a new profile task. Otherwise disable profile.
+ * If true, skywalking agent will enable profile when user create a new profile task. Otherwise disable
+ * profile.
*/
public static boolean ACTIVE = true;
@@ -189,9 +187,9 @@ public class Config {
public static String FILE_NAME = "skywalking-api.log";
/**
- * Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs " to output logs.
+ * Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs " to output logs.
* {theSkywalkingAgentJarDir} is the directory where the skywalking agent jar file is located.
- *
+ * <p>
* Ref to {@link WriterFactory#getLogWriter()}
*/
public static String DIR = "";
@@ -203,8 +201,8 @@ public class Config {
public static int MAX_FILE_SIZE = 300 * 1024 * 1024;
/**
- * The max history log files. When rollover happened, if log files exceed this number,
- * then the oldest file will be delete. Negative or zero means off, by default.
+ * The max history log files. When rollover happened, if log files exceed this number, then the oldest file will
+ * be delete. Negative or zero means off, by default.
*/
public static int MAX_HISTORY_FILES = -1;
@@ -247,7 +245,7 @@ public class Config {
/**
* For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only
* the first {@code FILTER_LENGTH_LIMIT} characters.
- *
+ * <p>
* Set a negative number to save the complete parameter string to the tag.
*/
public static int FILTER_LENGTH_LIMIT = 256;
@@ -275,8 +273,7 @@ public class Config {
public static class Tomcat {
/**
- * This config item controls that whether the Tomcat plugin should
- * collect the parameters of the request.
+ * This config item controls that whether the Tomcat plugin should collect the parameters of the request.
*/
public static boolean COLLECT_HTTP_PARAMS = false;
}
@@ -289,8 +286,8 @@ public class Config {
public static boolean USE_QUALIFIED_NAME_AS_ENDPOINT_NAME = false;
/**
- * This config item controls that whether the SpringMVC plugin should
- * collect the parameters of the request.
+ * This config item controls that whether the SpringMVC plugin should collect the parameters of the
+ * request.
*/
public static boolean COLLECT_HTTP_PARAMS = false;
}
@@ -312,7 +309,7 @@ public class Config {
/**
* For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only
* the first {@code SQL_PARAMETERS_MAX_LENGTH} characters.
- *
+ * <p>
* Set a negative number to save the complete parameter string to the tag.
*/
public static int SQL_PARAMETERS_MAX_LENGTH = 512;
@@ -328,7 +325,7 @@ public class Config {
/**
* For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only
* the first {@code SQL_PARAMETERS_MAX_LENGTH} characters.
- *
+ * <p>
* Set a negative number to save the complete parameter string to the tag.
*/
public static int SQL_PARAMETERS_MAX_LENGTH = 512;
@@ -357,9 +354,9 @@ public class Config {
*
* Keep this commented, just as a reminder that, it will be reused in a RPC server side plugin.
*/
-// public static class RestTemplate implements OPGroupDefinition {
-// public static Map<String, String> RULE = new HashMap<String, String>();
-// }
+ // public static class RestTemplate implements OPGroupDefinition {
+ // public static Map<String, String> RULE = new HashMap<String, String>();
+ // }
}
public static class Light4J {
@@ -381,20 +378,18 @@ public class Config {
public static class JdkThreading {
/**
- * Threading classes ({@link java.lang.Runnable} and {@link java.util.concurrent.Callable}
- * and their subclasses, including anonymous inner classes)
- * whose name matches any one of the {@code THREADING_CLASS_PREFIXES} (splitted by ,)
- * will be instrumented
+ * Threading classes ({@link java.lang.Runnable} and {@link java.util.concurrent.Callable} and their
+ * subclasses, including anonymous inner classes) whose name matches any one of the {@code
+ * THREADING_CLASS_PREFIXES} (splitted by ,) will be instrumented
*/
public static String THREADING_CLASS_PREFIXES = "";
}
public static class Http {
/**
- * When either {@link Tomcat#COLLECT_HTTP_PARAMS} or {@link SpringMVC#COLLECT_HTTP_PARAMS}
- * is enabled, how many characters to keep and send to the OAP backend,
- * use negative values to keep and send the complete parameters,
- * NB. this config item is added for the sake of performance
+ * When either {@link Tomcat#COLLECT_HTTP_PARAMS} or {@link SpringMVC#COLLECT_HTTP_PARAMS} is enabled, how
+ * many characters to keep and send to the OAP backend, use negative values to keep and send the complete
+ * parameters, NB. this config item is added for the sake of performance
*/
public static int HTTP_PARAMS_LENGTH_THRESHOLD = 1024;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java
index 93d9d01..d4997c3 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.conf;
-/**
- * @author wusheng
- */
public class ConfigNotFoundException extends Exception {
public ConfigNotFoundException(String message, Throwable cause) {
super(message, cause);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java
deleted file mode 100644
index 00a5ca9..0000000
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.apm.agent.core.conf;
-
-public class ConfigReadFailedException extends Exception {
- public ConfigReadFailedException(String message, Throwable parent) {
- super(message, parent);
- }
-}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java
index 8d8ae12..98baf0d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.conf;
public class Constants {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java
index 6042054..ccffb61 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java
@@ -18,8 +18,5 @@
package org.apache.skywalking.apm.agent.core.conf;
-/**
- * @author wusheng
- */
public interface OPGroupDefinition {
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java
index 210601b..bd27b98 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java
@@ -16,16 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.conf;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
/**
- * The <code>RemoteDownstreamConfig</code> includes configurations from collector side.
- * All of them initialized null, Null-Value or empty collection.
- *
- * @author wusheng
+ * The <code>RemoteDownstreamConfig</code> includes configurations from collector side. All of them initialized null,
+ * Null-Value or empty collection.
*/
public class RemoteDownstreamConfig {
public static class Agent {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
index 9d8d960..1c0d24e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
@@ -18,7 +18,16 @@
package org.apache.skywalking.apm.agent.core.conf;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException;
import org.apache.skywalking.apm.agent.core.boot.AgentPackagePath;
import org.apache.skywalking.apm.agent.core.logging.api.ILog;
@@ -27,13 +36,8 @@ import org.apache.skywalking.apm.util.ConfigInitializer;
import org.apache.skywalking.apm.util.PropertyPlaceholderHelper;
import org.apache.skywalking.apm.util.StringUtil;
-import java.io.*;
-import java.util.*;
-
/**
* The <code>SnifferConfigInitializer</code> initializes all configs in several way.
- *
- * @author wusheng
*/
public class SnifferConfigInitializer {
private static final ILog logger = LogManager.getLogger(SnifferConfigInitializer.class);
@@ -47,9 +51,9 @@ public class SnifferConfigInitializer {
* specified agent config path is not set , the agent will try to locate `agent.config`, which should be in the
* /config directory of agent package.
* <p>
- * Also try to override the config by system.properties. All the keys in this place should
- * start with {@link #ENV_KEY_PREFIX}. e.g. in env `skywalking.agent.service_name=yourAppName` to override
- * `agent.service_name` in config file.
+ * Also try to override the config by system.properties. All the keys in this place should start with {@link
+ * #ENV_KEY_PREFIX}. e.g. in env `skywalking.agent.service_name=yourAppName` to override `agent.service_name` in
+ * config file.
* <p>
* At the end, `agent.service_name` and `collector.servers` must not be blank.
*/
@@ -58,7 +62,7 @@ public class SnifferConfigInitializer {
Properties properties = new Properties();
properties.load(configFileStream);
for (String key : properties.stringPropertyNames()) {
- String value = (String)properties.get(key);
+ String value = (String) properties.get(key);
properties.put(key, PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value, properties));
}
ConfigInitializer.initialize(properties, Config.class);
@@ -142,11 +146,10 @@ public class SnifferConfigInitializer {
}
/**
- * Override the config by system properties. The property key must start with `skywalking`, the result should be as same
- * as in `agent.config`
+ * Override the config by system properties. The property key must start with `skywalking`, the result should be as
+ * same as in `agent.config`
* <p>
* such as: Property key of `agent.service_name` should be `skywalking.agent.service_name`
- *
*/
private static void overrideConfigBySystemProp() throws IllegalAccessException {
Properties properties = new Properties();
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
index 6c76873..7ce1c59 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java
@@ -22,8 +22,6 @@ import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
/**
* The <code>AbstractTracerContext</code> represents the tracer context manager.
- *
- * @author wusheng
*/
public interface AbstractTracerContext {
/**
@@ -84,7 +82,7 @@ public interface AbstractTracerContext {
* Create an exit span
*
* @param operationName most likely a service name of remote
- * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.)
+ * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.)
* @return the span represent an exit point of this segment.
*/
AbstractSpan createExitSpan(String operationName, String remotePeer);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java
index 8e2483e..e65287f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java
@@ -22,23 +22,20 @@ import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
/**
* Span could use these APIs to active and extend its lift cycle across thread.
- *
+ * <p>
* This is typical used in async plugin, especially RPC plugins.
- *
- * @author wusheng
*/
public interface AsyncSpan {
/**
* The span finish at current tracing context, but the current span is still alive, until {@link #asyncFinish}
* called.
- *
+ * <p>
* This method must be called
- *
- * 1. In original thread(tracing context).
- * 2. Current span is active span.
- *
+ * <p>
+ * 1. In original thread(tracing context). 2. Current span is active span.
+ * <p>
* During alive, tags, logs and attributes of the span could be changed, in any thread.
- *
+ * <p>
* The execution times of {@link #prepareForAsync} and {@link #asyncFinish()} must match.
*
* @return the current span
@@ -47,7 +44,7 @@ public interface AsyncSpan {
/**
* Notify the span, it could be finished.
- *
+ * <p>
* The execution times of {@link #prepareForAsync} and {@link #asyncFinish()} must match.
*
* @return the current span
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java
index 8cb146f..bc1c1d2 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java
@@ -23,9 +23,6 @@ import org.apache.skywalking.apm.util.StringUtil;
import static org.apache.skywalking.apm.agent.core.conf.Config.Agent.NAMESPACE;
-/**
- * @author wusheng
- */
public class CarrierItem implements Iterator<CarrierItem> {
private String headKey;
private String headValue;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java
index d5a8551..f04a661 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context;
-/**
- * @author wusheng
- */
public class CarrierItemHead extends CarrierItem {
public CarrierItemHead(CarrierItem next) {
super("", "", next);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
index 03eaf05..fd3e079 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
@@ -31,7 +31,6 @@ import org.apache.skywalking.apm.util.StringUtil;
* {@link ContextCarrier} is a data carrier of {@link TracingContext}. It holds the snapshot (current state) of {@link
* TracingContext}.
* <p>
- * Created by wusheng on 2017/2/17.
*/
public class ContextCarrier implements Serializable {
private ID traceSegmentId;
@@ -83,7 +82,8 @@ public class ContextCarrier implements Serializable {
*/
String serialize(HeaderVersion version) {
if (this.isValid(version)) {
- return StringUtil.join('-',
+ return StringUtil.join(
+ '-',
"1",
Base64.encode(this.getPrimaryDistributedTraceId().encode()),
Base64.encode(this.getTraceSegmentId().encode()),
@@ -92,7 +92,8 @@ public class ContextCarrier implements Serializable {
this.getEntryServiceInstanceId() + "",
Base64.encode(this.getPeerHost()),
Base64.encode(this.getEntryEndpointName()),
- Base64.encode(this.getParentEndpointName()));
+ Base64.encode(this.getParentEndpointName())
+ );
}
return "";
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
index 9a0dfa6..d609492 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
@@ -18,11 +18,14 @@
package org.apache.skywalking.apm.agent.core.context;
-import org.apache.skywalking.apm.agent.core.boot.*;
+import org.apache.skywalking.apm.agent.core.boot.BootService;
+import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig;
-import org.apache.skywalking.apm.agent.core.context.trace.*;
+import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
-import org.apache.skywalking.apm.agent.core.logging.api.*;
+import org.apache.skywalking.apm.agent.core.logging.api.ILog;
+import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
import org.apache.skywalking.apm.agent.core.sampling.SamplingService;
import org.apache.skywalking.apm.util.StringUtil;
@@ -35,8 +38,6 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Agent.OPERATION_N
* https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans
*
* <p> Also, {@link ContextManager} delegates to all {@link AbstractTracerContext}'s major methods.
- *
- * @author wusheng
*/
public class ContextManager implements BootService {
private static final ILog logger = LogManager.getLogger(ContextManager.class);
@@ -54,14 +55,13 @@ public class ContextManager implements BootService {
context = new IgnoredTracerContext();
} else {
if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue()
- && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()
- ) {
+ && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()) {
if (EXTEND_SERVICE == null) {
EXTEND_SERVICE = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
}
context = EXTEND_SERVICE.createTraceContext(operationName, forceSampling);
} else {
- /**
+ /*
* Can't register to collector, no need to trace anything.
*/
context = new IgnoredTracerContext();
@@ -125,8 +125,7 @@ public class ContextManager implements BootService {
public static AbstractSpan createExitSpan(String operationName, String remotePeer) {
operationName = StringUtil.cut(operationName, OPERATION_NAME_THRESHOLD);
AbstractTracerContext context = getOrCreate(operationName, false);
- AbstractSpan span = context.createExitSpan(operationName, remotePeer);
- return span;
+ return context.createExitSpan(operationName, remotePeer);
}
public static void inject(ContextCarrier carrier) {
@@ -165,21 +164,21 @@ public class ContextManager implements BootService {
}
/**
- * If not sure has the active span, use this method, will be cause NPE when has no active span,
- * use ContextManager::isActive method to determine whether there has the active span.
+ * If not sure has the active span, use this method, will be cause NPE when has no active span, use
+ * ContextManager::isActive method to determine whether there has the active span.
*/
public static AbstractSpan activeSpan() {
return get().activeSpan();
}
/**
- * Recommend use ContextManager::stopSpan(AbstractSpan span), because in that way,
- * the TracingContext core could verify this span is the active one, in order to avoid stop unexpected span.
- * If the current span is hard to get or only could get by low-performance way, this stop way is still acceptable.
- */
+ * Recommend use ContextManager::stopSpan(AbstractSpan span), because in that way, the TracingContext core could
+ * verify this span is the active one, in order to avoid stop unexpected span. If the current span is hard to get or
+ * only could get by low-performance way, this stop way is still acceptable.
+ */
public static void stopSpan() {
final AbstractTracerContext context = get();
- stopSpan(context.activeSpan(),context);
+ stopSpan(context.activeSpan(), context);
}
public static void stopSpan(AbstractSpan span) {
@@ -194,7 +193,7 @@ public class ContextManager implements BootService {
}
@Override
- public void prepare() throws Throwable {
+ public void prepare() {
}
@@ -203,11 +202,12 @@ public class ContextManager implements BootService {
}
@Override
- public void onComplete() throws Throwable {
+ public void onComplete() {
}
- @Override public void shutdown() throws Throwable {
+ @Override
+ public void shutdown() {
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java
index 1331f62..cad1afb 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java
@@ -18,28 +18,31 @@
package org.apache.skywalking.apm.agent.core.context;
-import org.apache.skywalking.apm.agent.core.boot.*;
+import org.apache.skywalking.apm.agent.core.boot.BootService;
+import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor;
+import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.agent.core.sampling.SamplingService;
-/**
- * @author wusheng
- */
@DefaultImplementor
public class ContextManagerExtendService implements BootService {
- @Override public void prepare() {
+ @Override
+ public void prepare() {
}
- @Override public void boot() {
+ @Override
+ public void boot() {
}
- @Override public void onComplete() {
+ @Override
+ public void onComplete() {
}
- @Override public void shutdown() {
+ @Override
+ public void shutdown() {
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
index 0898d0a..ec8d08d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
@@ -26,8 +26,6 @@ import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
/**
* The <code>ContextSnapshot</code> is a snapshot for current context. The snapshot carries the info for building
* reference between two segments in two thread, but have a causal relationship.
- *
- * @author wusheng
*/
public class ContextSnapshot {
/**
@@ -51,8 +49,7 @@ public class ContextSnapshot {
private int entryApplicationInstanceId = DictionaryUtil.nullValue();
- ContextSnapshot(ID traceSegmentId, int spanId,
- List<DistributedTraceId> distributedTraceIds) {
+ ContextSnapshot(ID traceSegmentId, int spanId, List<DistributedTraceId> distributedTraceIds) {
this.traceSegmentId = traceSegmentId;
this.spanId = spanId;
if (distributedTraceIds != null) {
@@ -93,10 +90,7 @@ public class ContextSnapshot {
}
public boolean isValid() {
- return traceSegmentId != null
- && spanId > -1
- && entryApplicationInstanceId != DictionaryUtil.nullValue()
- && primaryDistributedTraceId != null;
+ return traceSegmentId != null && spanId > -1 && entryApplicationInstanceId != DictionaryUtil.nullValue() && primaryDistributedTraceId != null;
}
public String getEntryOperationName() {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java
index 143a07b..4ef1c6a 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context;
-/**
- * @author wusheng
- */
public interface IgnoreTracerContextListener {
void afterFinished(IgnoredTracerContext traceSegment);
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
index 59bc05c..1a5d8c6 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java
@@ -18,16 +18,16 @@
package org.apache.skywalking.apm.agent.core.context;
-import java.util.*;
-import org.apache.skywalking.apm.agent.core.context.trace.*;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.NoopSpan;
/**
* The <code>IgnoredTracerContext</code> represent a context should be ignored. So it just maintains the stack with an
* integer depth field.
- *
+ * <p>
* All operations through this will be ignored, and keep the memory and gc cost as low as possible.
- *
- * @author wusheng
*/
public class IgnoredTracerContext implements AbstractTracerContext {
private static final NoopSpan NOOP_SPAN = new NoopSpan();
@@ -48,11 +48,13 @@ public class IgnoredTracerContext implements AbstractTracerContext {
}
- @Override public ContextSnapshot capture() {
+ @Override
+ public ContextSnapshot capture() {
return new ContextSnapshot(null, -1, null);
}
- @Override public void continued(ContextSnapshot snapshot) {
+ @Override
+ public void continued(ContextSnapshot snapshot) {
}
@@ -93,16 +95,18 @@ public class IgnoredTracerContext implements AbstractTracerContext {
return stackDepth == 0;
}
- @Override public AbstractTracerContext awaitFinishAsync() {
+ @Override
+ public AbstractTracerContext awaitFinishAsync() {
return this;
}
- @Override public void asyncStop(AsyncSpan span) {
+ @Override
+ public void asyncStop(AsyncSpan span) {
}
public static class ListenerManager {
- private static List<IgnoreTracerContextListener> LISTENERS = new LinkedList<IgnoreTracerContextListener>();
+ private static List<IgnoreTracerContextListener> LISTENERS = new LinkedList<>();
/**
* Add the given {@link IgnoreTracerContextListener} to {@link #LISTENERS} list.
@@ -117,8 +121,6 @@ public class IgnoredTracerContext implements AbstractTracerContext {
* Notify the {@link IgnoredTracerContext.ListenerManager} about the given {@link IgnoredTracerContext} have
* finished. And trigger {@link IgnoredTracerContext.ListenerManager} to notify all {@link #LISTENERS} 's {@link
* IgnoreTracerContextListener#afterFinished(IgnoredTracerContext)}
- *
- * @param ignoredTracerContext
*/
static void notifyFinish(IgnoredTracerContext ignoredTracerContext) {
for (IgnoreTracerContextListener listener : LISTENERS) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java
index 6fef376..210201f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java
@@ -29,17 +29,16 @@ import org.apache.skywalking.apm.util.StringFormatGroup;
/**
* Support operation name format by config. Every plugin could declare its own rule to avoid performance concerns.
- *
+ * <p>
* Right now, the rule is REGEX based, it definitely has much space to optimize, because basically, only `*` is required
* to be supported.
- *
- * @author wusheng
*/
@DefaultImplementor
public class OperationNameFormatService implements BootService {
private static final Map<Class, StringFormatGroup> RULES = new ConcurrentHashMap<Class, StringFormatGroup>();
- @Override public void prepare() throws Throwable {
+ @Override
+ public void prepare() throws Throwable {
for (Class<?> ruleName : Config.Plugin.OPGroup.class.getClasses()) {
if (!OPGroupDefinition.class.isAssignableFrom(ruleName)) {
continue;
@@ -51,7 +50,7 @@ public class OperationNameFormatService implements BootService {
}
for (Field ruleNameField : ruleName.getFields()) {
if (ruleNameField.getType().equals(Map.class)) {
- Map<String, String> rule = (Map<String, String>)ruleNameField.get(null);
+ Map<String, String> rule = (Map<String, String>) ruleNameField.get(null);
for (Map.Entry<String, String> entry : rule.entrySet()) {
formatGroup.addRule(entry.getKey(), entry.getValue());
}
@@ -60,15 +59,18 @@ public class OperationNameFormatService implements BootService {
}
}
- @Override public void boot() throws Throwable {
+ @Override
+ public void boot() {
}
- @Override public void onComplete() throws Throwable {
+ @Override
+ public void onComplete() {
}
- @Override public void shutdown() throws Throwable {
+ @Override
+ public void shutdown() {
}
@@ -76,7 +78,7 @@ public class OperationNameFormatService implements BootService {
* Format the operation name based on group rules
*
* @param definition in the Config
- * @param opName represents the operation name literal string
+ * @param opName represents the operation name literal string
* @return format string if rule matched or the given opName
*/
public String formatOperationName(Class<? extends OPGroupDefinition> definition, String opName) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java
index a96098f..23999ed 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java
@@ -25,16 +25,14 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.skywalking.apm.agent.core.conf.RuntimeContextConfiguration;
/**
- * RuntimeContext is alive during the tracing context.
- * It will not be serialized to the collector, and always stays in the same context only.
- *
+ * RuntimeContext is alive during the tracing context. It will not be serialized to the collector, and always stays in
+ * the same context only.
+ * <p>
* In most cases, it means it only stays in a single thread for context propagation.
- *
- * @author wusheng, ascrutae
*/
public class RuntimeContext {
private final ThreadLocal<RuntimeContext> contextThreadLocal;
- private Map context = new ConcurrentHashMap(0);
+ private Map<Object, Object> context = new ConcurrentHashMap<>(0);
public RuntimeContext(ThreadLocal<RuntimeContext> contextThreadLocal) {
this.contextThreadLocal = contextThreadLocal;
@@ -48,8 +46,9 @@ public class RuntimeContext {
return context.get(key);
}
+ @SuppressWarnings("unchecked")
public <T> T get(Object key, Class<T> type) {
- return (T)context.get(key);
+ return (T) context.get(key);
}
public void remove(Object key) {
@@ -61,7 +60,7 @@ public class RuntimeContext {
}
public RuntimeContextSnapshot capture() {
- Map runtimeContextMap = new HashMap();
+ Map<Object, Object> runtimeContextMap = new HashMap<>();
for (String key : RuntimeContextConfiguration.NEED_PROPAGATE_CONTEXT_KEY) {
Object value = this.get(key);
if (value != null) {
@@ -73,9 +72,9 @@ public class RuntimeContext {
}
public void accept(RuntimeContextSnapshot snapshot) {
- Iterator<Map.Entry> iterator = snapshot.iterator();
+ Iterator<Map.Entry<Object, Object>> iterator = snapshot.iterator();
while (iterator.hasNext()) {
- Map.Entry runtimeContextItem = iterator.next();
+ Map.Entry<Object, Object> runtimeContextItem = iterator.next();
ContextManager.getRuntimeContext().put(runtimeContextItem.getKey(), runtimeContextItem.getValue());
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java
index 5bc2037..0127388 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java
@@ -23,13 +23,13 @@ import java.util.Iterator;
import java.util.Map;
public class RuntimeContextSnapshot {
- private final Map map;
+ private final Map<Object, Object> map;
- public RuntimeContextSnapshot(Map map) {
+ public RuntimeContextSnapshot(Map<Object, Object> map) {
this.map = map;
}
- public Iterator<Map.Entry> iterator() {
+ public Iterator<Map.Entry<Object, Object>> iterator() {
return map.entrySet().iterator();
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java
index 8068fdf..f071b05 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java
@@ -18,9 +18,6 @@
package org.apache.skywalking.apm.agent.core.context;
-/**
- * @author wusheng
- */
public class SW6CarrierItem extends CarrierItem {
public static final String HEADER_NAME = "sw6";
private ContextCarrier carrier;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java
index 717e02b..fdf148d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java
@@ -46,16 +46,13 @@ import org.apache.skywalking.apm.util.StringUtil;
/**
* The <code>TracingContext</code> represents a core tracing logic controller. It build the final {@link
* TracingContext}, by the stack mechanism, which is similar with the codes work.
- *
+ * <p>
* In opentracing concept, it means, all spans in a segment tracing context(thread) are CHILD_OF relationship, but no
* FOLLOW_OF.
- *
+ * <p>
* In skywalking core concept, FOLLOW_OF is an abstract concept when cross-process MQ or cross-thread async/batch tasks
* happen, we used {@link TraceSegmentRef} for these scenarios. Check {@link TraceSegmentRef} which is from {@link
* ContextCarrier} or {@link ContextSnapshot}.
- *
- * @author wusheng
- * @author zhang xin
*/
public class TracingContext implements AbstractTracerContext {
private static final ILog logger = LogManager.getLogger(TracingContext.class);
@@ -132,8 +129,7 @@ public class TracingContext implements AbstractTracerContext {
* Inject the context into the given carrier, only when the active span is an exit one.
*
* @param carrier to carry the context for crossing process.
- * @throws IllegalStateException if the active span isn't an exit one. Ref to {@link
- * AbstractTracerContext#inject(ContextCarrier)}
+ * @throws IllegalStateException if the active span isn't an exit one. Ref to {@link AbstractTracerContext#inject(ContextCarrier)}
*/
@Override
public void inject(ContextCarrier carrier) {
@@ -142,7 +138,7 @@ public class TracingContext implements AbstractTracerContext {
throw new IllegalStateException("Inject can be done only in Exit Span");
}
- WithPeerInfo spanWithPeer = (WithPeerInfo)span;
+ WithPeerInfo spanWithPeer = (WithPeerInfo) span;
String peer = spanWithPeer.getPeer();
int peerId = spanWithPeer.getPeerId();
@@ -218,8 +214,7 @@ public class TracingContext implements AbstractTracerContext {
/**
* Extract the carrier to build the reference for the pre segment.
*
- * @param carrier carried the context from a cross-process segment. Ref to {@link
- * AbstractTracerContext#extract(ContextCarrier)}
+ * @param carrier carried the context from a cross-process segment. Ref to {@link AbstractTracerContext#extract(ContextCarrier)}
*/
@Override
public void extract(ContextCarrier carrier) {
@@ -240,9 +235,7 @@ public class TracingContext implements AbstractTracerContext {
@Override
public ContextSnapshot capture() {
List<TraceSegmentRef> refs = this.segment.getRefs();
- ContextSnapshot snapshot = new ContextSnapshot(segment.getTraceSegmentId(),
- activeSpan().getSpanId(),
- segment.getRelatedGlobalTraces());
+ ContextSnapshot snapshot = new ContextSnapshot(segment.getTraceSegmentId(), activeSpan().getSpanId(), segment.getRelatedGlobalTraces());
int entryOperationId;
String entryOperationName = "";
int entryApplicationInstanceId;
@@ -337,16 +330,17 @@ public class TracingContext implements AbstractTracerContext {
final AbstractSpan parentSpan = peek();
final int parentSpanId = parentSpan == null ? -1 : parentSpan.getSpanId();
if (parentSpan != null && parentSpan.isEntry()) {
- entrySpan = (AbstractTracingSpan)DictionaryManager.findEndpointSection()
- .findOnly(segment.getServiceId(), operationName)
- .doInCondition(parentSpan::setOperationId, () -> parentSpan.setOperationName(operationName));
+ entrySpan = (AbstractTracingSpan) DictionaryManager.findEndpointSection()
+ .findOnly(segment.getServiceId(), operationName)
+ .doInCondition(parentSpan::setOperationId, () -> parentSpan
+ .setOperationName(operationName));
return entrySpan.start();
} else {
- entrySpan = (AbstractTracingSpan)DictionaryManager.findEndpointSection()
- .findOnly(segment.getServiceId(), operationName)
- .doInCondition(operationId -> new EntrySpan(spanIdGenerator++, parentSpanId, operationId, owner), () -> {
- return new EntrySpan(spanIdGenerator++, parentSpanId, operationName, owner);
- });
+ entrySpan = (AbstractTracingSpan) DictionaryManager.findEndpointSection()
+ .findOnly(segment.getServiceId(), operationName)
+ .doInCondition(operationId -> new EntrySpan(spanIdGenerator++, parentSpanId, operationId, owner), () -> {
+ return new EntrySpan(spanIdGenerator++, parentSpanId, operationName, owner);
+ });
entrySpan.start();
return push(entrySpan);
}
@@ -379,7 +373,7 @@ public class TracingContext implements AbstractTracerContext {
* Create an exit span
*
* @param operationName most likely a service name of remote
- * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.)
+ * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.)
* @return the span represent an exit point of this segment.
* @see ExitSpan
*/
@@ -397,12 +391,11 @@ public class TracingContext implements AbstractTracerContext {
exitSpan = parentSpan;
} else {
final int parentSpanId = parentSpan == null ? -1 : parentSpan.getSpanId();
- exitSpan = (AbstractSpan)DictionaryManager.findNetworkAddressSection()
- .find(remotePeer).doInCondition(
- peerId -> new ExitSpan(spanIdGenerator++, parentSpanId, operationName, peerId, owner),
- () -> {
- return new ExitSpan(spanIdGenerator++, parentSpanId, operationName, remotePeer, owner);
- });
+ exitSpan = (AbstractSpan) DictionaryManager.findNetworkAddressSection()
+ .find(remotePeer)
+ .doInCondition(peerId -> new ExitSpan(spanIdGenerator++, parentSpanId, operationName, peerId, owner), () -> {
+ return new ExitSpan(spanIdGenerator++, parentSpanId, operationName, remotePeer, owner);
+ });
push(exitSpan);
}
exitSpan.start();
@@ -432,7 +425,7 @@ public class TracingContext implements AbstractTracerContext {
AbstractSpan lastSpan = peek();
if (lastSpan == span) {
if (lastSpan instanceof AbstractTracingSpan) {
- AbstractTracingSpan toFinishSpan = (AbstractTracingSpan)lastSpan;
+ AbstractTracingSpan toFinishSpan = (AbstractTracingSpan) lastSpan;
if (toFinishSpan.finish(segment)) {
pop();
}
@@ -448,7 +441,8 @@ public class TracingContext implements AbstractTracerContext {
return activeSpanStack.isEmpty();
}
- @Override public AbstractTracerContext awaitFinishAsync() {
+ @Override
+ public AbstractTracerContext awaitFinishAsync() {
if (!isRunningInAsyncMode) {
synchronized (this) {
if (!isRunningInAsyncMode) {
@@ -462,7 +456,8 @@ public class TracingContext implements AbstractTracerContext {
return this;
}
- @Override public void asyncStop(AsyncSpan span) {
+ @Override
+ public void asyncStop(AsyncSpan span) {
ASYNC_SPAN_COUNTER_UPDATER.decrementAndGet(this);
finish();
}
@@ -470,7 +465,7 @@ public class TracingContext implements AbstractTracerContext {
/**
* Re-check current trace need profiling, encase third part plugin change the operation name.
*
- * @param span current modify span
+ * @param span current modify span
* @param operationName change to operation name
*/
public void profilingRecheck(AbstractSpan span, String operationName) {
@@ -627,8 +622,7 @@ public class TracingContext implements AbstractTracerContext {
if (spanIdGenerator >= Config.Agent.SPAN_LIMIT_PER_SEGMENT) {
long currentTimeMillis = System.currentTimeMillis();
if (currentTimeMillis - lastWarningTimestamp > 30 * 1000) {
- logger.warn(new RuntimeException("Shadow tracing context. Thread dump"), "More than {} spans required to create",
- Config.Agent.SPAN_LIMIT_PER_SEGMENT);
+ logger.warn(new RuntimeException("Shadow tracing context. Thread dump"), "More than {} spans required to create", Config.Agent.SPAN_LIMIT_PER_SEGMENT);
lastWarningTimestamp = currentTimeMillis;
}
return true;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java
index 4786ecf..7824226 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context;
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java
index c175454..bd6007a 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java
@@ -18,9 +18,6 @@
package org.apache.skywalking.apm.agent.core.context;
-/**
- * @author MrPro
- */
public interface TracingThreadListener {
void afterMainThreadFinish(TracingContext tracingContext);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java
index 779b6e6..7fd60ab 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java
@@ -16,23 +16,21 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.ids;
-import org.apache.skywalking.apm.network.language.agent.*;
+import java.util.Objects;
+import org.apache.skywalking.apm.network.language.agent.UniqueId;
/**
* The <code>DistributedTraceId</code> presents a distributed call chain.
* <p>
* This call chain has a unique (service) entrance,
* <p>
- * such as: Service : http://www.skywalking.com/cust/query, all the remote, called behind this service, rest remote,
- * db executions, are using the same <code>DistributedTraceId</code> even in different JVM.
+ * such as: Service : http://www.skywalking.com/cust/query, all the remote, called behind this service, rest remote, db
+ * executions, are using the same <code>DistributedTraceId</code> even in different JVM.
* <p>
* The <code>DistributedTraceId</code> contains only one string, and can NOT be reset, creating a new instance is the
* only option.
- *
- * @author wusheng
*/
public abstract class DistributedTraceId {
private ID id;
@@ -59,8 +57,8 @@ public abstract class DistributedTraceId {
}
/**
- * Compare the two <code>DistributedTraceId</code> by its {@link #id},
- * even these two <code>DistributedTraceId</code>s are not the same instances.
+ * Compare the two <code>DistributedTraceId</code> by its {@link #id}, even these two
+ * <code>DistributedTraceId</code>s are not the same instances.
*
* @param o target <code>DistributedTraceId</code>
* @return return if they have the same {@link #id}
@@ -72,9 +70,9 @@ public abstract class DistributedTraceId {
if (o == null || getClass() != o.getClass())
return false;
- DistributedTraceId id1 = (DistributedTraceId)o;
+ DistributedTraceId id1 = (DistributedTraceId) o;
- return id != null ? id.equals(id1.id) : id1.id == null;
+ return Objects.equals(id, id1.id);
}
@Override
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java
index 63e58f9..f1a2d1e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.ids;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-/**
- * @author wusheng
- */
public class DistributedTraceIds {
private LinkedList<DistributedTraceId> relatedGlobalTraces;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java
index da2f206..c92d525 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java
@@ -23,28 +23,23 @@ import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
public final class GlobalIdGenerator {
- private static final ThreadLocal<IDContext> THREAD_ID_SEQUENCE = new ThreadLocal<IDContext>() {
- @Override
- protected IDContext initialValue() {
- return new IDContext(System.currentTimeMillis(), (short)0);
- }
- };
+ private static final ThreadLocal<IDContext> THREAD_ID_SEQUENCE = ThreadLocal.withInitial(
+ () -> new IDContext(System.currentTimeMillis(), (short) 0));
private GlobalIdGenerator() {
}
/**
* Generate a new id, combined by three long numbers.
- *
+ * <p>
* The first one represents application instance id. (most likely just an integer value, would be helpful in
* protobuf)
- *
+ * <p>
* The second one represents thread id. (most likely just an integer value, would be helpful in protobuf)
- *
- * The third one also has two parts,
- * 1) a timestamp, measured in milliseconds
- * 2) a seq, in current thread, between 0(included) and 9999(included)
- *
+ * <p>
+ * The third one also has two parts, 1) a timestamp, measured in milliseconds 2) a seq, in current thread, between
+ * 0(included) and 9999(included)
+ * <p>
* Notice, a long costs 8 bytes, three longs cost 24 bytes. And at the same time, a char costs 2 bytes. So
* sky-walking's old global and segment id like this: "S.1490097253214.-866187727.57515.1.1" which costs at least 72
* bytes.
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java
index 4fb6042..f1b45e4 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.ids;
-import org.apache.skywalking.apm.network.language.agent.*;
-/**
- * @author wusheng
- */
+import org.apache.skywalking.apm.network.language.agent.UniqueId;
+
public class ID {
private long part1;
private long part2;
@@ -65,17 +62,19 @@ public class ID {
return encoding;
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return part1 + "." + part2 + '.' + part3;
}
- @Override public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
- ID id = (ID)o;
+ ID id = (ID) o;
if (part1 != id.part1)
return false;
@@ -84,10 +83,11 @@ public class ID {
return part3 == id.part3;
}
- @Override public int hashCode() {
- int result = (int)(part1 ^ (part1 >>> 32));
- result = 31 * result + (int)(part2 ^ (part2 >>> 32));
- result = 31 * result + (int)(part3 ^ (part3 >>> 32));
+ @Override
+ public int hashCode() {
+ int result = (int) (part1 ^ (part1 >>> 32));
+ result = 31 * result + (int) (part2 ^ (part2 >>> 32));
+ result = 31 * result + (int) (part3 ^ (part3 >>> 32));
return result;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java
index 438add6..75647d8 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.ids;
/**
* The <code>NewDistributedTraceId</code> is a {@link DistributedTraceId} with a new generated id.
- *
- * @author wusheng
*/
public class NewDistributedTraceId extends DistributedTraceId {
public NewDistributedTraceId() {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java
index 4f5cccc..f3f24e1 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.ids;
/**
* The <code>PropagatedTraceId</code> represents a {@link DistributedTraceId}, which is propagated from the peer.
- *
- * @author wusheng
*/
public class PropagatedTraceId extends DistributedTraceId {
public PropagatedTraceId(String id) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java
index c4cbcc9..66c3213 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.tag;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java
index 0b1a165..b2d3fae 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.tag;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
@@ -24,7 +23,6 @@ import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
/**
* A subclass of {@link AbstractTag}, represent a tag with a {@link String} value.
* <p>
- * Created by wusheng on 2017/2/17.
*/
public class StringTag extends AbstractTag<String> {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java
index c6e9d37..bafa799 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.tag;
import java.util.Map;
@@ -26,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
* The span tags are supported by sky-walking engine. As default, all tags will be stored, but these ones have
* particular meanings.
* <p>
- * Created by wusheng on 2017/2/17.
*/
public final class Tags {
private static final Map<String, StringTag> TAG_PROTOTYPES = new ConcurrentHashMap<>();
@@ -86,8 +84,8 @@ public final class Tags {
}
/**
- * Creates a {@code StringTag} with the given key and cache it,
- * if it's created before, simply return it without creating a new one.
+ * Creates a {@code StringTag} with the given key and cache it, if it's created before, simply return it without
+ * creating a new one.
*
* @param key the {@code key} of the tag
* @return the {@code StringTag}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java
index 2c99f0c..88ee212 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java
@@ -27,14 +27,11 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
/**
* The <code>AbstractSpan</code> represents the span's skeleton, which contains all open methods.
- *
- * @author wusheng
*/
public interface AbstractSpan extends AsyncSpan {
/**
* Set the component id, which defines in {@link ComponentsDefine}
*
- * @param component
* @return the span for chaining.
*/
AbstractSpan setComponent(Component component);
@@ -43,7 +40,6 @@ public interface AbstractSpan extends AsyncSpan {
* Only use this method in explicit instrumentation, like opentracing-skywalking-bridge. It is highly recommended
* not to use this method for performance reasons.
*
- * @param componentName
* @return the span for chaining.
*/
AbstractSpan setComponent(String componentName);
@@ -60,9 +56,7 @@ public interface AbstractSpan extends AsyncSpan {
AbstractSpan tag(String key, String value);
/**
- * @param tag
- * @param value
- * @return
+ *
*/
AbstractSpan tag(AbstractTag<?> tag, String value);
@@ -90,7 +84,7 @@ public interface AbstractSpan extends AsyncSpan {
* Record an event at a specific timestamp.
*
* @param timestamp The explicit timestamp for the log record.
- * @param event the events
+ * @param event the events
* @return the Span, for chaining
*/
AbstractSpan log(long timestamp, Map<String, ?> event);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
index af28e19..d3f2591 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
@@ -18,10 +18,17 @@
package org.apache.skywalking.apm.agent.core.context.trace;
-import java.util.*;
-import org.apache.skywalking.apm.agent.core.context.*;
-import org.apache.skywalking.apm.agent.core.context.tag.*;
-import org.apache.skywalking.apm.agent.core.context.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import org.apache.skywalking.apm.agent.core.context.TracingContext;
+import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag;
+import org.apache.skywalking.apm.agent.core.context.tag.Tags;
+import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair;
+import org.apache.skywalking.apm.agent.core.context.util.TagValuePair;
+import org.apache.skywalking.apm.agent.core.context.util.ThrowableTransformer;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
import org.apache.skywalking.apm.network.language.agent.SpanType;
import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2;
@@ -30,8 +37,6 @@ import org.apache.skywalking.apm.network.trace.component.Component;
/**
* The <code>AbstractTracingSpan</code> represents a group of {@link AbstractSpan} implementations, which belongs a real
* distributed trace.
- *
- * @author wusheng
*/
public abstract class AbstractTracingSpan implements AbstractSpan {
protected int spanId;
@@ -101,8 +106,9 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
/**
* Set a key:value tag on the Span.
- *
+ * <p>
* {@inheritDoc}
+ *
* @return this Span instance, for chaining
*/
@Override
@@ -158,19 +164,17 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
if (logs == null) {
logs = new LinkedList<>();
}
- logs.add(new LogDataEntity.Builder()
- .add(new KeyValuePair("event", "error"))
- .add(new KeyValuePair("error.kind", t.getClass().getName()))
- .add(new KeyValuePair("message", t.getMessage()))
- .add(new KeyValuePair("stack", ThrowableTransformer.INSTANCE.convert2String(t, 4000)))
- .build(System.currentTimeMillis()));
+ logs.add(new LogDataEntity.Builder().add(new KeyValuePair("event", "error"))
+ .add(new KeyValuePair("error.kind", t.getClass().getName()))
+ .add(new KeyValuePair("message", t.getMessage()))
+ .add(new KeyValuePair("stack", ThrowableTransformer.INSTANCE.convert2String(t, 4000)))
+ .build(System.currentTimeMillis()));
return this;
}
/**
* Record a common log with multi fields, for supporting opentracing-java
*
- * @param fields
* @return the Span, for chaining
*/
@Override
@@ -202,7 +206,6 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
* Set the operation name, just because these is not compress dictionary value for this name. Use the entire string
* temporarily, the agent will compress this name in async mode.
*
- * @param operationName
* @return span instance, for chaining.
*/
@Override
@@ -218,7 +221,6 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
/**
* Set the operation id, which compress by the name.
*
- * @param operationId
* @return span instance, for chaining.
*/
@Override
@@ -252,7 +254,6 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
/**
* Set the component of this span, with internal supported. Highly recommend to use this way.
*
- * @param component
* @return span instance, for chaining.
*/
@Override
@@ -264,7 +265,6 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
/**
* Set the component name. By using this, cost more memory and network.
*
- * @param componentName
* @return span instance, for chaining.
*/
@Override
@@ -328,7 +328,8 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
return spanBuilder;
}
- @Override public void ref(TraceSegmentRef ref) {
+ @Override
+ public void ref(TraceSegmentRef ref) {
if (refs == null) {
refs = new LinkedList<>();
}
@@ -337,7 +338,8 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
}
}
- @Override public AbstractSpan prepareForAsync() {
+ @Override
+ public AbstractSpan prepareForAsync() {
if (isInAsyncMode) {
throw new RuntimeException("Prepare for async repeatedly. Span is already in async mode.");
}
@@ -346,7 +348,8 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
return this;
}
- @Override public AbstractSpan asyncFinish() {
+ @Override
+ public AbstractSpan asyncFinish() {
if (!isInAsyncMode) {
throw new RuntimeException("Span is not in async mode, please use '#prepareForAsync' to active.");
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java
index 7d83af9..70d0f42 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java
@@ -24,15 +24,13 @@ import org.apache.skywalking.apm.network.trace.component.Component;
/**
* The <code>EntrySpan</code> represents a service provider point, such as Tomcat server entrance.
- *
+ * <p>
* It is a start point of {@link TraceSegment}, even in a complex application, there maybe have multi-layer entry point,
* the <code>EntrySpan</code> only represents the first one.
- *
+ * <p>
* But with the last <code>EntrySpan</code>'s tags and logs, which have more details about a service provider.
- *
+ * <p>
* Such as: Tomcat Embed - Dubbox The <code>EntrySpan</code> represents the Dubbox span.
- *
- * @author wusheng
*/
public class EntrySpan extends StackBasedTracingSpan {
@@ -119,11 +117,13 @@ public class EntrySpan extends StackBasedTracingSpan {
return this;
}
- @Override public boolean isEntry() {
+ @Override
+ public boolean isEntry() {
return true;
}
- @Override public boolean isExit() {
+ @Override
+ public boolean isExit() {
return false;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java
index c51cac7..4d167b2 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
import org.apache.skywalking.apm.agent.core.context.TracingContext;
@@ -25,16 +24,14 @@ import org.apache.skywalking.apm.network.trace.component.Component;
/**
* The <code>ExitSpan</code> represents a service consumer point, such as Feign, Okhttp client for an Http service.
- *
+ * <p>
* It is an exit point or a leaf span(our old name) of trace tree. In a single rpc call, because of a combination of
* discovery libs, there maybe contain multi-layer exit point:
- *
+ * <p>
* The <code>ExitSpan</code> only presents the first one.
- *
+ * <p>
* Such as: Dubbox - Apache Httpcomponent - ...(Remote) The <code>ExitSpan</code> represents the Dubbox span, and ignore
* the httpcomponent span's info.
- *
- * @author wusheng
*/
public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo {
@@ -73,7 +70,8 @@ public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo {
return this;
}
- @Override public AbstractTracingSpan tag(AbstractTag<?> tag, String value) {
+ @Override
+ public AbstractTracingSpan tag(AbstractTag<?> tag, String value) {
if (stackDepth == 1 || tag.isCanOverwrite()) {
super.tag(tag, value);
}
@@ -143,11 +141,13 @@ public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo {
return peer;
}
- @Override public boolean isEntry() {
+ @Override
+ public boolean isEntry() {
return false;
}
- @Override public boolean isExit() {
+ @Override
+ public boolean isExit() {
return true;
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java
index b3613c1..292f53d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java
@@ -16,15 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
import org.apache.skywalking.apm.agent.core.context.TracingContext;
/**
* The <code>LocalSpan</code> represents a normal tracing point, such as a local method.
- *
- * @author wusheng
*/
public class LocalSpan extends AbstractTracingSpan {
@@ -36,15 +33,18 @@ public class LocalSpan extends AbstractTracingSpan {
super(spanId, parentSpanId, operationName, owner);
}
- @Override public boolean isEntry() {
+ @Override
+ public boolean isEntry() {
return false;
}
- @Override public boolean isExit() {
+ @Override
+ public boolean isExit() {
return false;
}
- @Override public AbstractSpan setPeer(String remotePeer) {
+ @Override
+ public AbstractSpan setPeer(String remotePeer) {
return this;
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java
index dbca6db..ee6580c 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.apm.agent.core.context.trace;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair;
@@ -26,11 +27,9 @@ import org.apache.skywalking.apm.network.language.agent.v2.Log;
/**
* The <code>LogDataEntity</code> represents a collection of {@link KeyValuePair}, contains several fields of a logging
* operation.
- *
- * @author wusheng
*/
public class LogDataEntity {
- private long timestamp = 0;
+ private long timestamp;
private List<KeyValuePair> logs;
private LogDataEntity(long timestamp, List<KeyValuePair> logs) {
@@ -46,13 +45,11 @@ public class LogDataEntity {
protected List<KeyValuePair> logs;
public Builder() {
- logs = new LinkedList<KeyValuePair>();
+ logs = new LinkedList<>();
}
public Builder add(KeyValuePair... fields) {
- for (KeyValuePair field : fields) {
- logs.add(field);
- }
+ Collections.addAll(logs, fields);
return this;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
index 5270ab9..bb2018b 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
public class NoopExitSpan extends NoopSpan implements WithPeerInfo {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java
index 69b4fa4..c08db0e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
import java.util.Map;
@@ -25,11 +24,8 @@ import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag;
import org.apache.skywalking.apm.network.trace.component.Component;
/**
- * The <code>NoopSpan</code> represents a span implementation without any actual operation.
- * This span implementation is for {@link IgnoredTracerContext},
- * for keeping the memory and gc cost as low as possible.
- *
- * @author wusheng
+ * The <code>NoopSpan</code> represents a span implementation without any actual operation. This span implementation is
+ * for {@link IgnoredTracerContext}, for keeping the memory and gc cost as low as possible.
*/
public class NoopSpan implements AbstractSpan {
public NoopSpan() {
@@ -40,7 +36,8 @@ public class NoopSpan implements AbstractSpan {
return this;
}
- @Override public AbstractSpan errorOccurred() {
+ @Override
+ public AbstractSpan errorOccurred() {
return this;
}
@@ -48,15 +45,18 @@ public class NoopSpan implements AbstractSpan {
}
- @Override public AbstractSpan setComponent(Component component) {
+ @Override
+ public AbstractSpan setComponent(Component component) {
return this;
}
- @Override public AbstractSpan setComponent(String componentName) {
+ @Override
+ public AbstractSpan setComponent(String componentName) {
return this;
}
- @Override public AbstractSpan setLayer(SpanLayer layer) {
+ @Override
+ public AbstractSpan setLayer(SpanLayer layer) {
return this;
}
@@ -65,62 +65,77 @@ public class NoopSpan implements AbstractSpan {
return this;
}
- @Override public AbstractSpan tag(AbstractTag<?> tag, String value) {
+ @Override
+ public AbstractSpan tag(AbstractTag<?> tag, String value) {
return this;
}
- @Override public boolean isEntry() {
+ @Override
+ public boolean isEntry() {
return false;
}
- @Override public boolean isExit() {
+ @Override
+ public boolean isExit() {
return false;
}
- @Override public AbstractSpan log(long timestamp, Map<String, ?> event) {
+ @Override
+ public AbstractSpan log(long timestamp, Map<String, ?> event) {
return this;
}
- @Override public AbstractSpan setOperationName(String operationName) {
+ @Override
+ public AbstractSpan setOperationName(String operationName) {
return this;
}
- @Override public AbstractSpan start() {
+ @Override
+ public AbstractSpan start() {
return this;
}
- @Override public int getSpanId() {
+ @Override
+ public int getSpanId() {
return 0;
}
- @Override public int getOperationId() {
+ @Override
+ public int getOperationId() {
return 0;
}
- @Override public String getOperationName() {
+ @Override
+ public String getOperationName() {
return "";
}
- @Override public AbstractSpan setOperationId(int operationId) {
+ @Override
+ public AbstractSpan setOperationId(int operationId) {
return this;
}
- @Override public void ref(TraceSegmentRef ref) {
+ @Override
+ public void ref(TraceSegmentRef ref) {
}
- @Override public AbstractSpan start(long startTime) {
+ @Override
+ public AbstractSpan start(long startTime) {
return this;
}
- @Override public AbstractSpan setPeer(String remotePeer) {
+ @Override
+ public AbstractSpan setPeer(String remotePeer) {
return this;
}
- @Override public AbstractSpan prepareForAsync() {
+ @Override
+ public AbstractSpan prepareForAsync() {
return this;
}
- @Override public AbstractSpan asyncFinish() {
+ @Override
+ public AbstractSpan asyncFinish() {
return this;
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java
index 5bd5980..4ee9395 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java
@@ -18,15 +18,8 @@
package org.apache.skywalking.apm.agent.core.context.trace;
-/**
- * @author wusheng
- */
public enum SpanLayer {
- DB(1),
- RPC_FRAMEWORK(2),
- HTTP(3),
- MQ(4),
- CACHE(5);
+ DB(1), RPC_FRAMEWORK(2), HTTP(3), MQ(4), CACHE(5);
private int code;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java
index 19000fb..d6ba150 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java
@@ -21,15 +21,12 @@ package org.apache.skywalking.apm.agent.core.context.trace;
import org.apache.skywalking.apm.agent.core.context.TracingContext;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryManager;
import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;
-import org.apache.skywalking.apm.agent.core.dictionary.PossibleFound;
import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2;
/**
* The <code>StackBasedTracingSpan</code> represents a span with an inside stack construction.
- *
+ * <p>
* This kind of span can start and finish multi times in a stack-like invoke line.
- *
- * @author wusheng
*/
public abstract class StackBasedTracingSpan extends AbstractTracingSpan {
protected int stackDepth;
@@ -62,13 +59,15 @@ public abstract class StackBasedTracingSpan extends AbstractTracingSpan {
this.peerId = DictionaryUtil.nullValue();
}
- protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, String peer, TracingContext owner) {
+ protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, String peer,
+ TracingContext owner) {
super(spanId, parentSpanId, operationName, owner);
this.peer = peer;
this.peerId = DictionaryUtil.nullValue();
}
- protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, int peerId, TracingContext owner) {
+ protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, int peerId,
+ TracingContext owner) {
super(spanId, parentSpanId, operationName, owner);
this.peer = null;
this.peerId = peerId;
@@ -90,25 +89,15 @@ public abstract class StackBasedTracingSpan extends AbstractTracingSpan {
@Override
public boolean finish(TraceSegment owner) {
if (--stackDepth == 0) {
- /**
+ /*
* Since 6.6.0, only entry span requires the op name register, which is endpoint.
*/
if (this.isEntry()) {
if (this.operationId == DictionaryUtil.nullValue()) {
- this.operationId = (Integer)DictionaryManager.findEndpointSection()
- .findOrPrepare4Register(owner.getServiceId(), operationName)
- .doInCondition(
- new PossibleFound.FoundAndObtain() {
- @Override public Object doProcess(int value) {
- return value;
- }
- },
- new PossibleFound.NotFoundAndObtain() {
- @Override public Object doProcess() {
- return DictionaryUtil.nullValue();
- }
- }
- );
+ this.operationId =
+ (Integer) DictionaryManager.findEndpointSection()
+ .findOrPrepare4Register(owner.getServiceId(), operationName)
+ .doInCondition(value -> value, DictionaryUtil::nullValue);
}
}
return super.finish(owner);
@@ -117,18 +106,11 @@ public abstract class StackBasedTracingSpan extends AbstractTracingSpan {
}
}
- @Override public AbstractSpan setPeer(final String remotePeer) {
+ @Override
+ public AbstractSpan setPeer(final String remotePeer) {
DictionaryManager.findNetworkAddressSection().find(remotePeer).doInCondition(
- new PossibleFound.Found() {
- @Override
- public void doProcess(int remotePeerId) {
- peerId = remotePeerId;
- }
- }, new PossibleFound.NotFound() {
- @Override
- public void doProcess() {
- peer = remotePeer;
- }
+ remotePeerId -> peerId = remotePeerId, () -> {
+ peer = remotePeer;
}
);
return this;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java
index aef5a59..1244500 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
import java.util.LinkedList;
@@ -27,15 +26,13 @@ import org.apache.skywalking.apm.agent.core.context.ids.DistributedTraceIds;
import org.apache.skywalking.apm.agent.core.context.ids.GlobalIdGenerator;
import org.apache.skywalking.apm.agent.core.context.ids.ID;
import org.apache.skywalking.apm.agent.core.context.ids.NewDistributedTraceId;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject;
/**
* {@link TraceSegment} is a segment or fragment of the distributed trace. See https://github.com/opentracing/specification/blob/master/specification.md#the-opentracing-data-model
* A {@link TraceSegment} means the segment, which exists in current {@link Thread}. And the distributed trace is formed
* by multi {@link TraceSegment}s, because the distributed trace crosses multi-processes, multi-threads. <p>
- *
- * @author wusheng
*/
public class TraceSegment {
/**
@@ -46,8 +43,8 @@ public class TraceSegment {
/**
* The refs of parent trace segments, except the primary one. For most RPC call, {@link #refs} contains only one
* element, but if this segment is a start span of batch process, the segment faces multi parents, at this moment,
- * we use this {@link #refs} to link them.
- *
+ * we use this {@code #refs} to link them.
+ * <p>
* This field will not be serialized. Keeping this field is only for quick accessing.
*/
private List<TraceSegmentRef> refs;
@@ -79,7 +76,7 @@ public class TraceSegment {
*/
public TraceSegment() {
this.traceSegmentId = GlobalIdGenerator.generate();
- this.spans = new LinkedList<AbstractTracingSpan>();
+ this.spans = new LinkedList<>();
this.relatedGlobalTraces = new DistributedTraceIds();
this.relatedGlobalTraces.append(new NewDistributedTraceId());
this.createTime = System.currentTimeMillis();
@@ -92,7 +89,7 @@ public class TraceSegment {
*/
public void ref(TraceSegmentRef refSegment) {
if (refs == null) {
- refs = new LinkedList<TraceSegmentRef>();
+ refs = new LinkedList<>();
}
if (!refs.contains(refSegment)) {
refs.add(refSegment);
@@ -109,8 +106,6 @@ public class TraceSegment {
/**
* After {@link AbstractSpan} is finished, as be controller by "skywalking-api" module, notify the {@link
* TraceSegment} to archive it.
- *
- * @param finishedSpan
*/
public void archive(AbstractTracingSpan finishedSpan) {
spans.add(finishedSpan);
@@ -167,7 +162,7 @@ public class TraceSegment {
upstreamBuilder = upstreamBuilder.addGlobalTraceIds(distributedTraceId.toUniqueId());
}
SegmentObject.Builder traceSegmentBuilder = SegmentObject.newBuilder();
- /**
+ /*
* Trace Segment
*/
traceSegmentBuilder.setTraceSegmentId(this.traceSegmentId.transform());
@@ -187,12 +182,7 @@ public class TraceSegment {
@Override
public String toString() {
- return "TraceSegment{" +
- "traceSegmentId='" + traceSegmentId + '\'' +
- ", refs=" + refs +
- ", spans=" + spans +
- ", relatedGlobalTraces=" + relatedGlobalTraces +
- '}';
+ return "TraceSegment{" + "traceSegmentId='" + traceSegmentId + '\'' + ", refs=" + refs + ", spans=" + spans + ", relatedGlobalTraces=" + relatedGlobalTraces + '}';
}
public int getApplicationInstanceId() {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
index 24abf07..cf4082e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java
@@ -31,22 +31,21 @@ import org.apache.skywalking.apm.util.StringUtil;
* {@link TraceSegmentRef} is like a pointer, which ref to another {@link TraceSegment}, use {@link #spanId} point to
* the exact span of the ref {@link TraceSegment}.
* <p>
- * Created by wusheng on 2017/2/17.
*/
public class TraceSegmentRef {
private SegmentRefType type;
private ID traceSegmentId;
- private int spanId = -1;
+ private int spanId;
private int peerId = DictionaryUtil.nullValue();
private String peerHost;
- private int entryServiceInstanceId = DictionaryUtil.nullValue();
+ private int entryServiceInstanceId;
- private int parentServiceInstanceId = DictionaryUtil.nullValue();
+ private int parentServiceInstanceId;
private String entryEndpointName;
@@ -144,7 +143,7 @@ public class TraceSegmentRef {
refBuilder.setEntryServiceInstanceId(entryServiceInstanceId);
refBuilder.setParentTraceSegmentId(traceSegmentId.transform());
refBuilder.setParentSpanId(spanId);
- /**
+ /*
* entryEndpointId/entryEndpointName and parentEndpointId/parentEndpointName could be empty at same time.
* This is accepted in v2 format.
*
@@ -173,7 +172,7 @@ public class TraceSegmentRef {
if (o == null || getClass() != o.getClass())
return false;
- TraceSegmentRef ref = (TraceSegmentRef)o;
+ TraceSegmentRef ref = (TraceSegmentRef) o;
if (spanId != ref.spanId)
return false;
@@ -188,7 +187,6 @@ public class TraceSegmentRef {
}
public enum SegmentRefType {
- CROSS_PROCESS,
- CROSS_THREAD
+ CROSS_PROCESS, CROSS_THREAD
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
index d67d0b4..249febe 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.trace;
-/**
- * @author wusheng
- */
public interface WithPeerInfo {
int getPeerId();
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java
index 86b4822..14e68b7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java
@@ -16,15 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.util;
import org.apache.skywalking.apm.network.common.KeyStringValuePair;
/**
* The <code>KeyValuePair</code> represents a object which contains a string key and a string value.
- *
- * @author wusheng
*/
public class KeyValuePair {
private String key;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java
index 1c27c36..1874978 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java
@@ -21,10 +21,6 @@ package org.apache.skywalking.apm.agent.core.context.util;
import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.util.StringUtil;
-/**
- * @author zhaoyuguang
- */
-
public class PeerFormat {
private static final String ABBR = "...";
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java
index ea02f45..ff297d8 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.context.util;
import static org.apache.skywalking.apm.agent.core.conf.Config.Agent.CAUSE_EXCEPTION_DEPTH;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java
index bd50d47..b0fc1ab 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
-/**
- * @author wusheng
- */
public class DictionaryManager {
/**
* @return {@link NetworkAddressDictionary} to find application id for application code and network address.
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
index d8ac1d5..bf184b8 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
-/**
- * @author wusheng
- */
public class DictionaryUtil {
public static int nullValue() {
return 0;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java
index 3447d8a..721fb09 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java
@@ -18,24 +18,26 @@
package org.apache.skywalking.apm.agent.core.dictionary;
-import io.netty.util.internal.ConcurrentSet;
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.skywalking.apm.agent.core.logging.api.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
import org.apache.skywalking.apm.network.common.DetectPoint;
-import org.apache.skywalking.apm.network.register.v2.*;
+import org.apache.skywalking.apm.network.register.v2.Endpoint;
+import org.apache.skywalking.apm.network.register.v2.EndpointMapping;
+import org.apache.skywalking.apm.network.register.v2.EndpointMappingElement;
+import org.apache.skywalking.apm.network.register.v2.Endpoints;
+import org.apache.skywalking.apm.network.register.v2.RegisterGrpc;
import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.ENDPOINT_NAME_BUFFER_SIZE;
-/**
- * @author wusheng
- */
public enum EndpointNameDictionary {
INSTANCE;
- private static final ILog logger = LogManager.getLogger(EndpointNameDictionary.class);
- private Map<OperationNameKey, Integer> endpointDictionary = new ConcurrentHashMap<OperationNameKey, Integer>();
- private Set<OperationNameKey> unRegisterEndpoints = new ConcurrentSet<OperationNameKey>();
+ private Map<OperationNameKey, Integer> endpointDictionary = new ConcurrentHashMap<>();
+ private Set<OperationNameKey> unRegisterEndpoints = ConcurrentHashMap.newKeySet();
public PossibleFound findOrPrepare4Register(int serviceId, String endpointName) {
return find0(serviceId, endpointName, true);
@@ -45,8 +47,7 @@ public enum EndpointNameDictionary {
return find0(serviceId, endpointName, false);
}
- private PossibleFound find0(int serviceId, String endpointName,
- boolean registerWhenNotFound) {
+ private PossibleFound find0(int serviceId, String endpointName, boolean registerWhenNotFound) {
if (endpointName == null || endpointName.length() == 0) {
return new NotFound();
}
@@ -55,32 +56,29 @@ public enum EndpointNameDictionary {
if (operationId != null) {
return new Found(operationId);
} else {
- if (registerWhenNotFound &&
- endpointDictionary.size() + unRegisterEndpoints.size() < ENDPOINT_NAME_BUFFER_SIZE) {
+ if (registerWhenNotFound && endpointDictionary.size() + unRegisterEndpoints.size() < ENDPOINT_NAME_BUFFER_SIZE) {
unRegisterEndpoints.add(key);
}
return new NotFound();
}
}
- public void syncRemoteDictionary(
- RegisterGrpc.RegisterBlockingStub serviceNameDiscoveryServiceBlockingStub) {
+ public void syncRemoteDictionary(RegisterGrpc.RegisterBlockingStub serviceNameDiscoveryServiceBlockingStub) {
if (unRegisterEndpoints.size() > 0) {
Endpoints.Builder builder = Endpoints.newBuilder();
for (OperationNameKey operationNameKey : unRegisterEndpoints) {
Endpoint endpoint = Endpoint.newBuilder()
- .setServiceId(operationNameKey.getServiceId())
- .setEndpointName(operationNameKey.getEndpointName())
- .setFrom(DetectPoint.server)
- .build();
+ .setServiceId(operationNameKey.getServiceId())
+ .setEndpointName(operationNameKey.getEndpointName())
+ .setFrom(DetectPoint.server)
+ .build();
builder.addEndpoints(endpoint);
}
- EndpointMapping serviceNameMappingCollection = serviceNameDiscoveryServiceBlockingStub.doEndpointRegister(builder.build());
+ EndpointMapping serviceNameMappingCollection = serviceNameDiscoveryServiceBlockingStub.doEndpointRegister(builder
+ .build());
if (serviceNameMappingCollection.getElementsCount() > 0) {
for (EndpointMappingElement element : serviceNameMappingCollection.getElementsList()) {
- OperationNameKey key = new OperationNameKey(
- element.getServiceId(),
- element.getEndpointName());
+ OperationNameKey key = new OperationNameKey(element.getServiceId(), element.getEndpointName());
unRegisterEndpoints.remove(key);
endpointDictionary.put(key, element.getEndpointId());
}
@@ -92,30 +90,21 @@ public enum EndpointNameDictionary {
endpointDictionary.clear();
}
- private class OperationNameKey {
- private int serviceId;
- private String endpointName;
-
- public OperationNameKey(int serviceId, String endpointName) {
- this.serviceId = serviceId;
- this.endpointName = endpointName;
- }
-
- public int getServiceId() {
- return serviceId;
- }
-
- public String getEndpointName() {
- return endpointName;
- }
+ @Getter
+ @ToString
+ @RequiredArgsConstructor
+ private static class OperationNameKey {
+ private final int serviceId;
+ private final String endpointName;
- @Override public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
- OperationNameKey key = (OperationNameKey)o;
+ OperationNameKey key = (OperationNameKey) o;
boolean isServiceEndpointMatch = false;
if (serviceId == key.serviceId && endpointName.equals(key.endpointName)) {
@@ -124,18 +113,11 @@ public enum EndpointNameDictionary {
return isServiceEndpointMatch;
}
- @Override public int hashCode() {
+ @Override
+ public int hashCode() {
int result = serviceId;
result = 31 * result + endpointName.hashCode();
return result;
}
-
-
- @Override public String toString() {
- return "OperationNameKey{" +
- "serviceId=" + serviceId +
- ", endpointName='" + endpointName + '\'' +
- '}';
- }
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java
index f05042c..0d1328f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
-/**
- * @author wusheng
- */
public class Found extends PossibleFound {
public Found(int value) {
super(value);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java
index 2155ab4..99f187d 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java
@@ -16,10 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
-import io.netty.util.internal.ConcurrentSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -32,13 +30,11 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.SERVIC
/**
* Map of network address id to network literal address, which is from the collector side.
- *
- * @author wusheng
*/
public enum NetworkAddressDictionary {
INSTANCE;
- private Map<String, Integer> serviceDictionary = new ConcurrentHashMap<String, Integer>();
- private Set<String> unRegisterServices = new ConcurrentSet<String>();
+ private Map<String, Integer> serviceDictionary = new ConcurrentHashMap<>();
+ private Set<String> unRegisterServices = ConcurrentHashMap.newKeySet();
public PossibleFound find(String networkAddress) {
Integer applicationId = serviceDictionary.get(networkAddress);
@@ -52,11 +48,12 @@ public enum NetworkAddressDictionary {
}
}
- public void syncRemoteDictionary(
- RegisterGrpc.RegisterBlockingStub networkAddressRegisterServiceBlockingStub) {
+ public void syncRemoteDictionary(RegisterGrpc.RegisterBlockingStub networkAddressRegisterServiceBlockingStub) {
if (unRegisterServices.size() > 0) {
- NetAddressMapping networkAddressMappings = networkAddressRegisterServiceBlockingStub.doNetworkAddressRegister(
- NetAddresses.newBuilder().addAllAddresses(unRegisterServices).build());
+ NetAddressMapping networkAddressMappings = networkAddressRegisterServiceBlockingStub
+ .doNetworkAddressRegister(NetAddresses.newBuilder()
+ .addAllAddresses(unRegisterServices)
+ .build());
if (networkAddressMappings.getAddressIdsCount() > 0) {
for (KeyIntValuePair keyWithIntegerValue : networkAddressMappings.getAddressIdsList()) {
unRegisterServices.remove(keyWithIntegerValue.getKey());
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java
index 7412a12..cb5e88c 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
-/**
- * @author wusheng
- */
public class NotFound extends PossibleFound {
public NotFound() {
super();
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java
index 8db3e8c..ae37029 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.dictionary;
/**
* The <code>PossibleFound</code> represents a value, which may needEnhance or not.
- *
- * @author wusheng
*/
public abstract class PossibleFound {
private boolean found;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
index 598cd36..6945898 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
@@ -52,8 +52,6 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Collector.GRPC_UP
/**
* The <code>JVMService</code> represents a timer, which collectors JVM cpu, memory, memorypool and gc info, and send
* the collected info to Collector through the channel provided by {@link GRPCChannelManager}
- *
- * @author wusheng
*/
@DefaultImplementor
public class JVMService implements BootService, Runnable {
@@ -72,21 +70,20 @@ public class JVMService implements BootService, Runnable {
@Override
public void boot() throws Throwable {
- collectMetricFuture = Executors
- .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-produce"))
- .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() {
- @Override public void handle(Throwable t) {
- logger.error("JVMService produces metrics failure.", t);
- }
- }), 0, 1, TimeUnit.SECONDS);
- sendMetricFuture = Executors
- .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-consume"))
- .scheduleAtFixedRate(new RunnableWithExceptionProtection(sender, new RunnableWithExceptionProtection.CallbackWhenException() {
- @Override public void handle(Throwable t) {
- logger.error("JVMService consumes and upload failure.", t);
- }
- }
- ), 0, 1, TimeUnit.SECONDS);
+ collectMetricFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-produce"))
+ .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() {
+ @Override
+ public void handle(Throwable t) {
+ logger.error("JVMService produces metrics failure.", t);
+ }
+ }), 0, 1, TimeUnit.SECONDS);
+ sendMetricFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-consume"))
+ .scheduleAtFixedRate(new RunnableWithExceptionProtection(sender, new RunnableWithExceptionProtection.CallbackWhenException() {
+ @Override
+ public void handle(Throwable t) {
+ logger.error("JVMService consumes and upload failure.", t);
+ }
+ }), 0, 1, TimeUnit.SECONDS);
}
@Override
@@ -102,9 +99,8 @@ public class JVMService implements BootService, Runnable {
@Override
public void run() {
- if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue()
- && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()
- ) {
+ if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil
+ .nullValue()) {
long currentTimeMillis = System.currentTimeMillis();
try {
JVMMetric.Builder jvmBuilder = JVMMetric.newBuilder();
@@ -131,9 +127,8 @@ public class JVMService implements BootService, Runnable {
@Override
public void run() {
- if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue()
- && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()
- ) {
+ if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil
+ .nullValue()) {
if (status == GRPCChannelStatus.CONNECTED) {
try {
JVMMetricCollection.Builder builder = JVMMetricCollection.newBuilder();
@@ -142,7 +137,8 @@ public class JVMService implements BootService, Runnable {
if (buffer.size() > 0) {
builder.addAllMetrics(buffer);
builder.setServiceInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID);
- Commands commands = stub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).collect(builder.build());
+ Commands commands = stub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS)
+ .collect(builder.build());
ServiceManager.INSTANCE.findService(CommandService.class).receiveCommand(commands);
}
} catch (Throwable t) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java
index d44184b..1b007e7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.cpu;
import org.apache.skywalking.apm.network.common.CPU;
@@ -24,8 +23,6 @@ import org.apache.skywalking.apm.network.common.CPU;
/**
* The unit of CPU usage is 1/10000. The backend is using `avg` func directly, and query for percentage requires this
* unit.
- *
- * @author wusheng
*/
public abstract class CPUMetricsAccessor {
private long lastCPUTimeNs;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java
index b906fbc..2450e54 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.cpu;
import org.apache.skywalking.apm.agent.core.logging.api.ILog;
@@ -24,9 +23,6 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
import org.apache.skywalking.apm.agent.core.os.ProcessorUtil;
import org.apache.skywalking.apm.network.common.CPU;
-/**
- * @author wusheng
- */
public enum CPUProvider {
INSTANCE;
private CPUMetricsAccessor cpuMetricsAccessor;
@@ -34,9 +30,10 @@ public enum CPUProvider {
CPUProvider() {
int processorNum = ProcessorUtil.getNumberOfProcessors();
try {
- this.cpuMetricsAccessor =
- (CPUMetricsAccessor)CPUProvider.class.getClassLoader().loadClass("org.apache.skywalking.apm.agent.core.jvm.cpu.SunCpuAccessor")
- .getConstructor(int.class).newInstance(processorNum);
+ this.cpuMetricsAccessor = (CPUMetricsAccessor) CPUProvider.class.getClassLoader()
+ .loadClass("org.apache.skywalking.apm.agent.core.jvm.cpu.SunCpuAccessor")
+ .getConstructor(int.class)
+ .newInstance(processorNum);
} catch (Exception e) {
this.cpuMetricsAccessor = new NoSupportedCPUAccessor(processorNum);
ILog logger = LogManager.getLogger(CPUProvider.class);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java
index c2865cf..6aad821 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.cpu;
-/**
- * @author wusheng
- */
public class NoSupportedCPUAccessor extends CPUMetricsAccessor {
public NoSupportedCPUAccessor(int cpuCoreNum) {
super(cpuCoreNum);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java
index f46300f..8cd1aa6 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java
@@ -16,21 +16,17 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.cpu;
import com.sun.management.OperatingSystemMXBean;
import java.lang.management.ManagementFactory;
-/**
- * @author wusheng
- */
public class SunCpuAccessor extends CPUMetricsAccessor {
private final OperatingSystemMXBean osMBean;
public SunCpuAccessor(int cpuCoreNum) {
super(cpuCoreNum);
- this.osMBean = (OperatingSystemMXBean)ManagementFactory.getOperatingSystemMXBean();
+ this.osMBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
this.init();
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java
index b619b08..ac0a7cc 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java
@@ -16,25 +16,23 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class CMSGCModule extends GCModule {
public CMSGCModule(List<GarbageCollectorMXBean> beans) {
super(beans);
}
- @Override protected String getOldGCName() {
+ @Override
+ protected String getOldGCName() {
return "ConcurrentMarkSweep";
}
- @Override protected String getNewGCName() {
+ @Override
+ protected String getNewGCName() {
return "ParNew";
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java
index e2ecbb5..d8226a7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java
@@ -16,25 +16,23 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class G1GCModule extends GCModule {
public G1GCModule(List<GarbageCollectorMXBean> beans) {
super(beans);
}
- @Override protected String getOldGCName() {
+ @Override
+ protected String getOldGCName() {
return "G1 Old Generation";
}
- @Override protected String getNewGCName() {
+ @Override
+ protected String getNewGCName() {
return "G1 Young Generation";
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java
index f706b9a..9193d64 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.GC;
-/**
- * @author wusheng
- */
public interface GCMetricAccessor {
List<GC> getGCList();
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java
index 4090b0f..42fe534 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java
@@ -21,11 +21,9 @@ package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.util.LinkedList;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.GC;
+import org.apache.skywalking.apm.network.language.agent.GCPhrase;
-/**
- * @author wusheng
- */
public abstract class GCModule implements GCMetricAccessor {
private List<GarbageCollectorMXBean> beans;
@@ -68,12 +66,7 @@ public abstract class GCModule implements GCMetricAccessor {
continue;
}
- gcList.add(
- GC.newBuilder().setPhrase(phrase)
- .setCount(gcCount)
- .setTime(gcTime)
- .build()
- );
+ gcList.add(GC.newBuilder().setPhrase(phrase).setCount(gcCount).setTime(gcTime).build());
}
return gcList;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java
index d28f1d7..1d7d7ab 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java
@@ -16,17 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.GC;
-/**
- * @author wusheng
- */
public enum GCProvider {
INSTANCE;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java
index c9565a9..1773756 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java
@@ -16,25 +16,23 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class ParallelGCModule extends GCModule {
public ParallelGCModule(List<GarbageCollectorMXBean> beans) {
super(beans);
}
- @Override protected String getOldGCName() {
+ @Override
+ protected String getOldGCName() {
return "PS MarkSweep";
}
- @Override protected String getNewGCName() {
+ @Override
+ protected String getNewGCName() {
return "PS Scavenge";
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java
index ba7ab4c..b1c8667 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java
@@ -16,25 +16,23 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class SerialGCModule extends GCModule {
public SerialGCModule(List<GarbageCollectorMXBean> beans) {
super(beans);
}
- @Override protected String getOldGCName() {
+ @Override
+ protected String getOldGCName() {
return "MarkSweepCompact";
}
- @Override protected String getNewGCName() {
+ @Override
+ protected String getNewGCName() {
return "Copy";
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java
index dc71cff..25b5adf 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java
@@ -16,16 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.gc;
import java.util.LinkedList;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.GC;
+import org.apache.skywalking.apm.network.language.agent.GCPhrase;
-/**
- * @author wusheng
- */
public class UnknowGC implements GCMetricAccessor {
@Override
public List<GC> getGCList() {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java
index f31e068..7c73d62 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memory;
import java.lang.management.ManagementFactory;
@@ -24,11 +23,8 @@ import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
import java.util.LinkedList;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.Memory;
-/**
- * @author wusheng
- */
public enum MemoryProvider {
INSTANCE;
private final MemoryMXBean memoryMXBean;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
index 79ae69c..ba54bf7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
@@ -16,41 +16,46 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.lang.management.MemoryPoolMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class CMSCollectorModule extends MemoryPoolModule {
public CMSCollectorModule(List<MemoryPoolMXBean> beans) {
super(beans);
}
- @Override protected String[] getPermNames() {
- return new String[] {"CMS Perm Gen", "Compressed Class Space"};
+ @Override
+ protected String[] getPermNames() {
+ return new String[] {
+ "CMS Perm Gen",
+ "Compressed Class Space"
+ };
}
- @Override protected String[] getCodeCacheNames() {
+ @Override
+ protected String[] getCodeCacheNames() {
return new String[] {"Code Cache"};
}
- @Override protected String[] getEdenNames() {
+ @Override
+ protected String[] getEdenNames() {
return new String[] {"Par Eden Space"};
}
- @Override protected String[] getOldNames() {
+ @Override
+ protected String[] getOldNames() {
return new String[] {"CMS Old Gen"};
}
- @Override protected String[] getSurvivorNames() {
+ @Override
+ protected String[] getSurvivorNames() {
return new String[] {"Par Survivor Space"};
}
- @Override protected String[] getMetaspaceNames() {
+ @Override
+ protected String[] getMetaspaceNames() {
return new String[] {"Metaspace"};
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java
index 2fcd560..b0b398e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java
@@ -16,41 +16,46 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.lang.management.MemoryPoolMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class G1CollectorModule extends MemoryPoolModule {
public G1CollectorModule(List<MemoryPoolMXBean> beans) {
super(beans);
}
- @Override protected String[] getPermNames() {
- return new String[] {"G1 Perm Gen", "Compressed Class Space"};
+ @Override
+ protected String[] getPermNames() {
+ return new String[] {
+ "G1 Perm Gen",
+ "Compressed Class Space"
+ };
}
- @Override protected String[] getCodeCacheNames() {
+ @Override
+ protected String[] getCodeCacheNames() {
return new String[] {"Code Cache"};
}
- @Override protected String[] getEdenNames() {
+ @Override
+ protected String[] getEdenNames() {
return new String[] {"G1 Eden Space"};
}
- @Override protected String[] getOldNames() {
+ @Override
+ protected String[] getOldNames() {
return new String[] {"G1 Old Gen"};
}
- @Override protected String[] getSurvivorNames() {
+ @Override
+ protected String[] getSurvivorNames() {
return new String[] {"G1 Survivor Space"};
}
- @Override protected String[] getMetaspaceNames() {
+ @Override
+ protected String[] getMetaspaceNames() {
return new String[] {"Metaspace"};
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java
index 7a38f10..562eecc 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java
@@ -21,9 +21,6 @@ package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.util.List;
import org.apache.skywalking.apm.network.language.agent.MemoryPool;
-/**
- * @author wusheng
- */
public interface MemoryPoolMetricsAccessor {
List<MemoryPool> getMemoryPoolMetricsList();
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
index 3ab0291..839712b 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
@@ -18,13 +18,13 @@
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
-import java.lang.management.*;
-import java.util.*;
-import org.apache.skywalking.apm.network.language.agent.*;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryUsage;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.skywalking.apm.network.language.agent.MemoryPool;
+import org.apache.skywalking.apm.network.language.agent.PoolType;
-/**
- * @author wusheng
- */
public abstract class MemoryPoolModule implements MemoryPoolMetricsAccessor {
private List<MemoryPoolMXBean> beans;
@@ -55,12 +55,13 @@ public abstract class MemoryPoolModule implements MemoryPoolMetricsAccessor {
}
MemoryUsage usage = bean.getUsage();
- poolList.add(MemoryPool.newBuilder().setType(type)
- .setInit(usage.getInit())
- .setMax(usage.getMax())
- .setCommited(usage.getCommitted())
- .setUsed(usage.getUsed())
- .build());
+ poolList.add(MemoryPool.newBuilder()
+ .setType(type)
+ .setInit(usage.getInit())
+ .setMax(usage.getMax())
+ .setCommited(usage.getCommitted())
+ .setUsed(usage.getUsed())
+ .build());
}
return poolList;
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
index d85c478..d728652 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java
@@ -16,16 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
-import java.lang.management.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
import java.util.List;
import org.apache.skywalking.apm.network.language.agent.MemoryPool;
-/**
- * @author wusheng
- */
public enum MemoryPoolProvider {
INSTANCE;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java
index ee90c68..241d230 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java
@@ -16,42 +16,47 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.lang.management.MemoryPoolMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class ParallelCollectorModule extends MemoryPoolModule {
public ParallelCollectorModule(List<MemoryPoolMXBean> beans) {
super(beans);
}
- @Override protected String[] getPermNames() {
- return new String[] {"PS Perm Gen", "Compressed Class Space"};
+ @Override
+ protected String[] getPermNames() {
+ return new String[] {
+ "PS Perm Gen",
+ "Compressed Class Space"
+ };
}
- @Override protected String[] getCodeCacheNames() {
+ @Override
+ protected String[] getCodeCacheNames() {
return new String[] {"Code Cache"};
}
- @Override protected String[] getEdenNames() {
+ @Override
+ protected String[] getEdenNames() {
return new String[] {"PS Eden Space"};
}
- @Override protected String[] getOldNames() {
+ @Override
+ protected String[] getOldNames() {
return new String[] {"PS Old Gen"};
}
- @Override protected String[] getSurvivorNames() {
+ @Override
+ protected String[] getSurvivorNames() {
return new String[] {"PS Survivor Space"};
}
- @Override protected String[] getMetaspaceNames() {
+ @Override
+ protected String[] getMetaspaceNames() {
return new String[] {"Metaspace"};
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
index b587c0e..b4b13ae 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
@@ -16,41 +16,46 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.lang.management.MemoryPoolMXBean;
import java.util.List;
-/**
- * @author wusheng
- */
public class SerialCollectorModule extends MemoryPoolModule {
public SerialCollectorModule(List<MemoryPoolMXBean> beans) {
super(beans);
}
- @Override protected String[] getPermNames() {
- return new String[] {"Perm Gen", "Compressed Class Space"};
+ @Override
+ protected String[] getPermNames() {
+ return new String[] {
+ "Perm Gen",
+ "Compressed Class Space"
+ };
}
- @Override protected String[] getCodeCacheNames() {
+ @Override
+ protected String[] getCodeCacheNames() {
return new String[] {"Code Cache"};
}
- @Override protected String[] getEdenNames() {
+ @Override
+ protected String[] getEdenNames() {
return new String[] {"Eden Space"};
}
- @Override protected String[] getOldNames() {
+ @Override
+ protected String[] getOldNames() {
return new String[] {"Tenured Gen"};
}
- @Override protected String[] getSurvivorNames() {
+ @Override
+ protected String[] getSurvivorNames() {
return new String[] {"Survivor Space"};
}
- @Override protected String[] getMetaspaceNames() {
+ @Override
+ protected String[] getMetaspaceNames() {
return new String[] {"Metaspace"};
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java
index 32428fb..7519531 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java
@@ -16,16 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.jvm.memorypool;
import java.util.LinkedList;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.MemoryPool;
+import org.apache.skywalking.apm.network.language.agent.PoolType;
-/**
- * @author wusheng
- */
public class UnknownMemoryPool implements MemoryPoolMetricsAccessor {
@Override
public List<MemoryPool> getMemoryPoolMetricsList() {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
index afd5fd2..11db0d0 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java
@@ -16,15 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.api;
/**
- * The Log interface.
- * It's very easy to understand, like any other log-component.
- * Do just like log4j or log4j2 does.
+ * The Log interface. It's very easy to understand, like any other log-component. Do just like log4j or log4j2 does.
* <p>
- * Created by xin on 2016/11/10.
*/
public interface ILog {
void info(String format);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java
index a8afb25..a3bcf9a 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.api;
import org.apache.skywalking.apm.agent.core.logging.core.PatternLogResolver;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java
index c54d7fd..f88b9dd 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java
@@ -16,17 +16,15 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.api;
/**
* {@link LogResolver} just do only one thing: return the {@link ILog} implementation.
* <p>
- * Created by xin on 2016/11/10.
*/
public interface LogResolver {
/**
- * @param clazz, the class is showed in log message.
+ * @param clazz the class is showed in log message.
* @return {@link ILog} implementation.
*/
ILog getLogger(Class<?> clazz);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
index 016cc43..b78fc55 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java
@@ -16,14 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.api;
/**
- * No operation logger implementation.
- * Just implement {@link ILog} interface, but do nothing.
+ * No operation logger implementation. Just implement {@link ILog} interface, but do nothing.
* <p>
- * Created by xin on 2016/11/10.
*/
public enum NoopLogger implements ILog {
INSTANCE;
@@ -93,7 +90,6 @@ public enum NoopLogger implements ILog {
}
-
@Override
public void warn(Throwable e, String format, Object... arguments) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java
index 0561226..504d816 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
-
/**
* The Converter, It is used to convert the LogEvent to the String.
- * @author alvin
*/
public interface Converter {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java
index aa18c59..866bc4f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java
@@ -16,15 +16,13 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
-import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory;
-import org.apache.skywalking.apm.agent.core.conf.Config;
-import org.apache.skywalking.apm.agent.core.conf.Constants;
-import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -35,11 +33,13 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
+import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory;
+import org.apache.skywalking.apm.agent.core.conf.Config;
+import org.apache.skywalking.apm.agent.core.conf.Constants;
+import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;
/**
* The <code>FileWriter</code> support async file output, by using a queue as buffer.
- *
- * @author wusheng
*/
public class FileWriter implements IWriter {
private static FileWriter INSTANCE;
@@ -63,29 +63,29 @@ public class FileWriter implements IWriter {
private FileWriter() {
logBuffer = new ArrayBlockingQueue(1024);
final ArrayList<String> outputLogs = new ArrayList<String>(200);
- Executors
- .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("LogFileWriter"))
- .scheduleAtFixedRate(new RunnableWithExceptionProtection(new Runnable() {
- @Override public void run() {
- try {
- logBuffer.drainTo(outputLogs);
- for (String log : outputLogs) {
- writeToFile(log + Constants.LINE_SEPARATOR);
- }
- try {
- fileOutputStream.flush();
- } catch (IOException e) {
- e.printStackTrace();
- }
- } finally {
- outputLogs.clear();
- }
- }
- }, new RunnableWithExceptionProtection.CallbackWhenException() {
- @Override public void handle(Throwable t) {
- }
- }
- ), 0, 1, TimeUnit.SECONDS);
+ Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("LogFileWriter"))
+ .scheduleAtFixedRate(new RunnableWithExceptionProtection(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ logBuffer.drainTo(outputLogs);
+ for (String log : outputLogs) {
+ writeToFile(log + Constants.LINE_SEPARATOR);
+ }
+ try {
+ fileOutputStream.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ } finally {
+ outputLogs.clear();
+ }
+ }
+ }, new RunnableWithExceptionProtection.CallbackWhenException() {
+ @Override
+ public void handle(Throwable t) {
+ }
+ }), 0, 1, TimeUnit.SECONDS);
}
/**
@@ -123,9 +123,8 @@ public class FileWriter implements IWriter {
forceExecute(new Callable() {
@Override
public Object call() throws Exception {
- new File(Config.Logging.DIR, Config.Logging.FILE_NAME)
- .renameTo(new File(Config.Logging.DIR,
- Config.Logging.FILE_NAME + new SimpleDateFormat(".yyyy_MM_dd_HH_mm_ss").format(new Date())));
+ new File(Config.Logging.DIR, Config.Logging.FILE_NAME).renameTo(new File(Config.Logging.DIR, Config.Logging.FILE_NAME + new SimpleDateFormat(".yyyy_MM_dd_HH_mm_ss")
+ .format(new Date())));
return null;
}
});
@@ -145,6 +144,7 @@ public class FileWriter implements IWriter {
/**
* load history log file name array
+ *
* @return history log file name array
*/
private String[] getHistoryFilePath() {
@@ -216,7 +216,8 @@ public class FileWriter implements IWriter {
*
* @param message to log
*/
- @Override public void write(String message) {
+ @Override
+ public void write(String message) {
logBuffer.offer(message);
}
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java
index 9d193e9..2388f09 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
public interface IWriter {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java
index 7783134..f660d00 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java
@@ -16,13 +16,10 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
/**
* The representation of logging events. This instance is pass around to the List of Converter.
- *
- * @author alvin
*/
public class LogEvent {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java
index d53704e..702c3ee 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
-/**
- * Created by xin on 2016/12/7.
- */
public enum LogLevel {
DEBUG, INFO, WARN, ERROR, OFF
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java
index d5eeb8f..af128ca 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java
@@ -16,14 +16,11 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
/**
- * The <code>LogMessageHolder</code> is a {@link String} holder,
- * in order to in-process propagation String across the disruptor queue.
- *
- * @author wusheng
+ * The <code>LogMessageHolder</code> is a {@link String} holder, in order to in-process propagation String across the
+ * disruptor queue.
*/
public class LogMessageHolder {
private String message;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java
index 556654c..b4394fa 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java
@@ -16,12 +16,8 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
-/**
- * @author alvin
- */
public enum LogOutput {
FILE, CONSOLE
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java
index 743364e..8f3fa9b 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
import org.apache.skywalking.apm.agent.core.logging.core.coverts.LiteralConverter;
@@ -27,7 +26,6 @@ import java.util.Map;
/**
* Parser of LogPattern. It is used to parse a pattern to the List of Converter.
- * @author alvin
*/
public class Parser {
private final Map<String, Class<? extends Converter>> convertMaps;
@@ -36,7 +34,6 @@ public class Parser {
LITERAL_STATE, KEYWORD_STATE
}
-
public static final char ESCAPE_CHAR = '\\';
public static final char PERCENT_CHAR = '%';
@@ -45,7 +42,6 @@ public class Parser {
private int pointer = 0;
private State state = State.LITERAL_STATE;
-
public Parser(String pattern, Map<String, Class<? extends Converter>> convertMaps) {
if (pattern == null || pattern.length() == 0) {
throw new IllegalArgumentException("null or empty pattern string not allowed");
@@ -191,5 +187,4 @@ public class Parser {
}
}
-
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java
index 328cc51..d86dd29 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java
@@ -16,16 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.agent.core.logging.api.ILog;
import org.apache.skywalking.apm.agent.core.logging.api.LogResolver;
-/**
- * @author alvin
- */
public class PatternLogResolver implements LogResolver {
@Override
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
index 9a2bc53..87e92c7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java
@@ -35,16 +35,12 @@ import java.util.Map;
import java.util.regex.Matcher;
/**
- * A flexible Logger configurable with pattern string.
- * This is default implementation of {@link ILog}
- * This can parse a pattern to the List of converter with Parser.
- * We package LogEvent with message, level,timestamp ..., passing around to the List of converter to concat actually Log-String.
- *
- * @author alvin
+ * A flexible Logger configurable with pattern string. This is default implementation of {@link ILog} This can parse a
+ * pattern to the List of converter with Parser. We package LogEvent with message, level,timestamp ..., passing around
+ * to the List of converter to concat actually Log-String.
*/
public class PatternLogger implements ILog {
-
public static final Map<String, Class<? extends Converter>> DEFAULT_CONVERTER_MAP = new HashMap<String, Class<? extends Converter>>();
static {
@@ -84,7 +80,6 @@ public class PatternLogger implements ILog {
converters = new Parser(pattern, DEFAULT_CONVERTER_MAP).parse();
}
-
protected void logger(LogLevel level, String message, Throwable e) {
WriterFactory.getLogWriter().write(format(level, message, e));
}
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java
index 432915e..42e4b44 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
import java.io.PrintStream;
@@ -25,10 +24,7 @@ public enum SystemOutWriter implements IWriter {
INSTANCE;
/**
- * Tricky codes for avoiding style-check.
- * Because, in here, "system.out.println" is the only choice to output logs.
- *
- * @param message
+ * Tricky codes for avoiding style-check. Because, in here, "system.out.println" is the only choice to output logs.
*/
@Override
public void write(String message) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java
index 95db3dd..e8adf48 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core;
import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException;
@@ -25,9 +24,6 @@ import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.agent.core.conf.SnifferConfigInitializer;
import org.apache.skywalking.apm.util.StringUtil;
-/**
- * @author Alan Lau
- */
public class WriterFactory {
private static IWriter WRITER;
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java
index 3b47c80..0c690a1 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java
@@ -16,17 +16,12 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.conf.Config;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
import org.apache.skywalking.apm.agent.core.logging.core.LogEvent;
-/**
- *
- * @author alvin
- */
public class AgentNameConverter implements Converter {
@Override
public String convert(LogEvent logEvent) {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java
index 650b2c4..3bcf5a2 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
@@ -24,11 +23,9 @@ import org.apache.skywalking.apm.agent.core.logging.core.LogEvent;
/**
* Just return logEvent.getTargetClass().
- * @author alvin
*/
public class ClassConverter implements Converter {
-
@Override
public String convert(LogEvent logEvent) {
return logEvent.getTargetClass();
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java
index c4cbc4f..7487556 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
@@ -27,8 +26,6 @@ import java.util.Date;
/**
* The Converter is used to return a now date with format.
- *
- * @author alvin
*/
public class DateConverter implements Converter {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java
index 83e57b8..f016cf3 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
@@ -24,7 +23,6 @@ import org.apache.skywalking.apm.agent.core.logging.core.LogEvent;
/**
* Just return logEvent.getLevel().name()
- * @author alvin
*/
public class LevelConverter implements Converter {
@Override
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java
index 2fbb413..411b31a 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
@@ -24,7 +23,6 @@ import org.apache.skywalking.apm.agent.core.logging.core.LogEvent;
/**
* This Converter is used to return the literal.
- * @author alvin
*/
public class LiteralConverter implements Converter {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java
index 4bd34b3..106c266 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.agent.core.logging.core.coverts;
import org.apache.skywalking.apm.agent.core.logging.core.Converter;
@@ -24,7 +23,6 @@ import org.apache.skywalking.apm.agent.core.logging.core.LogEvent;
/**
* Just return the logEvent.getMessage()
- * @author alvin
*/
public class MessageConverter implements Converter {
@Override
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java
index 6fc2ba9..45e421d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java
@@ -16,7 +16,6 @@
*
*/
... 96119 lines suppressed ...