From 6930937c327e808d28791a3b76624f03157f5fb1 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 23 Oct 2017 18:18:08 +0800 Subject: [PATCH 01/10] To change the name of the author from pengys5 to Peng-yongsheng. --- .../agentjvm/grpc/handler/JVMMetricsServiceHandler.java | 2 +- .../agentjvm/worker/cpu/CpuMetricPersistenceWorker.java | 2 +- .../collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java | 2 +- .../collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java | 2 +- .../collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java | 2 +- .../agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java | 2 +- .../agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java | 2 +- .../agentjvm/worker/gc/GCMetricPersistenceWorker.java | 2 +- .../collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java | 2 +- .../collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java | 2 +- .../apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java | 2 +- .../agentjvm/worker/gc/define/GCMetricEsTableDefine.java | 2 +- .../agentjvm/worker/gc/define/GCMetricH2TableDefine.java | 2 +- .../worker/heartbeat/InstHeartBeatPersistenceWorker.java | 2 +- .../worker/heartbeat/dao/IInstanceHeartBeatDAO.java | 2 +- .../worker/heartbeat/dao/InstanceHeartBeatEsDAO.java | 2 +- .../worker/heartbeat/dao/InstanceHeartBeatH2DAO.java | 2 +- .../heartbeat/define/InstanceHeartBeatDataDefine.java | 2 +- .../worker/memory/MemoryMetricPersistenceWorker.java | 2 +- .../agentjvm/worker/memory/dao/IMemoryMetricDAO.java | 2 +- .../agentjvm/worker/memory/dao/MemoryMetricEsDAO.java | 2 +- .../agentjvm/worker/memory/dao/MemoryMetricH2DAO.java | 2 +- .../worker/memory/define/MemoryMetricEsTableDefine.java | 2 +- .../worker/memory/define/MemoryMetricH2TableDefine.java | 2 +- .../memorypool/MemoryPoolMetricPersistenceWorker.java | 2 +- .../worker/memorypool/dao/IMemoryPoolMetricDAO.java | 2 +- .../worker/memorypool/dao/MemoryPoolMetricEsDAO.java | 2 +- .../worker/memorypool/dao/MemoryPoolMetricH2DAO.java | 2 +- .../memorypool/define/MemoryPoolMetricEsTableDefine.java | 2 +- .../memorypool/define/MemoryPoolMetricH2TableDefine.java | 2 +- .../grpc/handler/JVMMetricsServiceHandlerTestCase.java | 2 +- .../agentregister/application/ApplicationIDService.java | 2 +- .../grpc/handler/ApplicationRegisterServiceHandler.java | 2 +- .../grpc/handler/InstanceDiscoveryServiceHandler.java | 2 +- .../grpc/handler/ServiceNameDiscoveryServiceHandler.java | 2 +- .../agentregister/instance/InstanceIDService.java | 2 +- .../jetty/handler/ApplicationRegisterServletHandler.java | 2 +- .../jetty/handler/InstanceDiscoveryServletHandler.java | 2 +- .../jetty/handler/ServiceNameDiscoveryServiceHandler.java | 2 +- .../agentregister/servicename/ServiceNameService.java | 2 +- .../collector/agentregister/worker/IdAutoIncrement.java | 2 +- .../worker/application/ApplicationEsTableDefine.java | 2 +- .../worker/application/ApplicationH2TableDefine.java | 2 +- .../application/ApplicationRegisterRemoteWorker.java | 2 +- .../application/ApplicationRegisterSerialWorker.java | 2 +- .../worker/application/dao/ApplicationEsDAO.java | 2 +- .../worker/application/dao/ApplicationH2DAO.java | 2 +- .../worker/application/dao/IApplicationDAO.java | 2 +- .../worker/instance/InstanceEsTableDefine.java | 2 +- .../worker/instance/InstanceH2TableDefine.java | 2 +- .../worker/instance/InstanceRegisterRemoteWorker.java | 2 +- .../worker/instance/InstanceRegisterSerialWorker.java | 2 +- .../agentregister/worker/instance/dao/IInstanceDAO.java | 2 +- .../agentregister/worker/instance/dao/InstanceEsDAO.java | 2 +- .../agentregister/worker/instance/dao/InstanceH2DAO.java | 2 +- .../worker/servicename/ServiceNameEsTableDefine.java | 2 +- .../worker/servicename/ServiceNameH2TableDefine.java | 2 +- .../servicename/ServiceNameRegisterRemoteWorker.java | 2 +- .../servicename/ServiceNameRegisterSerialWorker.java | 2 +- .../worker/servicename/dao/IServiceNameDAO.java | 2 +- .../worker/servicename/dao/ServiceNameEsDAO.java | 2 +- .../worker/servicename/dao/ServiceNameH2DAO.java | 2 +- .../handler/ApplicationRegisterServiceHandlerTestCase.java | 2 +- .../collector/agentserver/AgentServerModuleContext.java | 2 +- .../apm/collector/agentserver/AgentServerModuleDefine.java | 2 +- .../collector/agentserver/AgentServerModuleException.java | 2 +- .../agentserver/AgentServerModuleGroupDefine.java | 2 +- .../collector/agentserver/AgentServerModuleInstaller.java | 2 +- .../agentserver/jetty/AgentServerJettyConfig.java | 2 +- .../agentserver/jetty/AgentServerJettyConfigParser.java | 2 +- .../agentserver/jetty/AgentServerJettyDataListener.java | 2 +- .../agentserver/jetty/AgentServerJettyModuleDefine.java | 2 +- .../jetty/AgentServerJettyModuleRegistration.java | 2 +- .../jetty/handler/AgentStreamGRPCServerHandler.java | 2 +- .../jetty/handler/AgentStreamJettyServerHandler.java | 2 +- .../agentserver/jetty/handler/UIJettyServerHandler.java | 2 +- .../collector/agentstream/AgentStreamModuleContext.java | 2 +- .../apm/collector/agentstream/AgentStreamModuleDefine.java | 2 +- .../collector/agentstream/AgentStreamModuleException.java | 2 +- .../agentstream/AgentStreamModuleGroupConfigParser.java | 2 +- .../agentstream/AgentStreamModuleGroupDefine.java | 2 +- .../collector/agentstream/AgentStreamModuleInstaller.java | 2 +- .../apm/collector/agentstream/config/BufferFileConfig.java | 2 +- .../collector/agentstream/grpc/AgentStreamGRPCConfig.java | 2 +- .../agentstream/grpc/AgentStreamGRPCConfigParser.java | 2 +- .../agentstream/grpc/AgentStreamGRPCDataListener.java | 2 +- .../agentstream/grpc/AgentStreamGRPCModuleDefine.java | 2 +- .../grpc/AgentStreamGRPCModuleRegistration.java | 2 +- .../grpc/handler/TraceSegmentServiceHandler.java | 2 +- .../agentstream/jetty/AgentStreamJettyConfig.java | 2 +- .../agentstream/jetty/AgentStreamJettyConfigParser.java | 2 +- .../agentstream/jetty/AgentStreamJettyDataListener.java | 2 +- .../agentstream/jetty/AgentStreamJettyModuleDefine.java | 2 +- .../jetty/AgentStreamJettyModuleRegistration.java | 2 +- .../jetty/handler/TraceSegmentServletHandler.java | 2 +- .../jetty/handler/reader/KeyWithStringValueJsonReader.java | 2 +- .../agentstream/jetty/handler/reader/LogJsonReader.java | 2 +- .../jetty/handler/reader/ReferenceJsonReader.java | 2 +- .../jetty/handler/reader/SegmentJsonReader.java | 2 +- .../agentstream/jetty/handler/reader/SpanJsonReader.java | 2 +- .../agentstream/jetty/handler/reader/StreamJsonReader.java | 2 +- .../agentstream/jetty/handler/reader/TraceSegment.java | 2 +- .../jetty/handler/reader/TraceSegmentJsonReader.java | 2 +- .../jetty/handler/reader/UniqueIdJsonReader.java | 2 +- .../worker/AgentStreamModuleDefineException.java | 2 +- .../worker/global/GlobalTracePersistenceWorker.java | 2 +- .../agentstream/worker/global/GlobalTraceSpanListener.java | 2 +- .../agentstream/worker/global/dao/GlobalTraceEsDAO.java | 2 +- .../agentstream/worker/global/dao/GlobalTraceH2DAO.java | 2 +- .../agentstream/worker/global/dao/IGlobalTraceDAO.java | 2 +- .../worker/global/define/GlobalTraceEsTableDefine.java | 2 +- .../worker/global/define/GlobalTraceH2TableDefine.java | 2 +- .../performance/InstPerformancePersistenceWorker.java | 2 +- .../instance/performance/InstPerformanceSpanListener.java | 2 +- .../instance/performance/dao/IInstPerformanceDAO.java | 2 +- .../instance/performance/dao/InstPerformanceEsDAO.java | 2 +- .../instance/performance/dao/InstPerformanceH2DAO.java | 2 +- .../performance/define/InstPerformanceEsTableDefine.java | 2 +- .../performance/define/InstPerformanceH2TableDefine.java | 2 +- .../node/component/NodeComponentAggregationWorker.java | 2 +- .../node/component/NodeComponentPersistenceWorker.java | 2 +- .../worker/node/component/NodeComponentRemoteWorker.java | 2 +- .../worker/node/component/NodeComponentSpanListener.java | 2 +- .../worker/node/component/dao/INodeComponentDAO.java | 2 +- .../worker/node/component/dao/NodeComponentEsDAO.java | 2 +- .../worker/node/component/dao/NodeComponentH2DAO.java | 2 +- .../node/component/define/NodeComponentEsTableDefine.java | 2 +- .../node/component/define/NodeComponentH2TableDefine.java | 2 +- .../worker/node/mapping/NodeMappingAggregationWorker.java | 2 +- .../worker/node/mapping/NodeMappingPersistenceWorker.java | 2 +- .../worker/node/mapping/NodeMappingRemoteWorker.java | 2 +- .../worker/node/mapping/NodeMappingSpanListener.java | 2 +- .../worker/node/mapping/dao/INodeMappingDAO.java | 2 +- .../worker/node/mapping/dao/NodeMappingEsDAO.java | 2 +- .../worker/node/mapping/dao/NodeMappingH2DAO.java | 2 +- .../node/mapping/define/NodeMappingEsTableDefine.java | 2 +- .../node/mapping/define/NodeMappingH2TableDefine.java | 2 +- .../worker/noderef/NodeReferenceAggregationWorker.java | 2 +- .../worker/noderef/NodeReferencePersistenceWorker.java | 2 +- .../worker/noderef/NodeReferenceRemoteWorker.java | 2 +- .../worker/noderef/NodeReferenceSpanListener.java | 2 +- .../agentstream/worker/noderef/dao/INodeReferenceDAO.java | 2 +- .../agentstream/worker/noderef/dao/NodeReferenceEsDAO.java | 2 +- .../agentstream/worker/noderef/dao/NodeReferenceH2DAO.java | 2 +- .../worker/noderef/define/NodeReferenceEsTableDefine.java | 2 +- .../worker/noderef/define/NodeReferenceH2TableDefine.java | 2 +- .../agentstream/worker/segment/EntrySpanListener.java | 2 +- .../agentstream/worker/segment/ExitSpanListener.java | 2 +- .../agentstream/worker/segment/FirstSpanListener.java | 2 +- .../agentstream/worker/segment/GlobalTraceIdsListener.java | 2 +- .../agentstream/worker/segment/LocalSpanListener.java | 2 +- .../collector/agentstream/worker/segment/RefsListener.java | 2 +- .../collector/agentstream/worker/segment/SegmentParse.java | 2 +- .../collector/agentstream/worker/segment/SpanListener.java | 2 +- .../agentstream/worker/segment/buffer/Offset.java | 2 +- .../agentstream/worker/segment/buffer/OffsetManager.java | 2 +- .../worker/segment/buffer/SegmentBufferConfig.java | 2 +- .../worker/segment/buffer/SegmentBufferManager.java | 2 +- .../worker/segment/buffer/SegmentBufferReader.java | 2 +- .../worker/segment/cost/SegmentCostPersistenceWorker.java | 2 +- .../worker/segment/cost/SegmentCostSpanListener.java | 2 +- .../worker/segment/cost/dao/ISegmentCostDAO.java | 2 +- .../worker/segment/cost/dao/SegmentCostEsDAO.java | 2 +- .../worker/segment/cost/dao/SegmentCostH2DAO.java | 2 +- .../segment/cost/define/SegmentCostEsTableDefine.java | 2 +- .../segment/cost/define/SegmentCostH2TableDefine.java | 2 +- .../worker/segment/origin/SegmentPersistenceWorker.java | 2 +- .../agentstream/worker/segment/origin/dao/ISegmentDAO.java | 2 +- .../worker/segment/origin/dao/SegmentEsDAO.java | 2 +- .../worker/segment/origin/dao/SegmentH2DAO.java | 2 +- .../worker/segment/origin/define/SegmentEsTableDefine.java | 2 +- .../worker/segment/origin/define/SegmentH2TableDefine.java | 2 +- .../worker/segment/standardization/IdExchanger.java | 2 +- .../worker/segment/standardization/ReferenceDecorator.java | 2 +- .../segment/standardization/ReferenceIdExchanger.java | 2 +- .../worker/segment/standardization/SegmentDecorator.java | 2 +- .../standardization/SegmentStandardizationWorker.java | 2 +- .../worker/segment/standardization/SpanDecorator.java | 2 +- .../worker/segment/standardization/SpanIdExchanger.java | 2 +- .../worker/segment/standardization/StandardBuilder.java | 2 +- .../service/entry/ServiceEntryAggregationWorker.java | 2 +- .../service/entry/ServiceEntryPersistenceWorker.java | 2 +- .../worker/service/entry/ServiceEntryRemoteWorker.java | 2 +- .../worker/service/entry/ServiceEntrySpanListener.java | 2 +- .../worker/service/entry/dao/IServiceEntryDAO.java | 2 +- .../worker/service/entry/dao/ServiceEntryEsDAO.java | 2 +- .../worker/service/entry/dao/ServiceEntryH2DAO.java | 2 +- .../service/entry/define/ServiceEntryEsTableDefine.java | 2 +- .../service/entry/define/ServiceEntryH2TableDefine.java | 2 +- .../serviceref/ServiceReferenceAggregationWorker.java | 2 +- .../serviceref/ServiceReferencePersistenceWorker.java | 2 +- .../worker/serviceref/ServiceReferenceRemoteWorker.java | 2 +- .../worker/serviceref/ServiceReferenceSpanListener.java | 2 +- .../worker/serviceref/dao/IServiceReferenceDAO.java | 2 +- .../worker/serviceref/dao/ServiceReferenceEsDAO.java | 2 +- .../worker/serviceref/dao/ServiceReferenceH2DAO.java | 2 +- .../serviceref/define/ServiceReferenceEsTableDefine.java | 2 +- .../serviceref/define/ServiceReferenceH2TableDefine.java | 2 +- .../agentstream/worker/storage/PersistenceTimer.java | 2 +- .../apm/collector/agentstream/worker/util/FileUtils.java | 2 +- .../apm/collector/agentstream/HttpClientTools.java | 2 +- .../grpc/handler/TraceSegmentServiceHandlerTestCase.java | 2 +- .../handler/reader/TraceSegmentJsonReaderTestCase.java | 2 +- .../apm/collector/agentstream/mock/JsonFileReader.java | 2 +- .../apm/collector/agentstream/mock/SegmentPost.java | 2 +- .../agentstream/mock/grpc/ApplicationRegister.java | 2 +- .../collector/agentstream/mock/grpc/GrpcSegmentPost.java | 2 +- .../collector/agentstream/mock/grpc/InstanceRegister.java | 2 +- .../collector/agentstream/mock/grpc/ServiceRegister.java | 2 +- .../mock/grpc/SingleHasEntryHasExitNoRefSpan.java | 2 +- .../mock/grpc/SingleHasEntryNoExitHasRefSpan.java | 2 +- .../mock/grpc/SingleHasEntryNoExitNoRefSpan.java | 2 +- .../mock/grpc/SingleNoEntryHasExitNoRefSpan.java | 2 +- .../segment/buffer/SegmentBufferWriteWorkerTestCase.java | 4 ++-- .../apm/collector/boot/CollectorBootStartUp.java | 2 +- .../skywalking/apm/collector/boot/CollectorStarter.java | 2 +- .../skywalking/apm/collector/cache/ApplicationCache.java | 2 +- .../org/skywalking/apm/collector/cache/InstanceCache.java | 2 +- .../org/skywalking/apm/collector/cache/ServiceIdCache.java | 2 +- .../skywalking/apm/collector/cache/ServiceNameCache.java | 2 +- .../apm/collector/cache/dao/ApplicationEsCacheDAO.java | 2 +- .../apm/collector/cache/dao/ApplicationH2CacheDAO.java | 2 +- .../apm/collector/cache/dao/IApplicationCacheDAO.java | 2 +- .../apm/collector/cache/dao/IInstanceCacheDAO.java | 2 +- .../apm/collector/cache/dao/IServiceNameCacheDAO.java | 2 +- .../apm/collector/cache/dao/InstanceEsCacheDAO.java | 2 +- .../apm/collector/cache/dao/InstanceH2CacheDAO.java | 2 +- .../apm/collector/cache/dao/ServiceNameEsCacheDAO.java | 2 +- .../apm/collector/cache/dao/ServiceNameH2CacheDAO.java | 2 +- .../client/elasticsearch/ElasticSearchClient.java | 2 +- .../client/elasticsearch/ElasticSearchClientException.java | 2 +- .../skywalking/apm/collector/client/grpc/GRPCClient.java | 2 +- .../apm/collector/client/grpc/GRPCClientException.java | 2 +- .../org/skywalking/apm/collector/client/h2/H2Client.java | 2 +- .../apm/collector/client/h2/H2ClientException.java | 2 +- .../skywalking/apm/collector/client/redis/RedisClient.java | 2 +- .../apm/collector/client/redis/RedisClientException.java | 2 +- .../apm/collector/client/zookeeper/ZookeeperClient.java | 2 +- .../client/zookeeper/ZookeeperClientException.java | 2 +- .../apm/collector/client/zookeeper/util/PathUtils.java | 2 +- .../apm/collector/cluster/ClusterModuleDefine.java | 2 +- .../apm/collector/cluster/ClusterModuleGroupDefine.java | 2 +- .../apm/collector/cluster/ClusterModuleInstaller.java | 2 +- .../apm/collector/cluster/ClusterNodeExistException.java | 2 +- .../apm/collector/cluster/redis/ClusterRedisConfig.java | 2 +- .../collector/cluster/redis/ClusterRedisConfigParser.java | 2 +- .../collector/cluster/redis/ClusterRedisModuleDefine.java | 2 +- .../redis/ClusterRedisModuleRegistrationReader.java | 2 +- .../cluster/standalone/ClusterStandaloneConfigParser.java | 2 +- .../cluster/standalone/ClusterStandaloneDataMonitor.java | 2 +- .../cluster/standalone/ClusterStandaloneModuleDefine.java | 2 +- .../ClusterStandaloneModuleRegistrationReader.java | 2 +- .../apm/collector/cluster/zookeeper/ClusterZKConfig.java | 2 +- .../collector/cluster/zookeeper/ClusterZKConfigParser.java | 2 +- .../collector/cluster/zookeeper/ClusterZKDataMonitor.java | 2 +- .../collector/cluster/zookeeper/ClusterZKModuleDefine.java | 2 +- .../zookeeper/ClusterZKModuleRegistrationReader.java | 2 +- .../skywalking/apm/collector/core/CollectorException.java | 2 +- .../org/skywalking/apm/collector/core/client/Client.java | 2 +- .../apm/collector/core/client/ClientException.java | 2 +- .../skywalking/apm/collector/core/client/DataMonitor.java | 2 +- .../apm/collector/core/cluster/ClusterDataListener.java | 2 +- .../collector/core/cluster/ClusterDataListenerDefine.java | 2 +- .../apm/collector/core/cluster/ClusterModuleContext.java | 2 +- .../apm/collector/core/cluster/ClusterModuleDiscovery.java | 2 +- .../apm/collector/core/cluster/ClusterModuleException.java | 2 +- .../core/cluster/ClusterModuleRegistrationReader.java | 2 +- .../apm/collector/core/config/ConfigException.java | 2 +- .../skywalking/apm/collector/core/config/ConfigLoader.java | 2 +- .../apm/collector/core/config/ConfigLoaderException.java | 2 +- .../apm/collector/core/config/ConfigParseException.java | 2 +- .../apm/collector/core/config/GroupConfigParser.java | 2 +- .../skywalking/apm/collector/core/config/SystemConfig.java | 2 +- .../apm/collector/core/config/SystemConfigParser.java | 2 +- .../collector/core/framework/CollectorContextHelper.java | 2 +- .../skywalking/apm/collector/core/framework/Context.java | 2 +- .../apm/collector/core/framework/DataInitializer.java | 2 +- .../skywalking/apm/collector/core/framework/Decision.java | 2 +- .../skywalking/apm/collector/core/framework/Define.java | 2 +- .../apm/collector/core/framework/DefineException.java | 2 +- .../apm/collector/core/framework/DefinitionFile.java | 2 +- .../skywalking/apm/collector/core/framework/Executor.java | 2 +- .../skywalking/apm/collector/core/framework/Handler.java | 2 +- .../skywalking/apm/collector/core/framework/Listener.java | 2 +- .../skywalking/apm/collector/core/framework/Loader.java | 2 +- .../apm/collector/core/framework/PriorityDecision.java | 2 +- .../skywalking/apm/collector/core/framework/Provider.java | 2 +- .../skywalking/apm/collector/core/framework/Starter.java | 2 +- .../apm/collector/core/framework/UnexpectedException.java | 2 +- .../apm/collector/core/module/CommonModuleInstaller.java | 2 +- .../org/skywalking/apm/collector/core/module/Module.java | 2 +- .../apm/collector/core/module/ModuleConfigLoader.java | 2 +- .../apm/collector/core/module/ModuleConfigParser.java | 2 +- .../apm/collector/core/module/ModuleContext.java | 2 +- .../skywalking/apm/collector/core/module/ModuleDefine.java | 2 +- .../apm/collector/core/module/ModuleDefineException.java | 2 +- .../apm/collector/core/module/ModuleDefineLoader.java | 2 +- .../apm/collector/core/module/ModuleDefinitionFile.java | 2 +- .../apm/collector/core/module/ModuleException.java | 2 +- .../apm/collector/core/module/ModuleGroupDefine.java | 2 +- .../apm/collector/core/module/ModuleGroupDefineFile.java | 2 +- .../apm/collector/core/module/ModuleGroupDefineLoader.java | 2 +- .../apm/collector/core/module/ModuleInstaller.java | 2 +- .../apm/collector/core/module/ModuleRegistration.java | 2 +- .../apm/collector/core/module/MultipleModuleInstaller.java | 2 +- .../apm/collector/core/module/SingleModuleInstaller.java | 2 +- .../apm/collector/core/queue/DaemonThreadFactory.java | 2 +- .../apm/collector/core/queue/EndOfBatchCommand.java | 2 +- .../skywalking/apm/collector/core/queue/MessageHolder.java | 2 +- .../skywalking/apm/collector/core/queue/QueueCreator.java | 2 +- .../apm/collector/core/queue/QueueEventHandler.java | 2 +- .../skywalking/apm/collector/core/queue/QueueExecutor.java | 2 +- .../org/skywalking/apm/collector/core/remote/Remote.java | 2 +- .../org/skywalking/apm/collector/core/server/Server.java | 2 +- .../apm/collector/core/server/ServerException.java | 2 +- .../skywalking/apm/collector/core/server/ServerHolder.java | 2 +- .../apm/collector/core/server/ServerModuleDefine.java | 2 +- .../apm/collector/core/storage/ColumnDefine.java | 2 +- .../apm/collector/core/storage/StorageBatchBuilder.java | 2 +- .../apm/collector/core/storage/StorageDefineLoader.java | 2 +- .../apm/collector/core/storage/StorageDefinitionFile.java | 2 +- .../apm/collector/core/storage/StorageException.java | 2 +- .../collector/core/storage/StorageInstallException.java | 2 +- .../apm/collector/core/storage/StorageInstaller.java | 2 +- .../skywalking/apm/collector/core/storage/TableDefine.java | 2 +- .../apm/collector/core/stream/AbstractHashMessage.java | 2 +- .../org/skywalking/apm/collector/core/stream/Data.java | 2 +- .../skywalking/apm/collector/core/stream/Operation.java | 2 +- .../skywalking/apm/collector/core/stream/Transform.java | 2 +- .../apm/collector/core/stream/operate/AddOperation.java | 2 +- .../apm/collector/core/stream/operate/CoverOperation.java | 2 +- .../apm/collector/core/stream/operate/NonOperation.java | 2 +- .../org/skywalking/apm/collector/core/util/BytesUtils.java | 2 +- .../apm/collector/core/util/CollectionUtils.java | 2 +- .../apm/collector/core/util/ColumnNameUtils.java | 2 +- .../java/org/skywalking/apm/collector/core/util/Const.java | 2 +- .../apm/collector/core/util/DefinitionLoader.java | 2 +- .../skywalking/apm/collector/core/util/ObjectUtils.java | 2 +- .../skywalking/apm/collector/core/util/ResourceUtils.java | 2 +- .../skywalking/apm/collector/core/util/StringUtils.java | 2 +- .../apm/collector/core/util/TimeBucketUtils.java | 2 +- .../apm/collector/core/utils/ColumnNameUtilsTestCase.java | 2 +- .../apm/collector/core/utils/TimeBucketUtilsTestCase.java | 2 +- .../skywalking/apm/collector/queue/QueueModuleContext.java | 2 +- .../skywalking/apm/collector/queue/QueueModuleDefine.java | 2 +- .../apm/collector/queue/QueueModuleException.java | 2 +- .../apm/collector/queue/QueueModuleGroupDefine.java | 2 +- .../apm/collector/queue/QueueModuleInstaller.java | 2 +- .../queue/datacarrier/DataCarrierQueueConfigParser.java | 2 +- .../queue/datacarrier/DataCarrierQueueCreator.java | 2 +- .../queue/datacarrier/QueueDataCarrierModuleDefine.java | 2 +- .../collector/queue/disruptor/DisruptorEventHandler.java | 2 +- .../queue/disruptor/DisruptorQueueConfigParser.java | 2 +- .../collector/queue/disruptor/DisruptorQueueCreator.java | 2 +- .../collector/queue/disruptor/MessageHolderFactory.java | 2 +- .../queue/disruptor/QueueDisruptorModuleDefine.java | 2 +- .../skywalking/apm/collector/server/grpc/GRPCHandler.java | 2 +- .../skywalking/apm/collector/server/grpc/GRPCServer.java | 2 +- .../apm/collector/server/grpc/GRPCServerException.java | 2 +- .../collector/server/jetty/ArgumentsParseException.java | 2 +- .../apm/collector/server/jetty/JettyHandler.java | 2 +- .../skywalking/apm/collector/server/jetty/JettyServer.java | 2 +- .../apm/collector/server/jetty/JettyServerException.java | 2 +- .../apm/collector/storage/StorageModuleContext.java | 2 +- .../apm/collector/storage/StorageModuleDefine.java | 2 +- .../apm/collector/storage/StorageModuleException.java | 2 +- .../apm/collector/storage/StorageModuleGroupDefine.java | 2 +- .../apm/collector/storage/StorageModuleInstaller.java | 2 +- .../java/org/skywalking/apm/collector/storage/dao/DAO.java | 2 +- .../skywalking/apm/collector/storage/dao/DAOContainer.java | 2 +- .../skywalking/apm/collector/storage/dao/IBatchDAO.java | 2 +- .../skywalking/apm/collector/storage/define/Attribute.java | 2 +- .../apm/collector/storage/define/AttributeType.java | 2 +- .../apm/collector/storage/define/CommonTable.java | 2 +- .../apm/collector/storage/define/DataDefine.java | 2 +- .../storage/define/global/GlobalTraceDataDefine.java | 2 +- .../collector/storage/define/global/GlobalTraceTable.java | 2 +- .../storage/define/instance/InstPerformanceDataDefine.java | 2 +- .../storage/define/instance/InstPerformanceTable.java | 2 +- .../collector/storage/define/jvm/CpuMetricDataDefine.java | 2 +- .../apm/collector/storage/define/jvm/CpuMetricTable.java | 2 +- .../collector/storage/define/jvm/GCMetricDataDefine.java | 2 +- .../apm/collector/storage/define/jvm/GCMetricTable.java | 2 +- .../storage/define/jvm/MemoryMetricDataDefine.java | 2 +- .../collector/storage/define/jvm/MemoryMetricTable.java | 2 +- .../storage/define/jvm/MemoryPoolMetricDataDefine.java | 2 +- .../storage/define/jvm/MemoryPoolMetricTable.java | 2 +- .../storage/define/node/NodeComponentDataDefine.java | 2 +- .../collector/storage/define/node/NodeComponentTable.java | 2 +- .../storage/define/node/NodeMappingDataDefine.java | 2 +- .../collector/storage/define/node/NodeMappingTable.java | 2 +- .../storage/define/noderef/NodeReferenceDataDefine.java | 2 +- .../storage/define/noderef/NodeReferenceTable.java | 2 +- .../storage/define/register/ApplicationDataDefine.java | 2 +- .../storage/define/register/ApplicationTable.java | 2 +- .../storage/define/register/InstanceDataDefine.java | 2 +- .../collector/storage/define/register/InstanceTable.java | 2 +- .../storage/define/register/ServiceNameDataDefine.java | 2 +- .../storage/define/register/ServiceNameTable.java | 2 +- .../storage/define/segment/SegmentCostDataDefine.java | 2 +- .../collector/storage/define/segment/SegmentCostTable.java | 2 +- .../storage/define/segment/SegmentDataDefine.java | 2 +- .../apm/collector/storage/define/segment/SegmentTable.java | 2 +- .../storage/define/service/ServiceEntryDataDefine.java | 2 +- .../storage/define/service/ServiceEntryTable.java | 2 +- .../define/serviceref/ServiceReferenceDataDefine.java | 2 +- .../storage/define/serviceref/ServiceReferenceTable.java | 2 +- .../elasticsearch/ElasticSearchStorageException.java | 2 +- .../storage/elasticsearch/StorageElasticSearchConfig.java | 2 +- .../elasticsearch/StorageElasticSearchConfigParser.java | 2 +- .../elasticsearch/StorageElasticSearchModuleDefine.java | 2 +- .../collector/storage/elasticsearch/dao/BatchEsDAO.java | 2 +- .../apm/collector/storage/elasticsearch/dao/EsDAO.java | 2 +- .../storage/elasticsearch/dao/EsDAODefineLoader.java | 2 +- .../storage/elasticsearch/dao/EsDAODefinitionFile.java | 2 +- .../elasticsearch/define/ElasticSearchColumnDefine.java | 2 +- .../define/ElasticSearchStorageInstaller.java | 2 +- .../elasticsearch/define/ElasticSearchTableDefine.java | 2 +- .../apm/collector/storage/h2/StorageH2ConfigParser.java | 2 +- .../apm/collector/storage/h2/StorageH2ModuleDefine.java | 2 +- .../apm/collector/storage/h2/dao/BatchH2DAO.java | 2 +- .../org/skywalking/apm/collector/storage/h2/dao/H2DAO.java | 2 +- .../apm/collector/storage/h2/dao/H2DAODefineLoader.java | 2 +- .../apm/collector/storage/h2/dao/H2DAODefinitionFile.java | 2 +- .../apm/collector/storage/h2/define/H2ColumnDefine.java | 2 +- .../collector/storage/h2/define/H2StorageInstaller.java | 2 +- .../apm/collector/storage/h2/define/H2TableDefine.java | 2 +- .../apm/collector/stream/StreamModuleContext.java | 2 +- .../apm/collector/stream/StreamModuleDefine.java | 2 +- .../apm/collector/stream/StreamModuleException.java | 2 +- .../apm/collector/stream/StreamModuleGroupDefine.java | 2 +- .../apm/collector/stream/StreamModuleInstaller.java | 2 +- .../apm/collector/stream/grpc/StreamGRPCConfig.java | 2 +- .../apm/collector/stream/grpc/StreamGRPCConfigParser.java | 2 +- .../apm/collector/stream/grpc/StreamGRPCDataListener.java | 2 +- .../apm/collector/stream/grpc/StreamGRPCModuleDefine.java | 2 +- .../stream/grpc/StreamGRPCModuleRegistration.java | 2 +- .../stream/grpc/handler/RemoteCommonServiceHandler.java | 2 +- .../collector/stream/worker/AbstractLocalAsyncWorker.java | 2 +- .../stream/worker/AbstractLocalAsyncWorkerProvider.java | 2 +- .../apm/collector/stream/worker/AbstractRemoteWorker.java | 2 +- .../stream/worker/AbstractRemoteWorkerProvider.java | 2 +- .../apm/collector/stream/worker/AbstractWorker.java | 2 +- .../collector/stream/worker/AbstractWorkerProvider.java | 2 +- .../apm/collector/stream/worker/ClusterWorkerContext.java | 2 +- .../collector/stream/worker/ClusterWorkerRefCounter.java | 2 +- .../skywalking/apm/collector/stream/worker/Context.java | 2 +- .../worker/LocalAsyncWorkerProviderDefineLoader.java | 2 +- .../apm/collector/stream/worker/LocalAsyncWorkerRef.java | 2 +- .../stream/worker/LocalWorkerProviderDefinitionFile.java | 2 +- .../org/skywalking/apm/collector/stream/worker/LookUp.java | 2 +- .../skywalking/apm/collector/stream/worker/Provider.java | 2 +- .../stream/worker/RemoteWorkerProviderDefineLoader.java | 2 +- .../stream/worker/RemoteWorkerProviderDefinitionFile.java | 2 +- .../apm/collector/stream/worker/RemoteWorkerRef.java | 2 +- .../org/skywalking/apm/collector/stream/worker/Role.java | 2 +- .../apm/collector/stream/worker/WorkerContext.java | 2 +- .../apm/collector/stream/worker/WorkerException.java | 2 +- .../apm/collector/stream/worker/WorkerInvokeException.java | 2 +- .../skywalking/apm/collector/stream/worker/WorkerRef.java | 2 +- .../skywalking/apm/collector/stream/worker/WorkerRefs.java | 2 +- .../collector/stream/worker/impl/AggregationWorker.java | 2 +- .../apm/collector/stream/worker/impl/FlushAndSwitch.java | 2 +- .../apm/collector/stream/worker/impl/GRPCRemoteWorker.java | 2 +- .../collector/stream/worker/impl/PersistenceWorker.java | 2 +- .../stream/worker/impl/PersistenceWorkerContainer.java | 2 +- .../collector/stream/worker/impl/dao/IPersistenceDAO.java | 2 +- .../apm/collector/stream/worker/impl/data/DataCache.java | 2 +- .../collector/stream/worker/impl/data/DataCollection.java | 2 +- .../apm/collector/stream/worker/impl/data/Window.java | 2 +- .../stream/worker/selector/ForeverFirstSelector.java | 2 +- .../collector/stream/worker/selector/HashCodeSelector.java | 2 +- .../collector/stream/worker/selector/RollingSelector.java | 2 +- .../collector/stream/worker/selector/WorkerSelector.java | 2 +- .../stream/worker/util/TimeBucketUtilsTestCase.java | 2 +- .../org/skywalking/apm/collector/ui/UIModuleContext.java | 2 +- .../org/skywalking/apm/collector/ui/UIModuleDefine.java | 2 +- .../org/skywalking/apm/collector/ui/UIModuleException.java | 2 +- .../skywalking/apm/collector/ui/UIModuleGroupDefine.java | 2 +- .../org/skywalking/apm/collector/ui/UIModuleInstaller.java | 2 +- .../skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java | 2 +- .../skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/ICpuMetricDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/IGCMetricDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/IGlobalTraceDAO.java | 2 +- .../apm/collector/ui/dao/IInstPerformanceDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/IInstanceDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/IMemoryMetricDAO.java | 2 +- .../apm/collector/ui/dao/IMemoryPoolMetricDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/INodeComponentDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/INodeMappingDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/INodeReferenceDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/ISegmentCostDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/ISegmentDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/IServiceEntryDAO.java | 2 +- .../apm/collector/ui/dao/IServiceReferenceDAO.java | 2 +- .../apm/collector/ui/dao/InstPerformanceEsDAO.java | 2 +- .../apm/collector/ui/dao/InstPerformanceH2DAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java | 2 +- .../skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java | 2 +- .../apm/collector/ui/dao/MemoryPoolMetricEsDAO.java | 2 +- .../apm/collector/ui/dao/NodeComponentEsDAO.java | 2 +- .../apm/collector/ui/dao/NodeComponentH2DAO.java | 2 +- .../skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java | 2 +- .../apm/collector/ui/dao/NodeReferenceEsDAO.java | 2 +- .../apm/collector/ui/dao/NodeReferenceH2DAO.java | 2 +- .../skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java | 2 +- .../org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java | 2 +- .../skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java | 2 +- .../skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java | 2 +- .../apm/collector/ui/dao/ServiceReferenceEsDAO.java | 2 +- .../apm/collector/ui/dao/ServiceReferenceH2DAO.java | 2 +- .../skywalking/apm/collector/ui/jetty/UIJettyConfig.java | 2 +- .../apm/collector/ui/jetty/UIJettyConfigParser.java | 2 +- .../apm/collector/ui/jetty/UIJettyDataListener.java | 2 +- .../apm/collector/ui/jetty/UIJettyModuleDefine.java | 2 +- .../apm/collector/ui/jetty/UIJettyModuleRegistration.java | 2 +- .../collector/ui/jetty/handler/SegmentTopGetHandler.java | 2 +- .../apm/collector/ui/jetty/handler/SpanGetHandler.java | 2 +- .../apm/collector/ui/jetty/handler/TraceDagGetHandler.java | 2 +- .../collector/ui/jetty/handler/TraceStackGetHandler.java | 2 +- .../jetty/handler/application/ApplicationsGetHandler.java | 2 +- .../handler/instancehealth/InstanceHealthGetHandler.java | 2 +- .../InstanceMetricGetOneTimeBucketHandler.java | 2 +- .../InstanceMetricGetRangeTimeBucketHandler.java | 2 +- .../handler/instancemetric/InstanceOsInfoGetHandler.java | 2 +- .../jetty/handler/servicetree/EntryServiceGetHandler.java | 2 +- .../handler/servicetree/ServiceTreeGetByIdHandler.java | 2 +- .../jetty/handler/time/AllInstanceLastTimeGetHandler.java | 2 +- .../jetty/handler/time/OneInstanceLastTimeGetHandler.java | 2 +- .../apm/collector/ui/service/ApplicationService.java | 2 +- .../apm/collector/ui/service/InstanceHealthService.java | 2 +- .../apm/collector/ui/service/InstanceJVMService.java | 2 +- .../apm/collector/ui/service/SegmentTopService.java | 2 +- .../apm/collector/ui/service/ServiceTreeService.java | 2 +- .../skywalking/apm/collector/ui/service/SpanService.java | 2 +- .../apm/collector/ui/service/TimeSynchronousService.java | 2 +- .../apm/collector/ui/service/TraceDagDataBuilder.java | 2 +- .../apm/collector/ui/service/TraceDagService.java | 2 +- .../apm/collector/ui/service/TraceStackService.java | 2 +- .../plugin/feign/http/v9/DefaultHttpClientInterceptor.java | 2 +- .../http/v9/define/DefaultHttpClientInstrumentation.java | 2 +- .../feign/http/v9/DefaultHttpClientInterceptorTest.java | 2 +- .../apm/plugin/okhttp/v3/RealCallInterceptor.java | 2 +- .../plugin/okhttp/v3/define/RealCallInstrumentation.java | 2 +- .../apm/plugin/okhttp/v3/RealCallInterceptorTest.java | 2 +- pom.xml | 7 ++++--- 555 files changed, 559 insertions(+), 558 deletions(-) diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java index 24470b61b..5e59f8e74 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java @@ -49,7 +49,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java index 3337b65bc..562db2c01 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java index cf1f6f265..03b42d710 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricEsDAO extends EsDAO implements ICpuMetricDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java index 349c15b5f..9d0e8f73b 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(CpuMetricH2DAO.class); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java index 9b30deaa1..03672b450 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ICpuMetricDAO { } diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java index 4f8f83e1d..c73389119 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java index 0a72003a2..8aeca7b55 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java index 45f41a04e..68f6151ba 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java index 21918bf94..e48122d56 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricEsDAO extends EsDAO implements IGCMetricDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java index bbe619015..3259db1ae 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO, IPersistenceDAO { @Override public Data get(String id, DataDefine dataDefine) { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java index 02fc383fc..3a3f216e6 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IGCMetricDAO { } diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java index 1ce6f534f..a5012800a 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java index 674b3eed8..d38789912 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java index 6dab14f27..bd37b9e28 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstHeartBeatPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/IInstanceHeartBeatDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/IInstanceHeartBeatDAO.java index ce368858a..31603c96f 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/IInstanceHeartBeatDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/IInstanceHeartBeatDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentjvm.worker.heartbeat.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstanceHeartBeatDAO { } \ No newline at end of file diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java index 54ce1e237..124807197 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceHeartBeatEsDAO extends EsDAO implements IInstanceHeartBeatDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java index ecc7f5418..65c05d1cf 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class InstanceHeartBeatH2DAO extends H2DAO implements IInstanceHeartBeatDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatEsDAO.class); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java index d1590d3aa..8ab56aff4 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.register.InstanceTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceHeartBeatDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java index 4bbeaf282..00f4b700f 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/IMemoryMetricDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/IMemoryMetricDAO.java index f7b14c059..5f422ceb0 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/IMemoryMetricDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/IMemoryMetricDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IMemoryMetricDAO { } diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java index 8bcdb9ca8..442f42541 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricEsDAO extends EsDAO implements IMemoryMetricDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java index 3d6fb0d4d..8ce088268 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO, IPersistenceDAO { @Override public Data get(String id, DataDefine dataDefine) { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java index 34823a06f..947e75772 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java index 3448d7839..b03bd692c 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java index c549c82fd..11273ed47 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/IMemoryPoolMetricDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/IMemoryPoolMetricDAO.java index 8ef9394b3..87c2d07f6 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/IMemoryPoolMetricDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/IMemoryPoolMetricDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IMemoryPoolMetricDAO { } diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java index c58ea34c3..0e2b3953c 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricEsDAO extends EsDAO implements IMemoryPoolMetricDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java index 8ecfe5ab5..82b54bba9 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO, IPersistenceDAO { @Override public Data get(String id, DataDefine dataDefine) { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java index 8942c2d0d..d8bba3980 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java index 6a430f09b..1ada2297c 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentjvm/src/test/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandlerTestCase.java b/apm-collector/apm-collector-agentjvm/src/test/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandlerTestCase.java index e3c632122..fbb746256 100644 --- a/apm-collector/apm-collector-agentjvm/src/test/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandlerTestCase.java +++ b/apm-collector/apm-collector-agentjvm/src/test/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandlerTestCase.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class JVMMetricsServiceHandlerTestCase { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java index bfdc125c3..20dbb3fd5 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationIDService { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandler.java index a677ebe00..c0fc2fb4d 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandler.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegisterServiceHandler extends ApplicationRegisterServiceGrpc.ApplicationRegisterServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/InstanceDiscoveryServiceHandler.java index 2a310ee3f..ed5922657 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/InstanceDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/InstanceDiscoveryServiceHandler.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceDiscoveryServiceHandler extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ServiceNameDiscoveryServiceHandler.java index 6d6270f3e..5b77ee4b1 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ServiceNameDiscoveryServiceHandler.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameDiscoveryServiceHandler extends ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java index 4a209f98c..01678eef3 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceIDService { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ApplicationRegisterServletHandler.java index c1b66d03c..2c932efde 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ApplicationRegisterServletHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ApplicationRegisterServletHandler.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegisterServletHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/InstanceDiscoveryServletHandler.java index 4ab3c1f59..1e847b1f3 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/InstanceDiscoveryServletHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/InstanceDiscoveryServletHandler.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceDiscoveryServletHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ServiceNameDiscoveryServiceHandler.java index 077e7fcac..87f8083d5 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ServiceNameDiscoveryServiceHandler.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameDiscoveryServiceHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java index fa0a0de23..4f4daa761 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameService { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/IdAutoIncrement.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/IdAutoIncrement.java index 3d5f4ace4..a9e06117b 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/IdAutoIncrement.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/IdAutoIncrement.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentregister.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public enum IdAutoIncrement { INSTANCE; diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java index c1e5d2efa..0db462e6a 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java index 57f098ad6..e7e4b6000 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java index 08bdf568d..d29e9a2be 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java index fcfd356e2..2bcc9fb27 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java index 56c9126bb..1e4e299db 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationEsDAO extends EsDAO implements IApplicationDAO { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java index e63ceb38b..b4e90a68c 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ApplicationH2DAO extends H2DAO implements IApplicationDAO { private final Logger logger = LoggerFactory.getLogger(ApplicationH2DAO.class); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java index 541ec6329..671c762d0 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.application.dao; import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IApplicationDAO { int getMaxApplicationId(); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java index 5a52a9900..7e5c854c1 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java index dcfc025f1..1c8bcc6d7 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java index 889b4cc91..e86ac5be8 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceRegisterRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java index 4bcd9bb90..0c581ec64 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java index 30d73be45..95dd699ef 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.instance.dao; import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstanceDAO { int getInstanceId(int applicationId, String agentUUID); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java index cdebd628c..dc49691e4 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceEsDAO extends EsDAO implements IInstanceDAO { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java index 11cc4f35c..737c42560 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java index 201b2a430..85cfc58e1 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java index 65ae059f6..6dea89617 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java index 561e0105a..28708f868 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameRegisterRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java index 612d82a27..ac893e3c4 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java index 94c535197..d3bb8bf7c 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.servicename.dao; import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceNameDAO { int getMaxServiceId(); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java index b79d79617..0aaa73934 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameEsDAO extends EsDAO implements IServiceNameDAO { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java index b224a578e..e839e5d48 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ServiceNameH2DAO extends H2DAO implements IServiceNameDAO { private final Logger logger = LoggerFactory.getLogger(ServiceNameH2DAO.class); diff --git a/apm-collector/apm-collector-agentregister/src/test/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java b/apm-collector/apm-collector-agentregister/src/test/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java index 25a990111..60998263d 100644 --- a/apm-collector/apm-collector-agentregister/src/test/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java +++ b/apm-collector/apm-collector-agentregister/src/test/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegisterServiceHandlerTestCase { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleContext.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleContext.java index f855de228..96e7c4bbf 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleContext.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleContext.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerModuleContext extends Context { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleDefine.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleDefine.java index cde1396cd..8350d678f 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleDefine.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine; import org.skywalking.apm.collector.core.module.ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AgentServerModuleDefine extends ModuleDefine implements ClusterDataListenerDefine { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleException.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleException.java index fc16eebf9..85e199609 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleException.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerModuleException extends ModuleException { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleGroupDefine.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleGroupDefine.java index c3567257a..f4b4a7e0a 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleGroupDefine.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleInstaller.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleInstaller.java index eaad79ba3..7fab0006c 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleInstaller.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleInstaller.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.framework.Context; import org.skywalking.apm.collector.core.module.MultipleModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerModuleInstaller extends MultipleModuleInstaller { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfig.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfig.java index 8a4f92edb..23daa2ff2 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfig.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentserver.jetty; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerJettyConfig { public static String HOST; diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfigParser.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfigParser.java index e6be19ded..304cc042f 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfigParser.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerJettyConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyDataListener.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyDataListener.java index b36a3ab4b..4184b6945 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyDataListener.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyDataListener.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine; import org.skywalking.apm.collector.core.cluster.ClusterDataListener; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerJettyDataListener extends ClusterDataListener { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java index 1f6332552..d2a58edab 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java @@ -33,7 +33,7 @@ import org.skywalking.apm.collector.core.server.Server; import org.skywalking.apm.collector.server.jetty.JettyServer; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerJettyModuleDefine extends AgentServerModuleDefine { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleRegistration.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleRegistration.java index d64c661c2..9e292b7ca 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleRegistration.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleRegistration.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver.jetty; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentServerJettyModuleRegistration extends ModuleRegistration { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamGRPCServerHandler.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamGRPCServerHandler.java index 0857c8159..2ebdadb72 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamGRPCServerHandler.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamGRPCServerHandler.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCServerHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamJettyServerHandler.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamJettyServerHandler.java index 882525165..106a39a69 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamJettyServerHandler.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamJettyServerHandler.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyServerHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java index d08a1ee2f..32a9c74c1 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.ui.jetty.UIJettyDataListener; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyServerHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleContext.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleContext.java index 8d17822ca..9a369fba5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleContext.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleContext.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleContext extends Context { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleDefine.java index 36ab963d5..abfca76e9 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine; import org.skywalking.apm.collector.core.module.ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AgentStreamModuleDefine extends ModuleDefine implements ClusterDataListenerDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleException.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleException.java index a97776918..e5ec1b86b 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleException.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleException extends ModuleException { public AgentStreamModuleException(String message) { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupConfigParser.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupConfigParser.java index a22f7b331..425b46d59 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupConfigParser.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupConfigParser.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.agentstream.config.BufferFileConfig; import org.skywalking.apm.collector.core.config.GroupConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleGroupConfigParser implements GroupConfigParser { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupDefine.java index bfc1b745f..7b2501cda 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleInstaller.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleInstaller.java index e8b941a63..416e5007c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleInstaller.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleInstaller.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.core.module.MultipleModuleInstaller; import org.skywalking.apm.collector.core.server.ServerException; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleInstaller extends MultipleModuleInstaller { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/config/BufferFileConfig.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/config/BufferFileConfig.java index 4853865dd..89ef3183d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/config/BufferFileConfig.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/config/BufferFileConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.config; /** - * @author pengys5 + * @author peng-yongsheng */ public class BufferFileConfig { public static int BUFFER_OFFSET_MAX_FILE_SIZE = 10 * 1024 * 1024; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfig.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfig.java index 74a71bfb3..e98c32df1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfig.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.grpc; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCConfig { public static String HOST; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfigParser.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfigParser.java index 24f463c3d..d9e3ef987 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfigParser.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCDataListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCDataListener.java index dedd9f0ff..fed873fcf 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCDataListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCDataListener.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine; import org.skywalking.apm.collector.core.cluster.ClusterDataListener; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCDataListener extends ClusterDataListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleDefine.java index d269ffc39..23b643575 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleDefine.java @@ -35,7 +35,7 @@ import org.skywalking.apm.collector.core.server.Server; import org.skywalking.apm.collector.server.grpc.GRPCServer; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCModuleDefine extends AgentStreamModuleDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleRegistration.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleRegistration.java index 8caf3d7cc..ef742a3b0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleRegistration.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleRegistration.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.grpc; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamGRPCModuleRegistration extends ModuleRegistration { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandler.java index a5ceaae34..b7382c585 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandler.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandler.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSegmentServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfig.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfig.java index 831c37fc8..a29bfe120 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfig.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.jetty; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyConfig { public static String HOST; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfigParser.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfigParser.java index 5991ad29d..e73fbd22b 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfigParser.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyDataListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyDataListener.java index 28ae0d2ec..173ee74b5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyDataListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyDataListener.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine; import org.skywalking.apm.collector.core.cluster.ClusterDataListener; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyDataListener extends ClusterDataListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleDefine.java index a952aac60..5867b164e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleDefine.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.server.Server; import org.skywalking.apm.collector.server.jetty.JettyServer; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyModuleDefine extends AgentStreamModuleDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleRegistration.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleRegistration.java index b4f98d895..ea69f2ea7 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleRegistration.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleRegistration.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.jetty; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamJettyModuleRegistration extends ModuleRegistration { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/TraceSegmentServletHandler.java index 4bf5add42..552834ce9 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/TraceSegmentServletHandler.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/TraceSegmentServletHandler.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegmentServletHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/KeyWithStringValueJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/KeyWithStringValueJsonReader.java index da99c1186..50fb01893 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/KeyWithStringValueJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/KeyWithStringValueJsonReader.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.skywalking.apm.network.proto.KeyWithStringValue; /** - * @author pengys5 + * @author peng-yongsheng */ public class KeyWithStringValueJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/LogJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/LogJsonReader.java index 5ac5c0bfb..db95cc41e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/LogJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/LogJsonReader.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.skywalking.apm.network.proto.LogMessage; /** - * @author pengys5 + * @author peng-yongsheng */ public class LogJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/ReferenceJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/ReferenceJsonReader.java index 128eb6eb1..efeb7f214 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/ReferenceJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/ReferenceJsonReader.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.skywalking.apm.network.proto.TraceSegmentReference; /** - * @author pengys5 + * @author peng-yongsheng */ public class ReferenceJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SegmentJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SegmentJsonReader.java index 32d1df915..5a5dde311 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SegmentJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SegmentJsonReader.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SpanJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SpanJsonReader.java index 2dd537fb6..6059b7d80 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SpanJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SpanJsonReader.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.skywalking.apm.network.proto.SpanObject; /** - * @author pengys5 + * @author peng-yongsheng */ public class SpanJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/StreamJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/StreamJsonReader.java index 7927604f6..9175c4e80 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/StreamJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/StreamJsonReader.java @@ -22,7 +22,7 @@ import com.google.gson.stream.JsonReader; import java.io.IOException; /** - * @author pengys5 + * @author peng-yongsheng */ public interface StreamJsonReader { T read(JsonReader reader) throws IOException; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegment.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegment.java index e492d939c..851bbfa1c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegment.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegment.java @@ -23,7 +23,7 @@ import org.skywalking.apm.network.proto.UniqueId; import org.skywalking.apm.network.proto.UpstreamSegment; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegment { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReader.java index 1492b16a4..1390f21cc 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReader.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegmentJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/UniqueIdJsonReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/UniqueIdJsonReader.java index 04ef1fb34..9bf1c3ed7 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/UniqueIdJsonReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/UniqueIdJsonReader.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.skywalking.apm.network.proto.UniqueId; /** - * @author pengys5 + * @author peng-yongsheng */ public class UniqueIdJsonReader implements StreamJsonReader { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/AgentStreamModuleDefineException.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/AgentStreamModuleDefineException.java index f737d4e1b..4398ca80f 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/AgentStreamModuleDefineException.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/AgentStreamModuleDefineException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker; import org.skywalking.apm.collector.core.framework.DefineException; /** - * @author pengys5 + * @author peng-yongsheng */ public class AgentStreamModuleDefineException extends DefineException { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java index 579878224..25253e20d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTracePersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java index 0e2425b3d..4bcf18729 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceIdsListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java index d406396a3..3707b9b8c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceEsDAO extends EsDAO implements IGlobalTraceDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java index 24cc79424..b1c283a3d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class GlobalTraceH2DAO extends H2DAO implements IGlobalTraceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(GlobalTraceH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/IGlobalTraceDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/IGlobalTraceDAO.java index 2ad425764..e215ca5dd 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/IGlobalTraceDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/IGlobalTraceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.global.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IGlobalTraceDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java index 9611f7c43..7de114578 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java index a8ac58796..70ead9d44 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java index 4413f574d..6974b56ea 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformancePersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java index 55b219d65..0ca3d665e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceSpanListener implements EntrySpanListener, FirstSpanListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/IInstPerformanceDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/IInstPerformanceDAO.java index 662341f9a..1821d54c1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/IInstPerformanceDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/IInstPerformanceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.instance.performance.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstPerformanceDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java index 570c0a428..ff753391e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceEsDAO extends EsDAO implements IInstPerformanceDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java index 578da83d2..668c43cdc 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(InstPerformanceH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java index 361bbb590..e5e9e0881 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java index 14e05cfe9..daf3bded0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java index 6f08f3b10..b994a5d9e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentAggregationWorker extends AggregationWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java index 71929c830..b9367aa82 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java index 8c709eeda..d197456d3 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java index 8e7582bb9..fe24049d5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanListener, FirstSpanListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/INodeComponentDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/INodeComponentDAO.java index 81021e84b..237f2e9f8 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/INodeComponentDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/INodeComponentDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.component.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeComponentDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java index 6e4539e86..7e367de7b 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentEsDAO extends EsDAO implements INodeComponentDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java index e44b263df..bbc4ed008 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeComponentH2DAO extends H2DAO implements INodeComponentDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeComponentH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java index c393a7fbf..71e935d82 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java index 0f29ec57b..cc6bc9399 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java index 4a3e6c1b3..ec07f3766 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingAggregationWorker extends AggregationWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java index 8def6f4cf..0d1f8f1d4 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java index 94980809a..82e144aaa 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java index 7ebbdeff1..319f917a0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingSpanListener implements RefsListener, FirstSpanListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/INodeMappingDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/INodeMappingDAO.java index cbb2a4d50..9049eca2d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/INodeMappingDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/INodeMappingDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeMappingDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java index dfb8b4fba..acd2f7c62 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingEsDAO extends EsDAO implements INodeMappingDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java index 3805ad9af..1870e2ea2 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeComponentH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java index 42b1df1d1..1a793abd0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java index 63a4064b2..0622deded 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java index 20df62987..26344ceac 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceAggregationWorker extends AggregationWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java index 4289dd5e5..bad368e0c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferencePersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java index 575f975b1..56d712994 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java index 6c302569d..61888efd0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceSpanListener implements EntrySpanListener, ExitSpanListener, RefsListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/INodeReferenceDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/INodeReferenceDAO.java index cc581278e..db8d485d2 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/INodeReferenceDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/INodeReferenceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeReferenceDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java index d9808a37b..1fe559062 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceEsDAO extends EsDAO implements INodeReferenceDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java index da6957b9f..9f79d1977 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeReferenceH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java index 0c7f794a9..4b8d2753b 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java index a5389eae8..8c4186fda 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/EntrySpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/EntrySpanListener.java index 6dc623ffa..1b62201b1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/EntrySpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/EntrySpanListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.collector.agentstream.worker.segment.standardization.SpanDecorator; /** - * @author pengys5 + * @author peng-yongsheng */ public interface EntrySpanListener extends SpanListener { void parseEntry(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/ExitSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/ExitSpanListener.java index 619c05cb5..96302d359 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/ExitSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/ExitSpanListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.collector.agentstream.worker.segment.standardization.SpanDecorator; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ExitSpanListener extends SpanListener { void parseExit(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/FirstSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/FirstSpanListener.java index f36b9074b..72764229e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/FirstSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/FirstSpanListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.collector.agentstream.worker.segment.standardization.SpanDecorator; /** - * @author pengys5 + * @author peng-yongsheng */ public interface FirstSpanListener extends SpanListener { void parseFirst(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/GlobalTraceIdsListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/GlobalTraceIdsListener.java index bee6ea62f..5ddf355fe 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/GlobalTraceIdsListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/GlobalTraceIdsListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.network.proto.UniqueId; /** - * @author pengys5 + * @author peng-yongsheng */ public interface GlobalTraceIdsListener extends SpanListener { void parseGlobalTraceId(UniqueId uniqueId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/LocalSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/LocalSpanListener.java index 95e48a077..8f17f243a 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/LocalSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/LocalSpanListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.collector.agentstream.worker.segment.standardization.SpanDecorator; /** - * @author pengys5 + * @author peng-yongsheng */ public interface LocalSpanListener extends SpanListener { void parseLocal(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId, String segmentId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/RefsListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/RefsListener.java index 3e7c80cad..ac8fa6f42 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/RefsListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/RefsListener.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; import org.skywalking.apm.collector.agentstream.worker.segment.standardization.ReferenceDecorator; /** - * @author pengys5 + * @author peng-yongsheng */ public interface RefsListener extends SpanListener { void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int applicationInstanceId, String segmentId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java index f5f79300c..65d636fda 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentParse { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SpanListener.java index 4e93cca0a..e52fc8b7c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SpanListener.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment; /** - * @author pengys5 + * @author peng-yongsheng */ public interface SpanListener { void build(); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/Offset.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/Offset.java index 6b5b95f2b..2ea0896ac 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/Offset.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/Offset.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.buffer; /** - * @author pengys5 + * @author peng-yongsheng */ public class Offset { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/OffsetManager.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/OffsetManager.java index 58afe2505..3e9518749 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/OffsetManager.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/OffsetManager.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum OffsetManager { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferConfig.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferConfig.java index 30bf0eb7f..16fab593d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferConfig.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferConfig.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.buffer; import org.skywalking.apm.collector.core.config.SystemConfig; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentBufferConfig { public static String BUFFER_PATH = SystemConfig.DATA_PATH + "/buffer/"; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferManager.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferManager.java index 661f70084..07339d596 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferManager.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferManager.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum SegmentBufferManager { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferReader.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferReader.java index 3fd3f7db6..4f8c76798 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferReader.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferReader.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum SegmentBufferReader { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java index ba3e26a69..e5b5320db 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java index 90be7b639..405e6d8c6 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostSpanListener implements EntrySpanListener, ExitSpanListener, LocalSpanListener, FirstSpanListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/ISegmentCostDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/ISegmentCostDAO.java index 58610546e..b09d6d330 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/ISegmentCostDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/ISegmentCostDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ISegmentCostDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java index ea8a01248..b7a8f6746 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostEsDAO extends EsDAO implements ISegmentCostDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java index a8b30c3c4..4ef411bed 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class SegmentCostH2DAO extends H2DAO implements ISegmentCostDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(SegmentCostH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java index d74f508c0..8a7e38c2a 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java index 2c32834aa..811be3222 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java index 6c4c5b976..8c51294f5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/ISegmentDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/ISegmentDAO.java index 4597417d6..eb3ef5a52 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/ISegmentDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/ISegmentDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ISegmentDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java index d8422ef50..26e597e14 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentEsDAO extends EsDAO implements ISegmentDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java index 60e04854e..63701e0b0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class SegmentH2DAO extends H2DAO implements ISegmentDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(SegmentCostH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java index cba9336c4..6c38de543 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java index 2b25ac2a0..dfbfe2942 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/IdExchanger.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/IdExchanger.java index 9a88718cc..2d052f3f0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/IdExchanger.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/IdExchanger.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.standardization; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IdExchanger { boolean exchange(T standardBuilder, int applicationId); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java index 17f86a0a6..0d9ab2beb 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java @@ -23,7 +23,7 @@ import org.skywalking.apm.network.proto.TraceSegmentReference; import org.skywalking.apm.network.proto.UniqueId; /** - * @author pengys5 + * @author peng-yongsheng */ public class ReferenceDecorator implements StandardBuilder { private boolean isOrigin = true; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java index 5456cf43c..da0fefdff 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ReferenceIdExchanger implements IdExchanger { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java index ca10618cd..4a6168b63 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java @@ -22,7 +22,7 @@ import org.skywalking.apm.network.proto.TraceSegmentObject; import org.skywalking.apm.network.proto.UniqueId; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentDecorator implements StandardBuilder { private boolean isOrigin = true; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java index c46d59c66..003059a70 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java index 08319ea3e..46d47fb39 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java @@ -23,7 +23,7 @@ import org.skywalking.apm.network.proto.SpanObject; import org.skywalking.apm.network.proto.SpanType; /** - * @author pengys5 + * @author peng-yongsheng */ public class SpanDecorator implements StandardBuilder { private boolean isOrigin = true; diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java index 51e1fcf88..2a5cfe6c1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class SpanIdExchanger implements IdExchanger { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/StandardBuilder.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/StandardBuilder.java index 2ab7eb43f..8002fd6e2 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/StandardBuilder.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/StandardBuilder.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.standardization; /** - * @author pengys5 + * @author peng-yongsheng */ public interface StandardBuilder { void toBuilder(); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java index 059b44c3e..4cd82ba9f 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryAggregationWorker extends AggregationWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java index 4e7677af3..154dabb4e 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryPersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java index bf6b7ecaa..14adfe27c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java index c93edd9fb..17db7484a 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntrySpanListener implements RefsListener, FirstSpanListener, EntrySpanListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/IServiceEntryDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/IServiceEntryDAO.java index 2f3a68729..eb1fc88c4 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/IServiceEntryDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/IServiceEntryDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceEntryDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java index a6babae9f..724bd91d0 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryEsDAO extends EsDAO implements IServiceEntryDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java index 27140ae12..973a6508f 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ServiceEntryH2DAO extends H2DAO implements IServiceEntryDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(ServiceEntryH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java index 712172212..62ed13bf2 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java index 072ad1e4a..2ff731367 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java index b48aeb188..52a71efea 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceAggregationWorker extends AggregationWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java index 24dc84576..095f9f434 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferencePersistenceWorker extends PersistenceWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java index 962bd7e2a..6b915cef5 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.stream.worker.selector.HashCodeSelector; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java index d75d55c31..63ec5d862 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceSpanListener implements FirstSpanListener, EntrySpanListener, RefsListener { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/IServiceReferenceDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/IServiceReferenceDAO.java index 691fb6e3f..15c9e4a4a 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/IServiceReferenceDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/IServiceReferenceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceReferenceDAO { } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java index c7ae5fd27..55d8ba70c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceEsDAO extends EsDAO implements IServiceReferenceDAO, IPersistenceDAO { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java index f649c7cae..7ed94247c 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(ServiceReferenceH2DAO.class); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java index dc1ea98b8..3090c98f1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceEsTableDefine extends ElasticSearchTableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java index 3f55ed172..e5ee62eed 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceH2TableDefine extends H2TableDefine { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java index d02705cfc..88f668ad1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class PersistenceTimer implements Starter { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/util/FileUtils.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/util/FileUtils.java index ab70f6288..08e79cb6d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/util/FileUtils.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/util/FileUtils.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum FileUtils { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/HttpClientTools.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/HttpClientTools.java index c90c3a01b..d90269bab 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/HttpClientTools.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/HttpClientTools.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum HttpClientTools { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandlerTestCase.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandlerTestCase.java index e23634e30..9ae169960 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandlerTestCase.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandlerTestCase.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegmentServiceHandlerTestCase { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReaderTestCase.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReaderTestCase.java index 74fa78174..65ec356f8 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReaderTestCase.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/TraceSegmentJsonReaderTestCase.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.skywalking.apm.collector.agentstream.mock.JsonFileReader; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceSegmentJsonReaderTestCase { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/JsonFileReader.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/JsonFileReader.java index 0487593fa..a5b171af9 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/JsonFileReader.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/JsonFileReader.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum JsonFileReader { INSTANCE; diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java index f93be5463..28af86e74 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java @@ -39,7 +39,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.StorageElasticSearchMo import org.skywalking.apm.collector.storage.h2.StorageH2ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentPost { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ApplicationRegister.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ApplicationRegister.java index 481f7e829..3a5a2788d 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ApplicationRegister.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ApplicationRegister.java @@ -24,7 +24,7 @@ import org.skywalking.apm.network.proto.ApplicationMapping; import org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationRegister { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/GrpcSegmentPost.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/GrpcSegmentPost.java index 187c64415..6c38d44b9 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/GrpcSegmentPost.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/GrpcSegmentPost.java @@ -43,7 +43,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GrpcSegmentPost { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/InstanceRegister.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/InstanceRegister.java index 7b09ab865..6602d9d4f 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/InstanceRegister.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/InstanceRegister.java @@ -25,7 +25,7 @@ import org.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc; import org.skywalking.apm.network.proto.OSInfo; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceRegister { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ServiceRegister.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ServiceRegister.java index 67747b909..6666eea65 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ServiceRegister.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/ServiceRegister.java @@ -25,7 +25,7 @@ import org.skywalking.apm.network.proto.ServiceNameElement; import org.skywalking.apm.network.proto.ServiceNameMappingCollection; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceRegister { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryHasExitNoRefSpan.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryHasExitNoRefSpan.java index 19c73124a..ee1917d4f 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryHasExitNoRefSpan.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryHasExitNoRefSpan.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SingleHasEntryHasExitNoRefSpan { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitHasRefSpan.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitHasRefSpan.java index a64c80cb6..048dd9c13 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitHasRefSpan.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitHasRefSpan.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SingleHasEntryNoExitHasRefSpan { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitNoRefSpan.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitNoRefSpan.java index 8a3c3bc49..0d2db0b0a 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitNoRefSpan.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleHasEntryNoExitNoRefSpan.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SingleHasEntryNoExitNoRefSpan { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleNoEntryHasExitNoRefSpan.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleNoEntryHasExitNoRefSpan.java index 688f54537..cad21030a 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleNoEntryHasExitNoRefSpan.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/grpc/SingleNoEntryHasExitNoRefSpan.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SingleNoEntryHasExitNoRefSpan { diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferWriteWorkerTestCase.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferWriteWorkerTestCase.java index bb7331059..1409ed754 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferWriteWorkerTestCase.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/worker/segment/buffer/SegmentBufferWriteWorkerTestCase.java @@ -30,12 +30,12 @@ import org.skywalking.apm.network.proto.UpstreamSegment; import org.skywalking.apm.network.trace.component.ComponentsDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentBufferWriteWorkerTestCase { public static void main(String[] args) throws WorkerException, ProviderNotFoundException { - SegmentBufferConfig.BUFFER_PATH = "/Users/pengys5/code/sky-walking/sky-walking/apm-collector/buffer/"; + SegmentBufferConfig.BUFFER_PATH = "/Users/peng-yongsheng/code/sky-walking/sky-walking/apm-collector/buffer/"; SegmentStandardizationWorker worker = new SegmentStandardizationWorker(null, null); worker.preStart(); diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java index c7cf02009..f4746bf2f 100644 --- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java +++ b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class CollectorBootStartUp { diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorStarter.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorStarter.java index 6af1db391..b8902cc81 100644 --- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorStarter.java +++ b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorStarter.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class CollectorStarter implements Starter { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java index fda776f3b..de0f82053 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationCache { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java index 8095c609b..946d992d9 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceCache { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java index 4cb266093..d4c25118f 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceIdCache { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java index 16d1766b3..26546ec49 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameCache { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java index cfd14a85b..9ebed3a08 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationEsCacheDAO extends EsDAO implements IApplicationCacheDAO { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java index a22acbc13..accd1c094 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ApplicationH2CacheDAO extends H2DAO implements IApplicationCacheDAO { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IApplicationCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IApplicationCacheDAO.java index 54d1576ad..65449fd93 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IApplicationCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IApplicationCacheDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cache.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IApplicationCacheDAO { int getApplicationId(String applicationCode); diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IInstanceCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IInstanceCacheDAO.java index fcd34b8f5..97e398502 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IInstanceCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IInstanceCacheDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cache.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstanceCacheDAO { int getApplicationId(int applicationInstanceId); diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IServiceNameCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IServiceNameCacheDAO.java index bbf81981b..13aa62010 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IServiceNameCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/IServiceNameCacheDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cache.dao; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceNameCacheDAO { String getServiceName(int serviceId); diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java index a878901f9..b65501f9d 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceEsCacheDAO extends EsDAO implements IInstanceCacheDAO { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java index d1a884236..7ff94b3e7 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceH2CacheDAO extends H2DAO implements IInstanceCacheDAO { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java index 820b12020..4d3ab730b 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameEsCacheDAO extends EsDAO implements IServiceNameCacheDAO { diff --git a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java index b3befc259..30b160a44 100644 --- a/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java +++ b/apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ServiceNameH2CacheDAO extends H2DAO implements IServiceNameCacheDAO { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java index 954c4e085..791199a17 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ElasticSearchClient implements Client { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java index b14d0b031..24eb74459 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.client.elasticsearch; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ElasticSearchClientException extends ClientException { public ElasticSearchClientException(String message) { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java index 7713dd85b..782148bbd 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.client.Client; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class GRPCClient implements Client { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java index 7021a18fa..a0322ea6a 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.client.grpc; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class GRPCClientException extends ClientException { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java index 8b0b9f22e..74dd9b922 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2Client implements Client { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java index b829d002e..45e4828a8 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.client.h2; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2ClientException extends ClientException { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java index c639978b9..e75954743 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.client.ClientException; import redis.clients.jedis.Jedis; /** - * @author pengys5 + * @author peng-yongsheng */ public class RedisClient implements Client { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java index 0e4fd08de..0e3017225 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.client.redis; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class RedisClientException extends ClientException { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java index 2af662c5b..a561e8b80 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ZookeeperClient implements Client { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java index 8511d4d43..cdf80f33f 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.client.zookeeper; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ZookeeperClientException extends ClientException { public ZookeeperClientException(String message) { diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java index 58c76ddf9..ccf8d37e4 100644 --- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java +++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.client.zookeeper.util; /** - * @author pengys5 + * @author peng-yongsheng */ public class PathUtils { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleDefine.java index 67a44eec1..1d372476c 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleDefine.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleDefine.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.core.module.ModuleRegistration; import org.skywalking.apm.collector.core.server.Server; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ClusterModuleDefine extends ModuleDefine { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java index 0873d9677..051947bf0 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleInstaller.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleInstaller.java index 2da471733..07c15b021 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleInstaller.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleInstaller.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.framework.Context; import org.skywalking.apm.collector.core.module.SingleModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterModuleInstaller extends SingleModuleInstaller { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java index 20593dac5..35af2df68 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.cluster; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterNodeExistException extends ClientException { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java index 63d4c2128..c5c5e43e1 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cluster.redis; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterRedisConfig { public static String HOST; diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java index 04b7d7cc1..abc3e6cc1 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleConfigParser; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterRedisConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java index 46c1bdbeb..771844855 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterRedisModuleDefine extends ClusterModuleDefine { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationReader.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationReader.java index 003039eec..a05c28e29 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationReader.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationReader.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.DataMonitor; import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterRedisModuleRegistrationReader extends ClusterModuleRegistrationReader { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java index e5d193d5c..3aa9eb9f1 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.config.ConfigParseException; import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterStandaloneConfigParser implements ModuleConfigParser { @Override public void parse(Map config) throws ConfigParseException { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java index 2841b6eb0..d99be53a7 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterStandaloneDataMonitor implements DataMonitor { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java index 367d3d0fa..e5d334dcf 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterStandaloneModuleDefine extends ClusterModuleDefine { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationReader.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationReader.java index 2d2dd6454..9d20357d7 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationReader.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationReader.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.DataMonitor; import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterStandaloneModuleRegistrationReader extends ClusterModuleRegistrationReader { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java index be8c93f47..1b350b3d3 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cluster.zookeeper; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterZKConfig { public static String HOST_PORT; diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java index 14c6a7ad6..f407190f4 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleConfigParser; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterZKConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java index 356e804f6..2f4990ec3 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java @@ -44,7 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterZKDataMonitor implements DataMonitor, Watcher { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java index fbee02269..6cbc453c1 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterZKModuleDefine extends ClusterModuleDefine { diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java index 4f9bea3d4..a62e7baab 100644 --- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java +++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.DataMonitor; import org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterZKModuleRegistrationReader extends ClusterModuleRegistrationReader { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java index 82f55f5b4..ba459eeeb 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core; /** - * @author pengys5 + * @author peng-yongsheng */ public class CollectorException extends Exception { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/Client.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/Client.java index 5d3db57ac..d6f4141eb 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/Client.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/Client.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.client; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Client { void initialize() throws ClientException; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/ClientException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/ClientException.java index ae4617b74..b3088011c 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/ClientException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/ClientException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.client; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ClientException extends CollectorException { public ClientException(String message) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/DataMonitor.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/DataMonitor.java index 8db2262f8..314338362 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/DataMonitor.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/client/DataMonitor.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.framework.Starter; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public interface DataMonitor extends Starter { void setClient(Client client); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListener.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListener.java index a08d0c940..1d0f43b6a 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListener.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListener.java @@ -23,7 +23,7 @@ import java.util.Set; import org.skywalking.apm.collector.core.framework.Listener; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ClusterDataListener implements Listener { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListenerDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListenerDefine.java index bf2965397..b77e1a1a6 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListenerDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterDataListenerDefine.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.cluster; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ClusterDataListenerDefine { ClusterDataListener listener(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java index 11ca88d3d..56ab0aa66 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.DataMonitor; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterModuleContext extends Context { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDiscovery.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDiscovery.java index af6f0c7b2..508ecd0ab 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDiscovery.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDiscovery.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.cluster; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ClusterModuleDiscovery { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleException.java index 6ac041394..f8ba83d01 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.cluster; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterModuleException extends ModuleException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleRegistrationReader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleRegistrationReader.java index e302553a5..775b92fe1 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleRegistrationReader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleRegistrationReader.java @@ -22,7 +22,7 @@ import java.util.Set; import org.skywalking.apm.collector.core.client.DataMonitor; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ClusterModuleRegistrationReader { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigException.java index 52d095bba..b5e970046 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.config; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ConfigException extends CollectorException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoader.java index c0aec3711..bc0deb8b6 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoader.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.config; import org.skywalking.apm.collector.core.framework.Loader; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ConfigLoader extends Loader { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoaderException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoaderException.java index 68550eb9c..2a6ce6bc7 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoaderException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigLoaderException.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.config; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ConfigLoaderException extends ConfigException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigParseException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigParseException.java index 5578a1fe4..f5293b891 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigParseException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/ConfigParseException.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.config; /** - * @author pengys5 + * @author peng-yongsheng */ public class ConfigParseException extends ConfigException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/GroupConfigParser.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/GroupConfigParser.java index a308c663b..62f644d0b 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/GroupConfigParser.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/GroupConfigParser.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.config; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public interface GroupConfigParser { String NODE_NAME = "config"; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfig.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfig.java index 742b856f2..ec787f684 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfig.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.config; /** - * @author pengys5 + * @author peng-yongsheng */ public class SystemConfig { public static String DATA_PATH = "../data"; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfigParser.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfigParser.java index 82aa62989..aa90354dd 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfigParser.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/config/SystemConfigParser.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.config; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public enum SystemConfigParser { INSTANCE; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorContextHelper.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorContextHelper.java index f02eaa14f..eaace4ac0 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorContextHelper.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorContextHelper.java @@ -23,7 +23,7 @@ import java.util.Map; import org.skywalking.apm.collector.core.cluster.ClusterModuleContext; /** - * @author pengys5 + * @author peng-yongsheng */ public enum CollectorContextHelper { INSTANCE; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java index c3e36f687..462762278 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class Context { private final String groupName; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DataInitializer.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DataInitializer.java index 9676f80ae..497ff1909 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DataInitializer.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DataInitializer.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.Client; import org.skywalking.apm.collector.core.client.ClientException; /** - * @author pengys5 + * @author peng-yongsheng */ public interface DataInitializer { void initialize(Client client) throws ClientException; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Decision.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Decision.java index 17bbf07c4..319417776 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Decision.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Decision.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Decision { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Define.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Define.java index 40cda1db2..6650fe4e1 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Define.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Define.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Define { String name(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefineException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefineException.java index eb6260eb5..18ebb00c9 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefineException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefineException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.framework; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class DefineException extends CollectorException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java index 76bd041ce..c06b6a8e9 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class DefinitionFile { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Executor.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Executor.java index cb3b663d5..f768bac44 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Executor.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Executor.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Executor { void execute(Object message); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Handler.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Handler.java index 49e170db7..9e9714d26 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Handler.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Handler.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Handler { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Listener.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Listener.java index dfa4b2dbd..20e8e8aa4 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Listener.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Listener.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Listener { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Loader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Loader.java index e3c035bb6..8cd44208e 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Loader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Loader.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Loader { T load() throws DefineException; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/PriorityDecision.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/PriorityDecision.java index 9cafefb27..bc9a263de 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/PriorityDecision.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/PriorityDecision.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.framework; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public class PriorityDecision implements Decision { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Provider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Provider.java index d407b6ac0..f49cf0519 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Provider.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Provider.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Provider { D create(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Starter.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Starter.java index cd83fbf9d..ae5f2f263 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Starter.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Starter.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.framework; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Starter { void start() throws CollectorException; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/UnexpectedException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/UnexpectedException.java index 44f2a1493..dd10bf08d 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/UnexpectedException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/UnexpectedException.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.framework; /** - * @author pengys5 + * @author peng-yongsheng */ public class UnexpectedException extends RuntimeException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/CommonModuleInstaller.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/CommonModuleInstaller.java index 223bd427d..5ded4903c 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/CommonModuleInstaller.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/CommonModuleInstaller.java @@ -22,7 +22,7 @@ import java.util.Map; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class CommonModuleInstaller implements ModuleInstaller { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java index 55d81ca70..c315e0cfc 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Module { void install(Map configuration); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigLoader.java index 42238dc84..4b5140e2a 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigLoader.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleConfigLoader implements ConfigLoader> { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java index 653aa4257..9c7ef7b35 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java @@ -22,7 +22,7 @@ import java.util.Map; import org.skywalking.apm.collector.core.config.ConfigParseException; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ModuleConfigParser { void parse(Map config) throws ConfigParseException; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleContext.java index f10b7cf39..97121822e 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleContext.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleContext.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import org.skywalking.apm.collector.core.cluster.ClusterModuleContext; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleContext { private ClusterModuleContext clusterContext; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java index d7b340aab..8544ad1ab 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.framework.Handler; import org.skywalking.apm.collector.core.server.Server; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ModuleDefine implements Define { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineException.java index b30076144..202f31ccb 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import org.skywalking.apm.collector.core.framework.DefineException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleDefineException extends DefineException { public ModuleDefineException(String message) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java index 3066ef30f..3a65c6f64 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleDefineLoader implements Loader>> { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefinitionFile.java index a9c2798c9..d14cef1e4 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefinitionFile.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleDefinitionFile extends DefinitionFile { @Override protected String fileName() { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleException.java index 8ce34c579..da7a56cd7 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import org.skywalking.apm.collector.core.framework.DefineException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ModuleException extends DefineException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java index 48ed3bae3..105103aa1 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.config.GroupConfigParser; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ModuleGroupDefine { String name(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java index 0ef0320a1..db871d9b2 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.module; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleGroupDefineFile extends DefinitionFile { @Override protected String fileName() { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java index 318b90b67..38deb7659 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ModuleGroupDefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstaller.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstaller.java index 3d326e716..a59c0a20d 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstaller.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstaller.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.core.server.ServerException; import org.skywalking.apm.collector.core.server.ServerHolder; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ModuleInstaller { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleRegistration.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleRegistration.java index dd0e403a9..42bbd5fe3 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleRegistration.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleRegistration.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.module; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ModuleRegistration { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/MultipleModuleInstaller.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/MultipleModuleInstaller.java index 89899f6ef..2f64d0a2b 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/MultipleModuleInstaller.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/MultipleModuleInstaller.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class MultipleModuleInstaller extends CommonModuleInstaller { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/SingleModuleInstaller.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/SingleModuleInstaller.java index 691f40e92..b61776948 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/SingleModuleInstaller.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/SingleModuleInstaller.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class SingleModuleInstaller extends CommonModuleInstaller { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java index 92457140c..7da9a2577 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.queue; import java.util.concurrent.ThreadFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public enum DaemonThreadFactory implements ThreadFactory { INSTANCE; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java index 6c8e26f05..41565d36b 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.queue; /** - * @author pengys5 + * @author peng-yongsheng */ public class EndOfBatchCommand { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java index bc4a26eb5..c10ba3512 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.queue; /** - * @author pengys5 + * @author peng-yongsheng */ public class MessageHolder { private Object message; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueCreator.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueCreator.java index 66eed261b..39236b58a 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueCreator.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueCreator.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.queue; /** - * @author pengys5 + * @author peng-yongsheng */ public interface QueueCreator { QueueEventHandler create(int queueSize, QueueExecutor executor); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java index 72ce7d458..aa13c82b2 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.queue; /** - * @author pengys5 + * @author peng-yongsheng */ public interface QueueEventHandler { void tell(Object message); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueExecutor.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueExecutor.java index 1fae9c8e4..27d88e655 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueExecutor.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueExecutor.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.queue; import org.skywalking.apm.collector.core.framework.Executor; /** - * @author pengys5 + * @author peng-yongsheng */ public interface QueueExecutor extends Executor { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java index b0d0ab45b..9459d1840 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.remote; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Remote { void call(Object message); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/Server.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/Server.java index c7818975f..934e5d001 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/Server.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/Server.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.server; import org.skywalking.apm.collector.core.framework.Handler; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Server { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerException.java index 53d150e57..9eedf1fc0 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.server; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ServerException extends CollectorException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerHolder.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerHolder.java index 27ba8a368..2484c6e68 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerHolder.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerHolder.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServerHolder { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerModuleDefine.java index 7cdc4d1c2..dca6ccdbe 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerModuleDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/server/ServerModuleDefine.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.server; import org.skywalking.apm.collector.core.module.ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ServerModuleDefine extends ModuleDefine { } diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/ColumnDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/ColumnDefine.java index 1746a8b87..75e616132 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/ColumnDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/ColumnDefine.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.storage; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ColumnDefine { private final String name; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageBatchBuilder.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageBatchBuilder.java index 9c84bd832..dec0f2b70 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageBatchBuilder.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageBatchBuilder.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class StorageBatchBuilder { public abstract List build(C client, Map lastData); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefineLoader.java index 62fd856b6..af6b90758 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefineLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageDefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefinitionFile.java index b1bb61831..9c34cd72f 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefinitionFile.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageDefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.storage; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageDefinitionFile extends DefinitionFile { @Override protected String fileName() { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageException.java index dc42a046e..e5ac3967e 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.storage; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class StorageException extends CollectorException { public StorageException(String message) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstallException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstallException.java index 40fbe5e3a..237a5d048 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstallException.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstallException.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.storage; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageInstallException extends StorageException { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java index 44ede8924..924636779 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class StorageInstaller { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/TableDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/TableDefine.java index 14950b9bb..731280f95 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/TableDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/TableDefine.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class TableDefine { private final String name; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/AbstractHashMessage.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/AbstractHashMessage.java index e782ea329..a2157b4ca 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/AbstractHashMessage.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/AbstractHashMessage.java @@ -23,7 +23,7 @@ package org.skywalking.apm.collector.core.stream; * which use to aggregate metric. *

* - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public abstract class AbstractHashMessage { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Data.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Data.java index 0fb3000e2..8311d4af9 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Data.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Data.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.stream; /** - * @author pengys5 + * @author peng-yongsheng */ public class Data extends AbstractHashMessage { private final int stringCapacity; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Operation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Operation.java index 57996a298..84f9b0df2 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Operation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Operation.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.stream; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Operation { String operate(String newValue, String oldValue); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Transform.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Transform.java index 8a09cbd2e..672e60e67 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Transform.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/Transform.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.stream; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Transform { Data toData(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/AddOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/AddOperation.java index 11d4075a6..e9adfe9a1 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/AddOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/AddOperation.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.stream.operate; import org.skywalking.apm.collector.core.stream.Operation; /** - * @author pengys5 + * @author peng-yongsheng */ public class AddOperation implements Operation { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/CoverOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/CoverOperation.java index 0ea46a1d7..966c54b66 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/CoverOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/CoverOperation.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.stream.operate; import org.skywalking.apm.collector.core.stream.Operation; /** - * @author pengys5 + * @author peng-yongsheng */ public class CoverOperation implements Operation { @Override public String operate(String newValue, String oldValue) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/NonOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/NonOperation.java index fb8432672..16887786a 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/NonOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/stream/operate/NonOperation.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.core.stream.operate; import org.skywalking.apm.collector.core.stream.Operation; /** - * @author pengys5 + * @author peng-yongsheng */ public class NonOperation implements Operation { @Override public String operate(String newValue, String oldValue) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java index 436121486..d39c914c1 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.util; /** - * @author pengys5 + * @author peng-yongsheng */ public class BytesUtils { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java index 4802ce785..a0dd89bdb 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public class CollectionUtils { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ColumnNameUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ColumnNameUtils.java index e0e087e8d..0909cf39e 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ColumnNameUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ColumnNameUtils.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.util; /** - * @author pengys5 + * @author peng-yongsheng */ public enum ColumnNameUtils { INSTANCE; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/Const.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/Const.java index 21f31856b..f6a4a9022 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/Const.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/Const.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.util; /** - * @author pengys5 + * @author peng-yongsheng */ public class Const { public static final String ID_SPLIT = "_"; diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java index 0398d67b0..461cff604 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class DefinitionLoader implements Iterable { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java index bd1e30a7b..428f09dac 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.util; /** - * @author pengys5 + * @author peng-yongsheng */ public class ObjectUtils { public static boolean isEmpty(Object obj) { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ResourceUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ResourceUtils.java index 0ec0f83a4..e1e832df5 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ResourceUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ResourceUtils.java @@ -25,7 +25,7 @@ import java.io.Reader; import java.net.URL; /** - * @author pengys5 + * @author peng-yongsheng */ public class ResourceUtils { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java index 15a2d6450..eb4c00477 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.core.util; /** - * @author pengys5 + * @author peng-yongsheng */ public class StringUtils { diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/TimeBucketUtils.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/TimeBucketUtils.java index 3ef55eb02..4514ff991 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/TimeBucketUtils.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/TimeBucketUtils.java @@ -24,7 +24,7 @@ import java.util.TimeZone; import org.skywalking.apm.collector.core.framework.UnexpectedException; /** - * @author pengys5 + * @author peng-yongsheng */ public enum TimeBucketUtils { INSTANCE; diff --git a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/ColumnNameUtilsTestCase.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/ColumnNameUtilsTestCase.java index c8546dbee..4e68bbc87 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/ColumnNameUtilsTestCase.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/ColumnNameUtilsTestCase.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.skywalking.apm.collector.core.util.ColumnNameUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class ColumnNameUtilsTestCase { diff --git a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/TimeBucketUtilsTestCase.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/TimeBucketUtilsTestCase.java index 8141f9717..4f5cdfc33 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/TimeBucketUtilsTestCase.java +++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/utils/TimeBucketUtilsTestCase.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.skywalking.apm.collector.core.util.TimeBucketUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class TimeBucketUtilsTestCase { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleContext.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleContext.java index d236408b9..36ba58b28 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleContext.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleContext.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.framework.Context; import org.skywalking.apm.collector.core.queue.QueueCreator; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueModuleContext extends Context { private QueueCreator queueCreator; diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleDefine.java index c841ff054..b5648eb3b 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleDefine.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleDefine.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.core.module.ModuleRegistration; import org.skywalking.apm.collector.core.server.Server; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class QueueModuleDefine extends ModuleDefine { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleException.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleException.java index 18055c99f..7854625f8 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleException.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.queue; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueModuleException extends ModuleException { public QueueModuleException(String message) { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleGroupDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleGroupDefine.java index d207e7753..812a422a0 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleGroupDefine.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleInstaller.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleInstaller.java index 885fcc9c9..95c8dce52 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleInstaller.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/QueueModuleInstaller.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.queue.disruptor.DisruptorQueueCreator; import org.skywalking.apm.collector.queue.disruptor.QueueDisruptorModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueModuleInstaller extends SingleModuleInstaller { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueConfigParser.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueConfigParser.java index 661ccf074..c3ad34a63 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueConfigParser.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueConfigParser.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.config.ConfigParseException; import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class DataCarrierQueueConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueCreator.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueCreator.java index 9883c2178..482db64ee 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueCreator.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierQueueCreator.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.queue.QueueEventHandler; import org.skywalking.apm.collector.core.queue.QueueExecutor; /** - * @author pengys5 + * @author peng-yongsheng */ public class DataCarrierQueueCreator implements QueueCreator { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java index f270128ba..0694d57ac 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.queue.QueueModuleDefine; import org.skywalking.apm.collector.queue.QueueModuleGroupDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueDataCarrierModuleDefine extends QueueModuleDefine { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java index ebb4ea9e7..35e286fca 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class DisruptorEventHandler implements EventHandler, QueueEventHandler { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueConfigParser.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueConfigParser.java index 024e4e606..9a7914bd1 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueConfigParser.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueConfigParser.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.config.ConfigParseException; import org.skywalking.apm.collector.core.module.ModuleConfigParser; /** - * @author pengys5 + * @author peng-yongsheng */ public class DisruptorQueueConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java index c4c765758..8cdca483b 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.core.queue.QueueEventHandler; import org.skywalking.apm.collector.core.queue.QueueExecutor; /** - * @author pengys5 + * @author peng-yongsheng */ public class DisruptorQueueCreator implements QueueCreator { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java index b3b7d5d16..1e006c943 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java @@ -22,7 +22,7 @@ import com.lmax.disruptor.EventFactory; import org.skywalking.apm.collector.core.queue.MessageHolder; /** - * @author pengys5 + * @author peng-yongsheng */ public class MessageHolderFactory implements EventFactory { diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java index 4143bc8be..3f92e56b2 100644 --- a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java +++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.queue.QueueModuleDefine; import org.skywalking.apm.collector.queue.QueueModuleGroupDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class QueueDisruptorModuleDefine extends QueueModuleDefine { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java index 7b7eae7ba..b4ab728b9 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.server.grpc; import org.skywalking.apm.collector.core.framework.Handler; /** - * @author pengys5 + * @author peng-yongsheng */ public interface GRPCHandler extends Handler { } diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java index 91aad7111..89dd7d10a 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GRPCServer implements Server { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java index 649afedf0..6824f8538 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.server.grpc; import org.skywalking.apm.collector.core.server.ServerException; /** - * @author pengys5 + * @author peng-yongsheng */ public class GRPCServerException extends ServerException { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java index 1bf06f4b2..9e42d28a7 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.server.jetty; import org.skywalking.apm.collector.core.CollectorException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ArgumentsParseException extends CollectorException { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java index fa2b6a30a..1b8c22f48 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.framework.Handler; import org.skywalking.apm.collector.core.util.ObjectUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class JettyHandler extends HttpServlet implements Handler { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java index 4f2ceda5b..95d9c5db9 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class JettyServer implements Server { diff --git a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java index ef0d8a8d9..538a4bcf8 100644 --- a/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java +++ b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.server.jetty; import org.skywalking.apm.collector.core.server.ServerException; /** - * @author pengys5 + * @author peng-yongsheng */ public class JettyServerException extends ServerException { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleContext.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleContext.java index 701f33cd7..7a73bbd49 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleContext.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleContext.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.client.Client; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageModuleContext extends Context { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleDefine.java index 6f22a30ae..49685f8ce 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleDefine.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.storage.StorageException; import org.skywalking.apm.collector.core.storage.StorageInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class StorageModuleDefine extends ModuleDefine implements ClusterDataListenerDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleException.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleException.java index a520aadd9..de954ffe0 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleException.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageModuleException extends ModuleException { public StorageModuleException(String message) { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleGroupDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleGroupDefine.java index 84731ae82..627c96cfe 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleGroupDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleInstaller.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleInstaller.java index f5f31a701..e74e68871 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleInstaller.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/StorageModuleInstaller.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.framework.Context; import org.skywalking.apm.collector.core.module.SingleModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageModuleInstaller extends SingleModuleInstaller { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java index bdb01c0db..f3203d71b 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.dao; import org.skywalking.apm.collector.core.client.Client; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class DAO { private C client; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java index 7e7d50ffc..4d2c9b91e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public enum DAOContainer { INSTANCE; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java index 2fbe820a1..f57aa8f5e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.dao; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IBatchDAO { void batchPersistence(List batchCollection); diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java index 5862655f1..495638136 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define; import org.skywalking.apm.collector.core.stream.Operation; /** - * @author pengys5 + * @author peng-yongsheng */ public class Attribute { private final String name; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java index 592ee24ee..6727c87d1 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.storage.define; /** - * @author pengys5 + * @author peng-yongsheng */ public enum AttributeType { STRING, LONG, DOUBLE, INTEGER, BYTE, BOOLEAN diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java index 3b193475c..19d160b7c 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.storage.define; /** - * @author pengys5 + * @author peng-yongsheng */ public class CommonTable { public static final String TABLE_TYPE = "type"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java index 753aa876b..2d93f9804 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class DataDefine { private Attribute[] attributes; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java index e3848d5d5..f592b3822 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java index 7e0fd5cf4..0bf92e6b5 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.global; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceTable extends CommonTable { public static final String TABLE = "global_trace"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java index 8ff893f78..987f13ecc 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java index 9360421b0..82b8c5604 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.instance; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceTable extends CommonTable { public static final String TABLE = "instance_performance"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java index 30973b12a..5e791c49a 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java index 7073c1811..054e328f2 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.jvm; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricTable extends CommonTable { public static final String TABLE = "cpu_metric"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java index 145014829..8021a6d0c 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java index 30d27eca8..2f47ba03d 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.jvm; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricTable extends CommonTable { public static final String TABLE = "gc_metric"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java index 3dfe4d885..4ecd8ed51 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java index 3105f0ef2..996c16c81 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.jvm; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricTable extends CommonTable { public static final String TABLE = "memory_metric"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java index bad88f000..69e78a131 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java index 556859852..9382e526b 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.jvm; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricTable extends CommonTable { public static final String TABLE = "memory_pool_metric"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java index 768e57383..a30ab47cd 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java index 0baa44c5b..cfd80b4b7 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.node; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentTable extends CommonTable { public static final String TABLE = "node_component"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java index 3dd3b3d01..76108464b 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java index c1438da26..4af90a8a5 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.node; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingTable extends CommonTable { public static final String TABLE = "node_mapping"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java index 0555772d2..4c67a0dab 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java index dfd5497a5..8ea1eb782 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.noderef; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceTable extends CommonTable { public static final String TABLE = "node_reference"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java index b8e596ff1..4458fb994 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java index b9030ffd0..6168451b3 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.register; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationTable extends CommonTable { public static final String TABLE = "application"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java index 1e3a00f02..09b5519b5 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java index 098dd6086..a38d4c068 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.register; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceTable extends CommonTable { public static final String TABLE = "instance"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java index aae408807..d9af3a3fe 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java index 46a0a1908..85ba19b2a 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.register; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceNameTable extends CommonTable { public static final String TABLE = "service_name"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java index 1e3b4f0f0..bfb386c1b 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5H + * @author peng-yongsheng */ public class SegmentCostDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java index 5de9c35f0..8ad71576c 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.segment; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostTable extends CommonTable { public static final String TABLE = "segment_cost"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java index a4fb3ffce..3a85df4af 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java index 2ab988b91..6066c9506 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.segment; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentTable extends CommonTable { public static final String TABLE = "segment"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java index f16d4025b..bc6e5d22b 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java index 5305b6c95..959bad634 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.service; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryTable extends CommonTable { public static final String TABLE = "service_entry"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java index 154152725..4903fb310 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.define.AttributeType; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceDataDefine extends DataDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java index 8c77a6274..4a4953462 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.define.serviceref; import org.skywalking.apm.collector.storage.define.CommonTable; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceTable extends CommonTable { public static final String TABLE = "service_reference"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/ElasticSearchStorageException.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/ElasticSearchStorageException.java index a626754d8..ca926492e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/ElasticSearchStorageException.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/ElasticSearchStorageException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.elasticsearch; import org.skywalking.apm.collector.core.storage.StorageException; /** - * @author pengys5 + * @author peng-yongsheng */ public class ElasticSearchStorageException extends StorageException { public ElasticSearchStorageException(String message) { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfig.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfig.java index 9d553a1ff..9b41cadbf 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfig.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.storage.elasticsearch; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageElasticSearchConfig { public static String CLUSTER_NAME; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfigParser.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfigParser.java index 0d5c03b35..d33a2ae9c 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfigParser.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageElasticSearchConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java index c2e5e87f9..8ad1ed04f 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAODefineLoader; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchStorageInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageElasticSearchModuleDefine extends StorageModuleDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java index dd48f6b04..fe372619a 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class BatchEsDAO extends EsDAO implements IBatchDAO { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java index eb4e682d9..01097da01 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.storage.dao.DAO; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class EsDAO extends DAO { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefineLoader.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefineLoader.java index 75e80ec06..ef8712cf8 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefineLoader.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class EsDAODefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefinitionFile.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefinitionFile.java index a3b921c9e..cf6b088c5 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefinitionFile.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAODefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.elasticsearch.dao; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class EsDAODefinitionFile extends DefinitionFile { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchColumnDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchColumnDefine.java index 25852bc98..7f1893277 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchColumnDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchColumnDefine.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.elasticsearch.define; import org.skywalking.apm.collector.core.storage.ColumnDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class ElasticSearchColumnDefine extends ColumnDefine { public ElasticSearchColumnDefine(String name, String type) { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchStorageInstaller.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchStorageInstaller.java index 2dcd4ca85..b5bf11a5f 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchStorageInstaller.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchStorageInstaller.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ElasticSearchStorageInstaller extends StorageInstaller { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchTableDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchTableDefine.java index 85bd81ddf..d7c5c797a 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchTableDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/define/ElasticSearchTableDefine.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.elasticsearch.define; import org.skywalking.apm.collector.core.storage.TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class ElasticSearchTableDefine extends TableDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ConfigParser.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ConfigParser.java index 074c531fe..c9685430e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ConfigParser.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ConfigParser.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageH2ConfigParser implements ModuleConfigParser { private static final String URL = "url"; diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java index e4ea3a81c..ee1ddbf4e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.storage.h2.dao.H2DAODefineLoader; import org.skywalking.apm.collector.storage.h2.define.H2StorageInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class StorageH2ModuleDefine extends StorageModuleDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java index ac0989f42..fcf55c4df 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public class BatchH2DAO extends H2DAO implements IBatchDAO { private final Logger logger = LoggerFactory.getLogger(BatchH2DAO.class); diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java index fd66357bf..ff6403353 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class H2DAO extends DAO { private final Logger logger = LoggerFactory.getLogger(H2DAO.class); diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java index 04b7ce38e..607e30788 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2DAODefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java index d2e1ebfa0..e44b87366 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.h2.dao; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2DAODefinitionFile extends DefinitionFile { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java index 28fef2bed..1a9e2bfff 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.core.storage.ColumnDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2ColumnDefine extends ColumnDefine { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java index 1c68dac62..e9ef07141 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java @@ -33,7 +33,7 @@ import java.sql.SQLException; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public class H2StorageInstaller extends StorageInstaller { diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java index 8d64a20ac..6e7a2f326 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.core.storage.TableDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class H2TableDefine extends TableDefine { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java index 175897c3c..d50439a12 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamModuleContext extends Context { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleDefine.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleDefine.java index 2029a41ad..61b8c2a36 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleDefine.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleDefine.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine; import org.skywalking.apm.collector.core.module.ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class StreamModuleDefine extends ModuleDefine implements ClusterDataListenerDefine { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleException.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleException.java index 3d8320119..bef4d026f 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleException.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamModuleException extends ModuleException { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleGroupDefine.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleGroupDefine.java index dd590dd69..df5dccac7 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleGroupDefine.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleInstaller.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleInstaller.java index 79e211113..b10dc57a3 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleInstaller.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleInstaller.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamModuleInstaller extends SingleModuleInstaller { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfig.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfig.java index d3e7409af..f104ea3e5 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfig.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.grpc; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamGRPCConfig { public static String HOST; diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfigParser.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfigParser.java index 8f57f31d4..01e5bab3f 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfigParser.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamGRPCConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCDataListener.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCDataListener.java index 8adddb582..e599a3b37 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCDataListener.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCDataListener.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamGRPCDataListener extends ClusterDataListener { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleDefine.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleDefine.java index a1ec58896..ba89bab29 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleDefine.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleDefine.java @@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.grpc.handler.RemoteCommonServiceHandler; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamGRPCModuleDefine extends StreamModuleDefine { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleRegistration.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleRegistration.java index a57409487..73a0c390e 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleRegistration.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/StreamGRPCModuleRegistration.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.grpc; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public class StreamGRPCModuleRegistration extends ModuleRegistration { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/handler/RemoteCommonServiceHandler.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/handler/RemoteCommonServiceHandler.java index 13bedd942..6111aa56c 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/handler/RemoteCommonServiceHandler.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/grpc/handler/RemoteCommonServiceHandler.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class RemoteCommonServiceHandler extends RemoteCommonServiceGrpc.RemoteCommonServiceImplBase implements GRPCHandler { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorker.java index dbdbd2a10..48c01a32d 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorker.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.queue.QueueExecutor; * The AbstractLocalAsyncWorker implementations represent workers, * which receive local asynchronous message. * - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public abstract class AbstractLocalAsyncWorker extends AbstractWorker implements QueueExecutor { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorkerProvider.java index 10dc5d5d3..6fb19621d 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorkerProvider.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractLocalAsyncWorkerProvider.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorkerContainer; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AbstractLocalAsyncWorkerProvider extends AbstractWorkerProvider { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorker.java index 16ce33615..2bf7936c2 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorker.java @@ -24,7 +24,7 @@ package org.skywalking.apm.collector.stream.worker; *

* Usually, the implementations are doing persistent, or aggregate works. * - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public abstract class AbstractRemoteWorker extends AbstractWorker { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorkerProvider.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorkerProvider.java index 7098cb5cd..877d280b0 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorkerProvider.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractRemoteWorkerProvider.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.client.grpc.GRPCClient; * which create instance of cluster workers whose implemented {@link AbstractRemoteWorker}. *

* - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public abstract class AbstractRemoteWorkerProvider extends AbstractWorkerProvider { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorker.java index be62b55bd..4f142af22 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorker.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AbstractWorker implements Executor { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorkerProvider.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorkerProvider.java index e61a29738..7868530e6 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorkerProvider.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/AbstractWorkerProvider.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AbstractWorkerProvider implements Provider { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerContext.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerContext.java index ec0e8aeff..ba51286b1 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerContext.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerContext.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public class ClusterWorkerContext extends WorkerContext { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerRefCounter.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerRefCounter.java index 3754d983d..43ef9db7e 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerRefCounter.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/ClusterWorkerRefCounter.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; /** - * @author pengys5 + * @author peng-yongsheng */ public enum ClusterWorkerRefCounter { INSTANCE; diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Context.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Context.java index e890b74bc..ee33e549f 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Context.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Context.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Context extends LookUp { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerProviderDefineLoader.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerProviderDefineLoader.java index bdb29ae17..4ae46ecb6 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerProviderDefineLoader.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerProviderDefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class LocalAsyncWorkerProviderDefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerRef.java index ace3f63d7..1451a3549 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerRef.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalAsyncWorkerRef.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker; import org.skywalking.apm.collector.core.queue.QueueEventHandler; /** - * @author pengys5 + * @author peng-yongsheng */ public class LocalAsyncWorkerRef extends WorkerRef { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalWorkerProviderDefinitionFile.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalWorkerProviderDefinitionFile.java index 1b559604c..14f07f4a6 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalWorkerProviderDefinitionFile.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LocalWorkerProviderDefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class LocalWorkerProviderDefinitionFile extends DefinitionFile { @Override protected String fileName() { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LookUp.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LookUp.java index 2fc6f6b82..8161756b8 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LookUp.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/LookUp.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public interface LookUp { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Provider.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Provider.java index aa89a08b6..c2a2fa76c 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Provider.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Provider.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Provider { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefineLoader.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefineLoader.java index 4223b1560..527456eac 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefineLoader.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefineLoader.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class RemoteWorkerProviderDefineLoader implements Loader> { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefinitionFile.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefinitionFile.java index a8a897018..96d403ba1 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefinitionFile.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerProviderDefinitionFile.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker; import org.skywalking.apm.collector.core.framework.DefinitionFile; /** - * @author pengys5 + * @author peng-yongsheng */ public class RemoteWorkerProviderDefinitionFile extends DefinitionFile { @Override protected String fileName() { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerRef.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerRef.java index 8abf1b36c..cbb870efd 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerRef.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/RemoteWorkerRef.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class RemoteWorkerRef extends WorkerRef { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java index 5b4cfffbc..68d57eb85 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** - * @author pengys5 + * @author peng-yongsheng */ public interface Role { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerContext.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerContext.java index d2ef145b2..ba1fd305c 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerContext.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerContext.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class WorkerContext implements Context { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerException.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerException.java index 88804c09a..dd0de109f 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerException.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerException.java @@ -22,7 +22,7 @@ package org.skywalking.apm.collector.stream.worker; * Defines a general exception a worker can throw when it * encounters difficulty. * - * @author pengys5 + * @author peng-yongsheng * @since v3.1-2017 */ public class WorkerException extends Exception { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerInvokeException.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerInvokeException.java index 5326ede7c..cb43be394 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerInvokeException.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerInvokeException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker; /** * This exception is raised when worker fails to process job during "call" or "ask" * - * @author pengys5 + * @author peng-yongsheng * @since v3.1-2017 */ public class WorkerInvokeException extends WorkerException { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRef.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRef.java index c64719a70..959689464 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRef.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRef.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class WorkerRef { private Role role; diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java index dd9837246..0f35a230d 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/WorkerRefs.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class WorkerRefs { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java index 51d7335c8..21c480f10 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class AggregationWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java index 5673f4f42..b6148a732 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker.impl; /** - * @author pengys5 + * @author peng-yongsheng */ public class FlushAndSwitch { } diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/GRPCRemoteWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/GRPCRemoteWorker.java index c77891c15..d87e15d6a 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/GRPCRemoteWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/GRPCRemoteWorker.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.stream.worker.Role; import org.skywalking.apm.collector.stream.worker.WorkerException; /** - * @author pengys5 + * @author peng-yongsheng */ public class GRPCRemoteWorker extends AbstractRemoteWorker { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java index ae32761e4..4c0c7ddfe 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorkerContainer.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorkerContainer.java index 2b376b0cc..9dd5e4330 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorkerContainer.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorkerContainer.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public enum PersistenceWorkerContainer { INSTANCE; diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java index dba0f6945..8818ed410 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IPersistenceDAO { Data get(String id, DataDefine dataDefine); diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java index 644a4b884..05b70e26b 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker.impl.data; import org.skywalking.apm.collector.core.stream.Data; /** - * @author pengys5 + * @author peng-yongsheng */ public class DataCache extends Window { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java index eb3392958..cc6b2fcb4 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.skywalking.apm.collector.core.stream.Data; /** - * @author pengys5 + * @author peng-yongsheng */ public class DataCollection { private Map data; diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/Window.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/Window.java index dfcd8d9fa..a1b53450a 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/Window.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/Window.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream.worker.impl.data; import java.util.concurrent.atomic.AtomicInteger; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class Window { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/ForeverFirstSelector.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/ForeverFirstSelector.java index c9cd07539..c74fa9553 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/ForeverFirstSelector.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/ForeverFirstSelector.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ForeverFirstSelector implements WorkerSelector { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/HashCodeSelector.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/HashCodeSelector.java index 67b4b3d41..6231b7be2 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/HashCodeSelector.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/HashCodeSelector.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.stream.worker.WorkerRef; * by message {@link AbstractHashMessage} key's hashcode, so it can use to send the same hashcode message to same {@link * WorkerRef}. Usually, use to database operate which avoid dirty data. * - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public class HashCodeSelector implements WorkerSelector { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/RollingSelector.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/RollingSelector.java index 63e82e3eb..d13036caf 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/RollingSelector.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/RollingSelector.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.stream.worker.WorkerRef; * The RollingSelector is a simple implementation of {@link WorkerSelector}. * It choose {@link WorkerRef} nearly random, by round-robin. * - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public class RollingSelector implements WorkerSelector { diff --git a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/WorkerSelector.java b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/WorkerSelector.java index 38ea0c090..d8d8389ad 100644 --- a/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/WorkerSelector.java +++ b/apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/selector/WorkerSelector.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.stream.worker.WorkerRef; *

* Actually, the WorkerRef is designed to provide a routing ability in the collector cluster * - * @author pengys5 + * @author peng-yongsheng * @since v3.0-2017 */ public interface WorkerSelector { diff --git a/apm-collector/apm-collector-stream/src/test/java/org/skywalking/apm/collector/stream/worker/util/TimeBucketUtilsTestCase.java b/apm-collector/apm-collector-stream/src/test/java/org/skywalking/apm/collector/stream/worker/util/TimeBucketUtilsTestCase.java index 4b27612f8..0e1075d33 100644 --- a/apm-collector/apm-collector-stream/src/test/java/org/skywalking/apm/collector/stream/worker/util/TimeBucketUtilsTestCase.java +++ b/apm-collector/apm-collector-stream/src/test/java/org/skywalking/apm/collector/stream/worker/util/TimeBucketUtilsTestCase.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.skywalking.apm.collector.core.util.TimeBucketUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class TimeBucketUtilsTestCase { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleContext.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleContext.java index b4a3bd131..4be86a417 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleContext.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleContext.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui; import org.skywalking.apm.collector.core.framework.Context; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIModuleContext extends Context { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleDefine.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleDefine.java index bdbe25b5a..8abb42cf3 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleDefine.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleDefine.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine; import org.skywalking.apm.collector.core.module.ModuleDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public abstract class UIModuleDefine extends ModuleDefine implements ClusterDataListenerDefine { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleException.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleException.java index d335cb8ca..033470beb 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleException.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleException.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui; import org.skywalking.apm.collector.core.module.ModuleException; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIModuleException extends ModuleException { public UIModuleException(String message) { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleGroupDefine.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleGroupDefine.java index 9ac9de5ad..ce7123971 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleGroupDefine.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleGroupDefine.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine; import org.skywalking.apm.collector.core.module.ModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIModuleGroupDefine implements ModuleGroupDefine { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleInstaller.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleInstaller.java index 19e516d6a..7741dd697 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleInstaller.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/UIModuleInstaller.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.framework.Context; import org.skywalking.apm.collector.core.module.MultipleModuleInstaller; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIModuleInstaller extends MultipleModuleInstaller { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java index a05e59040..40cff2afa 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class CpuMetricEsDAO extends EsDAO implements ICpuMetricDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java index 8d6d302ba..43fa78f56 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import com.google.gson.JsonArray; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java index bb11ff6d5..ee694205b 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GCMetricEsDAO extends EsDAO implements IGCMetricDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java index be97ac1e0..5464f07a5 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java @@ -38,7 +38,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { private final Logger logger = LoggerFactory.getLogger(GCMetricH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java index fe54e4496..d5c15e953 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class GlobalTraceEsDAO extends EsDAO implements IGlobalTraceDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java index 7b00d09ea..6383833d0 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class GlobalTraceH2DAO extends H2DAO implements IGlobalTraceDAO { private final Logger logger = LoggerFactory.getLogger(GlobalTraceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ICpuMetricDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ICpuMetricDAO.java index fa9c2b52b..0f58c7d87 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ICpuMetricDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ICpuMetricDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ICpuMetricDAO { int getMetric(int instanceId, long timeBucket); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGCMetricDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGCMetricDAO.java index f1398b0cf..dd6e187f5 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGCMetricDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGCMetricDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonObject; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IGCMetricDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGlobalTraceDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGlobalTraceDAO.java index 32d8c89bb..6e98e8cf4 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGlobalTraceDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IGlobalTraceDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IGlobalTraceDAO { List getGlobalTraceId(String segmentId); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstPerformanceDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstPerformanceDAO.java index 2ba7b5126..c4d134690 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstPerformanceDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstPerformanceDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstPerformanceDAO { InstPerformance get(long[] timeBuckets, int instanceId); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java index 8a018d257..483d5111e 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java @@ -23,7 +23,7 @@ import java.util.List; import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IInstanceDAO { Long lastHeartBeatTime(); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryMetricDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryMetricDAO.java index ca5520391..14195d320 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryMetricDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryMetricDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonObject; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IMemoryMetricDAO { JsonObject getMetric(int instanceId, long timeBucket, boolean isHeap); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryPoolMetricDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryPoolMetricDAO.java index cbfb217df..c35bae58e 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryPoolMetricDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IMemoryPoolMetricDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonObject; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IMemoryPoolMetricDAO { JsonObject getMetric(int instanceId, long timeBucket, int poolType); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeComponentDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeComponentDAO.java index b419b96f0..ef944e89c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeComponentDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeComponentDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeComponentDAO { JsonArray load(long startTime, long endTime); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeMappingDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeMappingDAO.java index c5ce273a9..c05a7563f 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeMappingDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeMappingDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeMappingDAO { JsonArray load(long startTime, long endTime); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeReferenceDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeReferenceDAO.java index 949a9d112..8237e28d0 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeReferenceDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/INodeReferenceDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; /** - * @author pengys5 + * @author peng-yongsheng */ public interface INodeReferenceDAO { JsonArray load(long startTime, long endTime); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentCostDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentCostDAO.java index 458b686b3..15d7ebf7f 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentCostDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentCostDAO.java @@ -22,7 +22,7 @@ import com.google.gson.JsonObject; import java.util.List; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ISegmentCostDAO { JsonObject loadTop(long startTime, long endTime, long minCost, long maxCost, String operationName, diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentDAO.java index 9f3da97dc..6bd9b6ea5 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ISegmentDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import org.skywalking.apm.network.proto.TraceSegmentObject; /** - * @author pengys5 + * @author peng-yongsheng */ public interface ISegmentDAO { TraceSegmentObject load(String segmentId); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceEntryDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceEntryDAO.java index 0b4074ce0..7b0926cab 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceEntryDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceEntryDAO.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonObject; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceEntryDAO { JsonObject load(int applicationId, String entryServiceName, long startTime, long endTime, int from, int size); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceReferenceDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceReferenceDAO.java index 3f267af65..bd064745a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceReferenceDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceReferenceDAO.java @@ -22,7 +22,7 @@ import com.google.gson.JsonObject; import java.util.Map; /** - * @author pengys5 + * @author peng-yongsheng */ public interface IServiceReferenceDAO { Map load(int entryServiceId, long startTime, long endTime); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java index b5e902f06..838080a67 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java @@ -37,7 +37,7 @@ import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstPerformanceEsDAO extends EsDAO implements IInstPerformanceDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java index 9cd63b828..6b277fe8f 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import com.google.gson.JsonArray; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { private final Logger logger = LoggerFactory.getLogger(InstPerformanceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java index 4401ce9cd..50524142a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java @@ -46,7 +46,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceEsDAO extends EsDAO implements IInstanceDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java index f94c1f1ef..f51fbf0b8 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java index 7f5e213c2..c3c0f2062 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryMetricEsDAO extends EsDAO implements IMemoryMetricDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java index 960b839f0..f5c23bec0 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class MemoryPoolMetricEsDAO extends EsDAO implements IMemoryPoolMetricDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java index 1b57d9440..09bf4b72d 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeComponentEsDAO extends EsDAO implements INodeComponentDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java index 54a86ca49..2aabff5b7 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeComponentH2DAO extends H2DAO implements INodeComponentDAO { private final Logger logger = LoggerFactory.getLogger(NodeComponentH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java index 70ee47a59..12f544627 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeMappingEsDAO extends EsDAO implements INodeMappingDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java index 78ae8cf1c..53b330b50 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO { private final Logger logger = LoggerFactory.getLogger(NodeMappingH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java index 2a7f7c0d4..52d3ce3c0 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class NodeReferenceEsDAO extends EsDAO implements INodeReferenceDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java index 007882c44..6c910f295 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java @@ -35,7 +35,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeReferenceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java index cefd3518c..87a02bf92 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java @@ -38,7 +38,7 @@ import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentCostEsDAO extends EsDAO implements ISegmentCostDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java index b992c6947..32f5a4317 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java @@ -40,7 +40,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class SegmentCostH2DAO extends H2DAO implements ISegmentCostDAO { private final Logger logger = LoggerFactory.getLogger(SegmentCostH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java index 841e304a2..43047665e 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentEsDAO extends EsDAO implements ISegmentDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java index 4421167b1..29d019d83 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class SegmentH2DAO extends H2DAO implements ISegmentDAO { private final Logger logger = LoggerFactory.getLogger(SegmentH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java index 64a20fef8..2574818ea 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java @@ -36,7 +36,7 @@ import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryEsDAO extends EsDAO implements IServiceEntryDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java index 4017b306a..cdc3b7ae8 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceEntryH2DAO extends H2DAO implements IServiceEntryDAO { private final Logger logger = LoggerFactory.getLogger(SegmentH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java index 00e24144c..2f4bc38d8 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceReferenceEsDAO extends EsDAO implements IServiceReferenceDAO { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java index 4a4a693eb..090005967 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5, clevertension + * @author peng-yongsheng, clevertension */ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO { private final Logger logger = LoggerFactory.getLogger(ServiceReferenceH2DAO.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfig.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfig.java index f45f8b590..bd47afca4 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfig.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfig.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.ui.jetty; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyConfig { public static String HOST; diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfigParser.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfigParser.java index 0f9046ebc..d65e63e3a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfigParser.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyConfigParser.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyConfigParser implements ModuleConfigParser { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyDataListener.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyDataListener.java index e9c58da79..c3fca9702 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyDataListener.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyDataListener.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListener; import org.skywalking.apm.collector.ui.UIModuleGroupDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyDataListener extends ClusterDataListener { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java index 1103e391e..7f01ba0f3 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java @@ -43,7 +43,7 @@ import org.skywalking.apm.collector.ui.jetty.handler.time.AllInstanceLastTimeGet import org.skywalking.apm.collector.ui.jetty.handler.time.OneInstanceLastTimeGetHandler; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyModuleDefine extends UIModuleDefine { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleRegistration.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleRegistration.java index dc12ae787..1541ab41a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleRegistration.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleRegistration.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.ui.jetty; import org.skywalking.apm.collector.core.module.ModuleRegistration; /** - * @author pengys5 + * @author peng-yongsheng */ public class UIJettyModuleRegistration extends ModuleRegistration { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java index d88533af0..79c9c0d65 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentTopGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java index e0b2544da..9bdfdac2c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SpanGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java index f1bb98704..9a2d50795 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceDagGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java index b88a88988..9358d6f6c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceStackGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java index 6b8dcdcb4..7377213a1 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationsGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java index 0349567c3..31ad765ac 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceHealthGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java index 684c41956..bf3a833e8 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceMetricGetOneTimeBucketHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java index 9950685a3..e81400acb 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceMetricGetRangeTimeBucketHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java index 865e52f48..65f3ab603 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceOsInfoGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java index 2c808d241..cd36b4711 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class EntryServiceGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java index aecb2f23d..f68cc9802 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceTreeGetByIdHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java index dbfc4d942..9da2beca2 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class AllInstanceLastTimeGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java index eea646ba6..fc6b6705f 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class OneInstanceLastTimeGetHandler extends JettyHandler { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java index d5722a5a8..0ac5c7066 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.IInstanceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class ApplicationService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java index 3a739522f..6ae7e753c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceHealthService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java index a5cfe6495..7f262eadb 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class InstanceJVMService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java index aa15d8aac..fc7177720 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class SegmentTopService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java index ef966e3d1..e770b4d9c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java @@ -31,7 +31,7 @@ import org.skywalking.apm.collector.ui.dao.IServiceEntryDAO; import org.skywalking.apm.collector.ui.dao.IServiceReferenceDAO; /** - * @author pengys5 + * @author peng-yongsheng */ public class ServiceTreeService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java index 4be2bad26..0d8f14fe5 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java @@ -34,7 +34,7 @@ import org.skywalking.apm.network.proto.TraceSegmentObject; import org.skywalking.apm.network.trace.component.ComponentsDefine; /** - * @author pengys5 + * @author peng-yongsheng */ public class SpanService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java index bb3572130..1556d9dfe 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TimeSynchronousService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java index 3e3ce804d..1249a0d75 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceDagDataBuilder { private final Logger logger = LoggerFactory.getLogger(TraceDagDataBuilder.class); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java index d38cc4599..3bad83c9a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceDagService { diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java index 94abc7161..337e793a5 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java @@ -37,7 +37,7 @@ import org.skywalking.apm.network.proto.TraceSegmentReference; import org.skywalking.apm.network.proto.UniqueId; /** - * @author pengys5 + * @author peng-yongsheng */ public class TraceStackService { diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java index 79c1165a7..c1b85b3d4 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java @@ -44,7 +44,7 @@ import org.skywalking.apm.network.trace.component.ComponentsDefine; /** * {@link DefaultHttpClientInterceptor} intercept the default implementation of http calls by the Feign. * - * @author pengys5 + * @author peng-yongsheng */ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java index d934805b9..c87158965 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java @@ -35,7 +35,7 @@ import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName; * If feign did't run in default mode, the instrumentation depend on the http discovery implementation. * e.g. okhttp discovery implementation depend on okhttp-plugin. * - * @author pengys5 + * @author peng-yongsheng */ public class DefaultHttpClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java index 1126efa37..9f0c4ddd8 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** - * @author pengys5 + * @author peng-yongsheng */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java index 838a9fbbd..f83137e0e 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java @@ -41,7 +41,7 @@ import org.skywalking.apm.network.trace.component.ComponentsDefine; /** * {@link RealCallInterceptor} intercept the synchronous http calls by the discovery of okhttp. * - * @author pengys5 + * @author peng-yongsheng */ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java index 6039087c9..a68ec968e 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java @@ -36,7 +36,7 @@ import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName; * {@link RealCallInstrumentation} presents that skywalking intercepts {@link okhttp3.RealCall#RealCall(OkHttpClient, * Request, boolean)}, {@link okhttp3.RealCall#execute()} by using {@link RealCallInterceptor}. * - * @author pengys5 + * @author peng-yongsheng */ public class RealCallInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java index 644ba6488..e95519565 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java @@ -54,7 +54,7 @@ import static org.skywalking.apm.agent.test.tools.SpanAssert.assertOccurExceptio import static org.skywalking.apm.agent.test.tools.SpanAssert.assertTag; /** - * @author pengys5 + * @author peng-yongsheng */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) diff --git a/pom.xml b/pom.xml index 13233eb11..5a5b4b0fd 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,8 @@ Peng Yongsheng - https://github.com/pengys5 + 8082209@qq.com + https://github.com/peng-yongsheng Dai Wen @@ -69,11 +70,11 @@ pom apm - https://github.com/wu-sheng/sky-walking + https://github.com/OpenSkywalking/skywalking GitHub - https://github.com/wu-sheng/sky-walking/issues + https://github.com/OpenSkywalking/skywalking/issues From 4b3e8834e7ed882b858c9f3d839a88ec561a1883 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Mon, 23 Oct 2017 21:07:33 +0800 Subject: [PATCH 02/10] fix the interceptor class of jdbc plugin is incorrect --- .../plugin/jdbc/define/AbstractDriverInstrumentation.java | 2 +- .../org/skywalking/apm/plugin/jdbc/define/Constants.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java index e45b21033..1597c3dc0 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java @@ -34,7 +34,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; */ public abstract class AbstractDriverInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - private static final String DRIVER_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.define.JDBCDriverInterceptor"; + private static final String DRIVER_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.JDBCDriverInterceptor"; @Override protected final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/Constants.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/Constants.java index 504a48151..1be41d71e 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/define/Constants.java @@ -19,13 +19,13 @@ package org.skywalking.apm.plugin.jdbc.define; public class Constants { - public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor"; + public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.JDBCStatementInterceptor"; - public static final String PREPARE_STATEMENT_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor"; + public static final String PREPARE_STATEMENT_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.JDBCPrepareStatementInterceptor"; - public static final String PREPARE_CALL_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor"; + public static final String PREPARE_CALL_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.JDBCPrepareCallInterceptor"; - public static final String SERVICE_METHOD_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor"; + public static final String SERVICE_METHOD_INTERCEPT_CLASS = "org.skywalking.apm.plugin.jdbc.ConnectionServiceMethodInterceptor"; public static final String PREPARE_STATEMENT_METHOD_NAME = "prepareStatement"; From 020ce1c33b9925b95a7f5be7e91f8bc279ea57cd Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 15:11:44 +0800 Subject: [PATCH 03/10] no message --- .../worker/cpu/dao/CpuMetricH2DAO.java | 8 +- .../agentjvm/worker/gc/dao/GCMetricH2DAO.java | 3 +- .../heartbeat/dao/InstanceHeartBeatH2DAO.java | 6 +- .../worker/memory/dao/MemoryMetricH2DAO.java | 3 +- .../memorypool/dao/MemoryPoolMetricH2DAO.java | 3 +- .../application/ApplicationH2TableDefine.java | 2 + .../application/dao/ApplicationEsDAO.java | 2 +- .../application/dao/ApplicationH2DAO.java | 14 +++- .../instance/InstanceH2TableDefine.java | 1 + .../worker/instance/dao/InstanceH2DAO.java | 5 +- .../servicename/ServiceNameH2TableDefine.java | 1 + .../servicename/dao/ServiceNameEsDAO.java | 2 +- .../servicename/dao/ServiceNameH2DAO.java | 1 + .../worker/global/dao/GlobalTraceH2DAO.java | 8 +- .../performance/dao/InstPerformanceH2DAO.java | 12 +-- .../component/dao/NodeComponentH2DAO.java | 10 +-- .../node/mapping/dao/NodeMappingH2DAO.java | 12 +-- .../noderef/dao/NodeReferenceH2DAO.java | 12 +-- .../segment/cost/dao/SegmentCostH2DAO.java | 10 ++- .../segment/origin/dao/SegmentH2DAO.java | 2 +- .../service/entry/dao/ServiceEntryH2DAO.java | 6 +- .../serviceref/dao/ServiceReferenceH2DAO.java | 10 +-- .../src/main/resources/application.yml | 6 +- .../apm/collector/storage/h2/SqlBuilder.java | 16 ++-- .../apm/collector/ui/dao/CpuMetricH2DAO.java | 40 ++++----- .../apm/collector/ui/dao/GCMetricH2DAO.java | 83 +++++++------------ .../ui/dao/InstPerformanceH2DAO.java | 74 +++++++---------- .../apm/collector/ui/dao/InstanceH2DAO.java | 4 +- .../collector/ui/dao/MemoryMetricH2DAO.java | 50 +++++------ .../ui/dao/MemoryPoolMetricH2DAO.java | 52 +++++------- .../apm/collector/ui/dao/SegmentH2DAO.java | 2 +- 31 files changed, 210 insertions(+), 250 deletions(-) diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java index 9d0e8f73b..e6e735e21 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java @@ -18,6 +18,8 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.dao; +import java.util.HashMap; +import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; @@ -28,14 +30,12 @@ import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Map; - /** * @author peng-yongsheng, clevertension */ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(CpuMetricH2DAO.class); + @Override public Data get(String id, DataDefine dataDefine) { return null; } @@ -43,7 +43,7 @@ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO, IPersistence @Override public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(CpuMetricTable.COLUMN_ID, data.getDataString(0)); source.put(CpuMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0)); source.put(CpuMetricTable.COLUMN_USAGE_PERCENT, data.getDataDouble(0)); source.put(CpuMetricTable.COLUMN_TIME_BUCKET, data.getDataLong(0)); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java index 3259db1ae..8657efc96 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java @@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.dao; import java.util.HashMap; import java.util.Map; - import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; @@ -40,7 +39,7 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO, IPersistenceDA @Override public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(GCMetricTable.COLUMN_ID, data.getDataString(0)); source.put(GCMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0)); source.put(GCMetricTable.COLUMN_PHRASE, data.getDataInteger(1)); source.put(GCMetricTable.COLUMN_COUNT, data.getDataLong(0)); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java index 65c05d1cf..a249c295e 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.framework.UnexpectedException; @@ -44,10 +43,11 @@ import org.slf4j.LoggerFactory; public class InstanceHeartBeatH2DAO extends H2DAO implements IInstanceHeartBeatDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatEsDAO.class); private static final String GET_INSTANCE_HEARTBEAT_SQL = "select * from {0} where {1} = ?"; + @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); String sql = SqlBuilder.buildSql(GET_INSTANCE_HEARTBEAT_SQL, InstanceTable.TABLE, InstanceTable.COLUMN_INSTANCE_ID); - Object[] params = new Object[]{id}; + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -69,7 +69,7 @@ public class InstanceHeartBeatH2DAO extends H2DAO implements IInstanceHeartBeatD H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); source.put(InstanceTable.COLUMN_HEARTBEAT_TIME, data.getDataLong(0)); - String sql = SqlBuilder.buildBatchUpdateSql(InstanceTable.TABLE, source.keySet(), InstanceTable.COLUMN_APPLICATION_ID); + String sql = SqlBuilder.buildBatchUpdateSql(InstanceTable.TABLE, source.keySet(), InstanceTable.COLUMN_INSTANCE_ID); entity.setSql(sql); List params = new ArrayList<>(source.values()); params.add(data.getDataString(0)); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java index 8ce088268..eb4c823eb 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java @@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.dao; import java.util.HashMap; import java.util.Map; - import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; @@ -40,7 +39,7 @@ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO, IPersi @Override public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(MemoryMetricTable.COLUMN_ID, data.getDataString(0)); source.put(MemoryMetricTable.COLUMN_APPLICATION_INSTANCE_ID, data.getDataInteger(0)); source.put(MemoryMetricTable.COLUMN_IS_HEAP, data.getDataBoolean(0)); source.put(MemoryMetricTable.COLUMN_INIT, data.getDataLong(0)); diff --git a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java index 82b54bba9..c97c9f549 100644 --- a/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java @@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.dao; import java.util.HashMap; import java.util.Map; - import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; @@ -40,7 +39,7 @@ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO @Override public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(MemoryPoolMetricTable.COLUMN_ID, data.getDataString(0)); source.put(MemoryPoolMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0)); source.put(MemoryPoolMetricTable.COLUMN_POOL_TYPE, data.getDataInteger(1)); source.put(MemoryPoolMetricTable.COLUMN_INIT, data.getDataLong(0)); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java index e7e4b6000..85405495a 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.application; +import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; @@ -32,6 +33,7 @@ public class ApplicationH2TableDefine extends H2TableDefine { } @Override public void initialize() { + addColumn(new H2ColumnDefine(GlobalTraceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ApplicationTable.COLUMN_APPLICATION_CODE, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ApplicationTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); } diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java index 1e4e299db..c830f5cd4 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java @@ -47,7 +47,7 @@ public class ApplicationEsDAO extends EsDAO implements IApplicationDAO { @Override public void save(ApplicationDataDefine.Application application) { logger.debug("save application register info, application id: {}, application code: {}", application.getApplicationId(), application.getApplicationCode()); ElasticSearchClient client = getClient(); - Map source = new HashMap(); + Map source = new HashMap<>(); source.put(ApplicationTable.COLUMN_APPLICATION_CODE, application.getApplicationCode()); source.put(ApplicationTable.COLUMN_APPLICATION_ID, application.getApplicationId()); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java index b4e90a68c..3ce9c1dcd 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java @@ -18,6 +18,8 @@ package org.skywalking.apm.collector.agentregister.worker.application.dao; +import java.util.HashMap; +import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; @@ -32,7 +34,6 @@ import org.slf4j.LoggerFactory; */ public class ApplicationH2DAO extends H2DAO implements IApplicationDAO { private final Logger logger = LoggerFactory.getLogger(ApplicationH2DAO.class); - private static final String INSERT_APPLICATION_SQL = "insert into {0}({1}, {2}) values(?, ?)"; @Override public int getMaxApplicationId() { @@ -47,9 +48,14 @@ public class ApplicationH2DAO extends H2DAO implements IApplicationDAO { @Override public void save(ApplicationDataDefine.Application application) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(INSERT_APPLICATION_SQL, ApplicationTable.TABLE, ApplicationTable.COLUMN_APPLICATION_ID, - ApplicationTable.COLUMN_APPLICATION_CODE); - Object[] params = new Object[] {application.getApplicationId(), application.getApplicationCode()}; + + Map source = new HashMap<>(); + source.put(ApplicationTable.COLUMN_ID, application.getApplicationId()); + source.put(ApplicationTable.COLUMN_APPLICATION_CODE, application.getApplicationCode()); + source.put(ApplicationTable.COLUMN_APPLICATION_ID, application.getApplicationId()); + + String sql = SqlBuilder.buildBatchInsertSql(ApplicationTable.TABLE, source.keySet()); + Object[] params = source.values().toArray(new Object[0]); try { client.execute(sql, params); } catch (H2ClientException e) { diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java index 1c8bcc6d7..70b9224f4 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java @@ -32,6 +32,7 @@ public class InstanceH2TableDefine extends H2TableDefine { } @Override public void initialize() { + addColumn(new H2ColumnDefine(InstanceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(InstanceTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); addColumn(new H2ColumnDefine(InstanceTable.COLUMN_AGENT_UUID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(InstanceTable.COLUMN_REGISTER_TIME, H2ColumnDefine.Type.Bigint.name())); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java index 737c42560..32bf7097b 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java @@ -38,7 +38,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); private static final String GET_INSTANCE_ID_SQL = "select {0} from {1} where {2} = ? and {3} = ?"; - private static final String UPDATE_HEARTBEAT_TIME_SQL = "updatte {0} set {1} = ? where {2} = ?"; + private static final String UPDATE_HEARTBEAT_TIME_SQL = "update {0} set {1} = ? where {2} = ?"; @Override public int getInstanceId(int applicationId, String agentUUID) { logger.info("get the application id with application id = {}, agentUUID = {}", applicationId, agentUUID); @@ -67,6 +67,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { @Override public void save(InstanceDataDefine.Instance instance) { H2Client client = getClient(); Map source = new HashMap<>(); + source.put(InstanceTable.COLUMN_ID, instance.getId()); source.put(InstanceTable.COLUMN_INSTANCE_ID, instance.getInstanceId()); source.put(InstanceTable.COLUMN_APPLICATION_ID, instance.getApplicationId()); source.put(InstanceTable.COLUMN_AGENT_UUID, instance.getAgentUUID()); @@ -85,7 +86,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { @Override public void updateHeartbeatTime(int instanceId, long heartbeatTime) { H2Client client = getClient(); String sql = SqlBuilder.buildSql(UPDATE_HEARTBEAT_TIME_SQL, InstanceTable.TABLE, InstanceTable.COLUMN_HEARTBEAT_TIME, - InstanceTable.COLUMN_INSTANCE_ID); + InstanceTable.COLUMN_ID); Object[] params = new Object[] {heartbeatTime, instanceId}; try { client.execute(sql, params); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java index 6dea89617..fa4343d7c 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java @@ -32,6 +32,7 @@ public class ServiceNameH2TableDefine extends H2TableDefine { } @Override public void initialize() { + addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_NAME, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_ID, H2ColumnDefine.Type.Int.name())); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java index 0aaa73934..c82ba981f 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java @@ -47,7 +47,7 @@ public class ServiceNameEsDAO extends EsDAO implements IServiceNameDAO { @Override public void save(ServiceNameDataDefine.ServiceName serviceName) { logger.debug("save service name register info, application id: {}, service name: {}", serviceName.getApplicationId(), serviceName.getServiceName()); ElasticSearchClient client = getClient(); - Map source = new HashMap(); + Map source = new HashMap<>(); source.put(ServiceNameTable.COLUMN_SERVICE_ID, serviceName.getServiceId()); source.put(ServiceNameTable.COLUMN_APPLICATION_ID, serviceName.getApplicationId()); source.put(ServiceNameTable.COLUMN_SERVICE_NAME, serviceName.getServiceName()); diff --git a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java index e839e5d48..ef36d208e 100644 --- a/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java +++ b/apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java @@ -50,6 +50,7 @@ public class ServiceNameH2DAO extends H2DAO implements IServiceNameDAO { logger.debug("save service name register info, application id: {}, service name: {}", serviceName.getApplicationId(), serviceName.getServiceName()); H2Client client = getClient(); Map source = new HashMap<>(); + source.put(ServiceNameTable.COLUMN_ID, serviceName.getId()); source.put(ServiceNameTable.COLUMN_SERVICE_ID, serviceName.getServiceId()); source.put(ServiceNameTable.COLUMN_APPLICATION_ID, serviceName.getApplicationId()); source.put(ServiceNameTable.COLUMN_SERVICE_NAME, serviceName.getServiceName()); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java index b1c283a3d..5852e5822 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java @@ -18,6 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.global.dao; +import java.util.HashMap; +import java.util.Map; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; @@ -29,14 +31,12 @@ import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Map; - /** * @author peng-yongsheng, clevertension */ public class GlobalTraceH2DAO extends H2DAO implements IGlobalTraceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(GlobalTraceH2DAO.class); + @Override public Data get(String id, DataDefine dataDefine) { throw new UnexpectedException("There is no need to merge stream data with database data."); } @@ -48,7 +48,7 @@ public class GlobalTraceH2DAO extends H2DAO implements IGlobalTraceDAO, IPersist @Override public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(GlobalTraceTable.COLUMN_ID, data.getDataString(0)); source.put(GlobalTraceTable.COLUMN_SEGMENT_ID, data.getDataString(1)); source.put(GlobalTraceTable.COLUMN_GLOBAL_TRACE_ID, data.getDataString(2)); source.put(GlobalTraceTable.COLUMN_TIME_BUCKET, data.getDataLong(0)); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java index 668c43cdc..93c96517d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; @@ -43,10 +42,11 @@ import org.slf4j.LoggerFactory; public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(InstPerformanceH2DAO.class); private static final String GET_SQL = "select * from {0} where {1} = ?"; + @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, InstPerformanceTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_SQL, InstPerformanceTable.TABLE, InstPerformanceTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -62,10 +62,11 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO, } return null; } + @Override public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(InstPerformanceTable.COLUMN_ID, data.getDataString(0)); source.put(InstPerformanceTable.COLUMN_APPLICATION_ID, data.getDataInteger(0)); source.put(InstPerformanceTable.COLUMN_INSTANCE_ID, data.getDataInteger(1)); source.put(InstPerformanceTable.COLUMN_CALLS, data.getDataInteger(2)); @@ -76,6 +77,7 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO, entity.setParams(source.values().toArray(new Object[0])); return entity; } + @Override public H2SqlEntity prepareBatchUpdate(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); @@ -85,7 +87,7 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO, source.put(InstPerformanceTable.COLUMN_COST_TOTAL, data.getDataLong(0)); source.put(InstPerformanceTable.COLUMN_TIME_BUCKET, data.getDataLong(1)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(InstPerformanceTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(InstPerformanceTable.TABLE, source.keySet(), InstPerformanceTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java index bbc4ed008..eff769b28 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java @@ -24,13 +24,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; import org.skywalking.apm.collector.storage.h2.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; @@ -48,8 +46,8 @@ public class NodeComponentH2DAO extends H2DAO implements INodeComponentDAO, IPer @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, ServiceReferenceTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_SQL, NodeComponentTable.TABLE, NodeComponentTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -70,7 +68,7 @@ public class NodeComponentH2DAO extends H2DAO implements INodeComponentDAO, IPer public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(NodeComponentTable.COLUMN_ID, data.getDataString(0)); source.put(NodeComponentTable.COLUMN_COMPONENT_ID, data.getDataInteger(0)); source.put(NodeComponentTable.COLUMN_COMPONENT_NAME, data.getDataString(1)); source.put(NodeComponentTable.COLUMN_PEER_ID, data.getDataInteger(1)); @@ -93,7 +91,7 @@ public class NodeComponentH2DAO extends H2DAO implements INodeComponentDAO, IPer source.put(NodeComponentTable.COLUMN_PEER, data.getDataString(2)); source.put(NodeComponentTable.COLUMN_TIME_BUCKET, data.getDataLong(0)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(NodeComponentTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(NodeComponentTable.TABLE, source.keySet(), NodeComponentTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java index 1870e2ea2..1e25502c1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.agentstream.worker.node.component.dao.NodeComponentH2DAO; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; @@ -44,10 +43,11 @@ import org.slf4j.LoggerFactory; public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeComponentH2DAO.class); private static final String GET_SQL = "select * from {0} where {1} = ?"; + @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, NodeMappingTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_SQL, NodeMappingTable.TABLE, NodeMappingTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -62,10 +62,11 @@ public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO, IPersist } return null; } + @Override public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(NodeMappingTable.COLUMN_ID, data.getDataString(0)); source.put(NodeMappingTable.COLUMN_APPLICATION_ID, data.getDataInteger(0)); source.put(NodeMappingTable.COLUMN_ADDRESS_ID, data.getDataInteger(1)); source.put(NodeMappingTable.COLUMN_ADDRESS, data.getDataString(1)); @@ -76,6 +77,7 @@ public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO, IPersist entity.setParams(source.values().toArray(new Object[0])); return entity; } + @Override public H2SqlEntity prepareBatchUpdate(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); @@ -84,7 +86,7 @@ public class NodeMappingH2DAO extends H2DAO implements INodeMappingDAO, IPersist source.put(NodeMappingTable.COLUMN_ADDRESS, data.getDataString(1)); source.put(NodeMappingTable.COLUMN_TIME_BUCKET, data.getDataLong(0)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(NodeMappingTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(NodeMappingTable.TABLE, source.keySet(), NodeMappingTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java index 9f79d1977..2a0e89994 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; @@ -43,10 +42,11 @@ import org.slf4j.LoggerFactory; public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(NodeReferenceH2DAO.class); private static final String GET_SQL = "select * from {0} where {1} = ?"; + @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, NodeReferenceTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_SQL, NodeReferenceTable.TABLE, NodeReferenceTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -67,10 +67,11 @@ public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO, IPer } return null; } + @Override public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(NodeReferenceTable.COLUMN_ID, data.getDataString(0)); source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getDataInteger(0)); source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getDataInteger(1)); source.put(NodeReferenceTable.COLUMN_BEHIND_PEER, data.getDataString(1)); @@ -87,6 +88,7 @@ public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO, IPer entity.setParams(source.values().toArray(new Object[0])); return entity; } + @Override public H2SqlEntity prepareBatchUpdate(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); @@ -101,7 +103,7 @@ public class NodeReferenceH2DAO extends H2DAO implements INodeReferenceDAO, IPer source.put(NodeReferenceTable.COLUMN_ERROR, data.getDataInteger(7)); source.put(NodeReferenceTable.COLUMN_TIME_BUCKET, data.getDataLong(0)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(NodeReferenceTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(NodeReferenceTable.TABLE, source.keySet(), NodeReferenceTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java index 4ef411bed..82c0a1009 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java @@ -18,6 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.dao; +import java.util.HashMap; +import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.storage.define.DataDefine; import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; @@ -28,22 +30,21 @@ import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Map; - /** * @author peng-yongsheng, clevertension */ public class SegmentCostH2DAO extends H2DAO implements ISegmentCostDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(SegmentCostH2DAO.class); + @Override public Data get(String id, DataDefine dataDefine) { return null; } + @Override public H2SqlEntity prepareBatchInsert(Data data) { logger.debug("segment cost prepareBatchInsert, id: {}", data.getDataString(0)); H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(SegmentCostTable.COLUMN_ID, data.getDataString(0)); source.put(SegmentCostTable.COLUMN_SEGMENT_ID, data.getDataString(1)); source.put(SegmentCostTable.COLUMN_APPLICATION_ID, data.getDataInteger(0)); source.put(SegmentCostTable.COLUMN_SERVICE_NAME, data.getDataString(2)); @@ -59,6 +60,7 @@ public class SegmentCostH2DAO extends H2DAO implements ISegmentCostDAO, IPersist entity.setParams(source.values().toArray(new Object[0])); return entity; } + @Override public H2SqlEntity prepareBatchUpdate(Data data) { return null; } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java index 63701e0b0..51dc2d9dc 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java @@ -44,7 +44,7 @@ public class SegmentH2DAO extends H2DAO implements ISegmentDAO, IPersistenceDAO< @Override public H2SqlEntity prepareBatchInsert(Data data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put("id", data.getDataString(0)); + source.put(SegmentTable.COLUMN_ID, data.getDataString(0)); source.put(SegmentTable.COLUMN_DATA_BINARY, data.getDataBytes(0)); logger.debug("segment source: {}", source.toString()); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java index 973a6508f..dc9bf950b 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java @@ -45,7 +45,7 @@ public class ServiceEntryH2DAO extends H2DAO implements IServiceEntryDAO, IPersi @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SERVICE_ENTRY_SQL, ServiceEntryTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_SERVICE_ENTRY_SQL, ServiceEntryTable.TABLE, ServiceEntryTable.COLUMN_ID); Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { @@ -66,7 +66,7 @@ public class ServiceEntryH2DAO extends H2DAO implements IServiceEntryDAO, IPersi @Override public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(ServiceEntryTable.COLUMN_ID, data.getDataString(0)); source.put(ServiceEntryTable.COLUMN_APPLICATION_ID, data.getDataInteger(0)); source.put(ServiceEntryTable.COLUMN_ENTRY_SERVICE_ID, data.getDataInteger(1)); source.put(ServiceEntryTable.COLUMN_ENTRY_SERVICE_NAME, data.getDataString(1)); @@ -87,7 +87,7 @@ public class ServiceEntryH2DAO extends H2DAO implements IServiceEntryDAO, IPersi source.put(ServiceEntryTable.COLUMN_REGISTER_TIME, data.getDataLong(0)); source.put(ServiceEntryTable.COLUMN_NEWEST_TIME, data.getDataLong(1)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(ServiceEntryTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(ServiceEntryTable.TABLE, source.keySet(), ServiceEntryTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java index 7ed94247c..fecd14745 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; @@ -43,11 +42,12 @@ import org.slf4j.LoggerFactory; public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO, IPersistenceDAO { private final Logger logger = LoggerFactory.getLogger(ServiceReferenceH2DAO.class); private static final String GET_SQL = "select * from {0} where {1} = ?"; + @Override public Data get(String id, DataDefine dataDefine) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, ServiceReferenceTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_SQL, ServiceReferenceTable.TABLE, ServiceReferenceTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { Data data = dataDefine.build(id); @@ -77,7 +77,7 @@ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO public H2SqlEntity prepareBatchInsert(Data data) { H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); - source.put("id", data.getDataString(0)); + source.put(ServiceReferenceTable.COLUMN_ID, data.getDataString(0)); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, data.getDataInteger(0)); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, data.getDataString(1)); source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, data.getDataInteger(1)); @@ -119,7 +119,7 @@ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO source.put(ServiceReferenceTable.COLUMN_TIME_BUCKET, data.getDataLong(7)); String id = data.getDataString(0); - String sql = SqlBuilder.buildBatchUpdateSql(ServiceReferenceTable.TABLE, source.keySet(), "id"); + String sql = SqlBuilder.buildBatchUpdateSql(ServiceReferenceTable.TABLE, source.keySet(), ServiceReferenceTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(id); diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index e6d654a9d..443c2b85f 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -33,4 +33,8 @@ collector_inside: # cluster_transport_sniffer: true # cluster_nodes: localhost:9300 # index_shards_number: 2 -# index_replicas_number: 0 \ No newline at end of file +# index_replicas_number: 0 +storage: + h2: + url: jdbc:h2:tcp://localhost/~/test + user_name: sa \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/SqlBuilder.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/SqlBuilder.java index f3944030c..5d361537e 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/SqlBuilder.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/SqlBuilder.java @@ -23,21 +23,19 @@ import java.util.List; import java.util.Set; public class SqlBuilder { - public static final String buildSql(String sql, Object ... args) { + public static String buildSql(String sql, Object... args) { return MessageFormat.format(sql, args); } - public static final String buildSql(String sql, List args) { + public static String buildSql(String sql, List args) { MessageFormat messageFormat = new MessageFormat(sql); return messageFormat.format(args.toArray(new Object[0])); } - public static final String buildBatchInsertSql(String tableName, Set columnNames) { + public static String buildBatchInsertSql(String tableName, Set columnNames) { StringBuilder sb = new StringBuilder("insert into "); sb.append(tableName).append("("); - columnNames.forEach((columnName) -> { - sb.append(columnName).append(","); - }); + columnNames.forEach((columnName) -> sb.append(columnName).append(",")); sb.delete(sb.length() - 1, sb.length()); sb.append(") values("); for (int i = 0; i < columnNames.size(); i++) { @@ -48,12 +46,10 @@ public class SqlBuilder { return sb.toString(); } - public static final String buildBatchUpdateSql(String tableName, Set columnNames, String whereClauseName) { + public static String buildBatchUpdateSql(String tableName, Set columnNames, String whereClauseName) { StringBuilder sb = new StringBuilder("update "); sb.append(tableName).append(" set "); - columnNames.forEach((columnName) -> { - sb.append(columnName).append("=?,"); - }); + columnNames.forEach((columnName) -> sb.append(columnName).append("=?,")); sb.delete(sb.length() - 1, sb.length()); sb.append(" where ").append(whereClauseName).append("=?"); return sb.toString(); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java index 43fa78f56..100727168 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.ui.dao; +import com.google.gson.JsonArray; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; @@ -33,20 +33,18 @@ import org.skywalking.apm.collector.storage.h2.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.JsonArray; - /** * @author peng-yongsheng, clevertension */ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); private static final String GET_CPU_METRIC_SQL = "select * from {0} where {1} = ?"; - private static final String GET_CPU_METRICS_SQL = "select * from {0} where {1} in ("; + @Override public int getMetric(int instanceId, long timeBucket) { String id = timeBucket + Const.ID_SPLIT + instanceId; H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_CPU_METRIC_SQL, CpuMetricTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_CPU_METRIC_SQL, CpuMetricTable.TABLE, CpuMetricTable.COLUMN_ID); + Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { return rs.getInt(CpuMetricTable.COLUMN_USAGE_PERCENT); @@ -59,7 +57,7 @@ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO { @Override public JsonArray getMetric(int instanceId, long startTimeBucket, long endTimeBucket) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_CPU_METRICS_SQL, CpuMetricTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_CPU_METRIC_SQL, CpuMetricTable.TABLE, CpuMetricTable.COLUMN_ID); long timeBucket = startTimeBucket; List idList = new ArrayList<>(); @@ -70,24 +68,20 @@ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO { } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); - JsonArray metrics = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - double cpuUsed = rs.getDouble(CpuMetricTable.COLUMN_USAGE_PERCENT); - metrics.add((int)(cpuUsed * 100)); + idList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new String[] {id})) { + if (rs.next()) { + double cpuUsed = rs.getDouble(CpuMetricTable.COLUMN_USAGE_PERCENT); + metrics.add((int)(cpuUsed * 100)); + } else { + metrics.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + }); + return metrics; } } diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java index 5464f07a5..8a8fe0023 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java @@ -18,11 +18,12 @@ package org.skywalking.apm.collector.ui.dao; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; @@ -34,9 +35,6 @@ import org.skywalking.apm.network.proto.GCPhrase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - /** * @author peng-yongsheng, clevertension */ @@ -44,12 +42,13 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { private final Logger logger = LoggerFactory.getLogger(GCMetricH2DAO.class); private static final String GET_GC_COUNT_SQL = "select {1}, sum({0}) as cnt, {1} from {2} where {3} = ? and {4} in ("; private static final String GET_GC_METRIC_SQL = "select * from {0} where {1} = ?"; - private static final String GET_GC_METRICS_SQL = "select * from {0} where {1} in ("; + @Override public GCCount getGCCount(long[] timeBuckets, int instanceId) { GCCount gcCount = new GCCount(); H2Client client = getClient(); String sql = GET_GC_COUNT_SQL; StringBuilder builder = new StringBuilder(); + for (int i = 0; i < timeBuckets.length; i++) { builder.append("?,"); } @@ -57,7 +56,7 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { builder.append(")"); sql = sql + builder + " group by {1}"; sql = SqlBuilder.buildSql(sql, GCMetricTable.COLUMN_COUNT, GCMetricTable.COLUMN_PHRASE, - GCMetricTable.TABLE, GCMetricTable.COLUMN_INSTANCE_ID, "id"); + GCMetricTable.TABLE, GCMetricTable.COLUMN_INSTANCE_ID, GCMetricTable.COLUMN_ID); Object[] params = new Object[timeBuckets.length + 1]; for (int i = 0; i < timeBuckets.length; i++) { params[i + 1] = timeBuckets[i]; @@ -83,9 +82,9 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { @Override public JsonObject getMetric(int instanceId, long timeBucket) { JsonObject response = new JsonObject(); H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_GC_METRIC_SQL, GCMetricTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_GC_METRIC_SQL, GCMetricTable.TABLE, GCMetricTable.COLUMN_ID); String youngId = timeBucket + Const.ID_SPLIT + GCPhrase.NEW_VALUE + instanceId; - Object[] params = new Object[]{youngId}; + Object[] params = new Object[] {youngId}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { response.addProperty("ygc", rs.getInt(GCMetricTable.COLUMN_COUNT)); @@ -94,7 +93,7 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { logger.error(e.getMessage(), e); } String oldId = timeBucket + Const.ID_SPLIT + GCPhrase.OLD_VALUE + instanceId; - Object[] params1 = new Object[]{oldId}; + Object[] params1 = new Object[] {oldId}; try (ResultSet rs = client.executeQuery(sql, params1)) { if (rs.next()) { response.addProperty("ogc", rs.getInt(GCMetricTable.COLUMN_COUNT)); @@ -109,67 +108,47 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO { @Override public JsonObject getMetric(int instanceId, long startTimeBucket, long endTimeBucket) { JsonObject response = new JsonObject(); H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_GC_METRICS_SQL, GCMetricTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_GC_METRIC_SQL, GCMetricTable.TABLE, GCMetricTable.COLUMN_ID); long timeBucket = startTimeBucket; - List idList = new ArrayList<>(); + List youngIdsList = new ArrayList<>(); do { timeBucket = TimeBucketUtils.INSTANCE.addSecondForSecondTimeBucket(TimeBucketUtils.TimeBucketType.SECOND.name(), timeBucket, 1); String youngId = timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + GCPhrase.NEW_VALUE; - idList.add(youngId); + youngIdsList.add(youngId); } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); JsonArray youngArray = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - youngArray.add(rs.getInt(GCMetricTable.COLUMN_COUNT)); - } - if (youngArray.size() == 0) { - youngArray.add(0); - } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + forEachRs(client, youngIdsList, sql, youngArray); response.add("ygc", youngArray); - List idList1 = new ArrayList<>(); + + List oldIdsList = new ArrayList<>(); timeBucket = startTimeBucket; do { timeBucket = TimeBucketUtils.INSTANCE.addSecondForSecondTimeBucket(TimeBucketUtils.TimeBucketType.SECOND.name(), timeBucket, 1); String oldId = timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + GCPhrase.OLD_VALUE; - idList1.add(oldId); + oldIdsList.add(oldId); } while (timeBucket <= endTimeBucket); - String sql1 = SqlBuilder.buildSql(GET_GC_METRICS_SQL, GCMetricTable.TABLE, "id"); - StringBuilder builder1 = new StringBuilder(); - for (int i = 0; i < idList1.size(); i++) { - builder1.append("?,"); - } - builder1.delete(builder1.length() - 1, builder1.length()); - builder1.append(")"); - sql1 = sql1 + builder1; - Object[] params1 = idList.toArray(new String[0]); - JsonArray oldArray = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql1, params1)) { - while (rs.next()) { - oldArray.add(rs.getInt(GCMetricTable.COLUMN_COUNT)); - } - if (oldArray.size() == 0) { - oldArray.add(0); - } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + JsonArray oldArray = new JsonArray(); + forEachRs(client, oldIdsList, sql, oldArray); response.add("ogc", oldArray); return response; } + + private void forEachRs(H2Client client, List idsList, String sql, JsonArray metricArray) { + idsList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new String[] {id})) { + if (rs.next()) { + metricArray.add(rs.getInt(GCMetricTable.COLUMN_COUNT)); + } else { + metricArray.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); + } + }); + } } diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java index 6b277fe8f..28f8fa2a9 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.ui.dao; +import com.google.gson.JsonArray; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; @@ -33,8 +33,6 @@ import org.skywalking.apm.collector.storage.h2.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.JsonArray; - /** * @author peng-yongsheng, clevertension */ @@ -42,7 +40,7 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { private final Logger logger = LoggerFactory.getLogger(InstPerformanceH2DAO.class); private static final String GET_INST_PERF_SQL = "select * from {0} where {1} = ? and {2} in ("; private static final String GET_TPS_METRIC_SQL = "select * from {0} where {1} = ?"; - private static final String GET_TPS_METRICS_SQL = "select * from {0} where {1} in ("; + @Override public InstPerformance get(long[] timeBuckets, int instanceId) { H2Client client = getClient(); logger.info("the inst performance inst id = {}", instanceId); @@ -74,8 +72,8 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { @Override public int getTpsMetric(int instanceId, long timeBucket) { logger.info("getTpMetric instanceId = {}, startTimeBucket = {}", instanceId, timeBucket); H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, "id"); - Object[] params = new Object[]{instanceId}; + String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, InstPerformanceTable.COLUMN_ID); + Object[] params = new Object[] {instanceId}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { return rs.getInt(InstPerformanceTable.COLUMN_CALLS); @@ -89,7 +87,7 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { @Override public JsonArray getTpsMetric(int instanceId, long startTimeBucket, long endTimeBucket) { logger.info("getTpsMetric instanceId = {}, startTimeBucket = {}, endTimeBucket = {}", instanceId, startTimeBucket, endTimeBucket); H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_TPS_METRICS_SQL, InstPerformanceTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, InstPerformanceTable.COLUMN_ID); long timeBucket = startTimeBucket; List idList = new ArrayList<>(); @@ -100,31 +98,26 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); - JsonArray metrics = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - int calls = rs.getInt(InstPerformanceTable.COLUMN_CALLS); - metrics.add(calls); + idList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new Object[] {id})) { + if (rs.next()) { + int calls = rs.getInt(InstPerformanceTable.COLUMN_CALLS); + metrics.add(calls); + } else { + metrics.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + }); return metrics; } @Override public int getRespTimeMetric(int instanceId, long timeBucket) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, "id"); - Object[] params = new Object[]{instanceId}; + String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, InstPerformanceTable.COLUMN_ID); + Object[] params = new Object[] {instanceId}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { int callTimes = rs.getInt(InstPerformanceTable.COLUMN_CALLS); @@ -139,7 +132,7 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { @Override public JsonArray getRespTimeMetric(int instanceId, long startTimeBucket, long endTimeBucket) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_TPS_METRICS_SQL, InstPerformanceTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_TPS_METRIC_SQL, InstPerformanceTable.TABLE, InstPerformanceTable.COLUMN_ID); long timeBucket = startTimeBucket; List idList = new ArrayList<>(); @@ -150,25 +143,20 @@ public class InstPerformanceH2DAO extends H2DAO implements IInstPerformanceDAO { } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); - JsonArray metrics = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - int callTimes = rs.getInt(InstPerformanceTable.COLUMN_CALLS); - int costTotal = rs.getInt(InstPerformanceTable.COLUMN_COST_TOTAL); - metrics.add(costTotal / callTimes); + idList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new Object[] {id})) { + if (rs.next()) { + int callTimes = rs.getInt(InstPerformanceTable.COLUMN_CALLS); + int costTotal = rs.getInt(InstPerformanceTable.COLUMN_COST_TOTAL); + metrics.add(costTotal / callTimes); + } else { + metrics.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + }); return metrics; } } diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java index f51fbf0b8..7cfb79c30 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java @@ -44,7 +44,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { private static final String GET_INST_LAST_HEARTBEAT_TIME_SQL = "select {0} from {1} where {2} > ? and {3} = ? limit 1"; private static final String GET_INSTANCE_SQL = "select * from {0} where {1} = ?"; private static final String GET_INSTANCES_SQL = "select * from {0} where {1} = ? and {2} >= ?"; - private static final String GET_APPLICATIONS_SQL = "select {3}, count({0}) as cnt from {1} where {2} >= ? and {2} <= ? group by {3} limit 100"; + private static final String GET_APPLICATIONS_SQL = "select {3}, count({0}) as cnt from {1} where {2} >= ? group by {3} limit 100"; @Override public Long lastHeartBeatTime() { @@ -87,7 +87,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO { JsonArray applications = new JsonArray(); String sql = SqlBuilder.buildSql(GET_APPLICATIONS_SQL, InstanceTable.COLUMN_INSTANCE_ID, InstanceTable.TABLE, InstanceTable.COLUMN_HEARTBEAT_TIME, InstanceTable.COLUMN_APPLICATION_ID); - Object[] params = new Object[] {startTime, endTime}; + Object[] params = new Object[] {startTime}; try (ResultSet rs = client.executeQuery(sql, params)) { while (rs.next()) { Integer applicationId = rs.getInt(InstanceTable.COLUMN_APPLICATION_ID); diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java index 70b5dc971..0b45f0153 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java @@ -18,11 +18,12 @@ package org.skywalking.apm.collector.ui.dao; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; @@ -33,21 +34,18 @@ import org.skywalking.apm.collector.storage.h2.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - /** * @author clevertension */ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); private static final String GET_MEMORY_METRIC_SQL = "select * from {0} where {1} =?"; - private static final String GET_MEMORY_METRICS_SQL = "select * from {0} where {1} in ("; + @Override public JsonObject getMetric(int instanceId, long timeBucket, boolean isHeap) { H2Client client = getClient(); String id = timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + isHeap; - String sql = SqlBuilder.buildSql(GET_MEMORY_METRIC_SQL, MemoryMetricTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_MEMORY_METRIC_SQL, MemoryMetricTable.TABLE, MemoryMetricTable.COLUMN_ID); + Object[] params = new Object[] {id}; JsonObject metric = new JsonObject(); try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { @@ -67,7 +65,7 @@ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO { @Override public JsonObject getMetric(int instanceId, long startTimeBucket, long endTimeBucket, boolean isHeap) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_MEMORY_METRICS_SQL, MemoryMetricTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_MEMORY_METRIC_SQL, MemoryMetricTable.TABLE, MemoryMetricTable.COLUMN_ID); List idList = new ArrayList<>(); long timeBucket = startTimeBucket; do { @@ -77,30 +75,24 @@ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO { } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); JsonObject metric = new JsonObject(); JsonArray usedMetric = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - metric.addProperty("max", rs.getLong(MemoryMetricTable.COLUMN_MAX)); - metric.addProperty("init", rs.getLong(MemoryMetricTable.COLUMN_INIT)); - usedMetric.add(rs.getLong(MemoryMetricTable.COLUMN_USED)); + + idList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new String[] {id})) { + if (rs.next()) { + metric.addProperty("max", rs.getLong(MemoryMetricTable.COLUMN_MAX)); + metric.addProperty("init", rs.getLong(MemoryMetricTable.COLUMN_INIT)); + usedMetric.add(rs.getLong(MemoryMetricTable.COLUMN_USED)); + } else { + metric.addProperty("max", 0); + metric.addProperty("init", 0); + usedMetric.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); } - if (usedMetric.size() == 0) { - metric.addProperty("max", 0); - metric.addProperty("init",0); - usedMetric.add(0); - } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + }); metric.add("used", usedMetric); return metric; diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java index 2d567f91e..b759c2c3b 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java @@ -18,11 +18,12 @@ package org.skywalking.apm.collector.ui.dao; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; - import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; @@ -33,21 +34,18 @@ import org.skywalking.apm.collector.storage.h2.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - /** * @author clevertension */ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO { private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class); - private static final String GET_MEMORY_POOL_METRIC_SQL = "select * from {0} where {1} =?"; - private static final String GET_MEMORY_POOL_METRICS_SQL = "select * from {0} where {1} in ("; + private static final String GET_MEMORY_POOL_METRIC_SQL = "select * from {0} where {1} = ?"; + @Override public JsonObject getMetric(int instanceId, long timeBucket, int poolType) { H2Client client = getClient(); String id = timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + poolType; - String sql = SqlBuilder.buildSql(GET_MEMORY_POOL_METRIC_SQL, MemoryPoolMetricTable.TABLE, "id"); - Object[] params = new Object[]{id}; + String sql = SqlBuilder.buildSql(GET_MEMORY_POOL_METRIC_SQL, MemoryPoolMetricTable.TABLE, MemoryPoolMetricTable.COLUMN_ID); + Object[] params = new Object[] {id}; JsonObject metric = new JsonObject(); try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { @@ -67,7 +65,7 @@ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO @Override public JsonObject getMetric(int instanceId, long startTimeBucket, long endTimeBucket, int poolType) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_MEMORY_POOL_METRICS_SQL, MemoryPoolMetricTable.TABLE, "id"); + String sql = SqlBuilder.buildSql(GET_MEMORY_POOL_METRIC_SQL, MemoryPoolMetricTable.TABLE, MemoryPoolMetricTable.COLUMN_ID); List idList = new ArrayList<>(); long timeBucket = startTimeBucket; do { @@ -77,30 +75,24 @@ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO } while (timeBucket <= endTimeBucket); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < idList.size(); i++) { - builder.append("?,"); - } - builder.delete(builder.length() - 1, builder.length()); - builder.append(")"); - sql = sql + builder; - Object[] params = idList.toArray(new String[0]); JsonObject metric = new JsonObject(); JsonArray usedMetric = new JsonArray(); - try (ResultSet rs = client.executeQuery(sql, params)) { - while (rs.next()) { - metric.addProperty("max", rs.getLong(MemoryPoolMetricTable.COLUMN_MAX)); - metric.addProperty("init", rs.getLong(MemoryPoolMetricTable.COLUMN_INIT)); - usedMetric.add(rs.getLong(MemoryPoolMetricTable.COLUMN_USED)); + + idList.forEach(id -> { + try (ResultSet rs = client.executeQuery(sql, new String[] {id})) { + if (rs.next()) { + metric.addProperty("max", rs.getLong(MemoryPoolMetricTable.COLUMN_MAX)); + metric.addProperty("init", rs.getLong(MemoryPoolMetricTable.COLUMN_INIT)); + usedMetric.add(rs.getLong(MemoryPoolMetricTable.COLUMN_USED)); + } else { + metric.addProperty("max", 0); + metric.addProperty("init", 0); + usedMetric.add(0); + } + } catch (SQLException | H2ClientException e) { + logger.error(e.getMessage(), e); } - if (usedMetric.size() == 0) { - metric.addProperty("max", 0); - metric.addProperty("init",0); - usedMetric.add(0); - } - } catch (SQLException | H2ClientException e) { - logger.error(e.getMessage(), e); - } + }); metric.add("used", usedMetric); return metric; diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java index 29d019d83..d37e581c2 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java @@ -40,7 +40,7 @@ public class SegmentH2DAO extends H2DAO implements ISegmentDAO { @Override public TraceSegmentObject load(String segmentId) { H2Client client = getClient(); String sql = SqlBuilder.buildSql(GET_SEGMENT_SQL, SegmentTable.COLUMN_DATA_BINARY, - SegmentTable.TABLE, "id"); + SegmentTable.TABLE, SegmentTable.COLUMN_ID); Object[] params = new Object[] {segmentId}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { From 9ac7d9e800f19a6ce6c88c18b1309e937582de0e Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 15:12:28 +0800 Subject: [PATCH 04/10] no message --- .../apm-collector-boot/src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 443c2b85f..8a4f7b3b6 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -34,7 +34,7 @@ collector_inside: # cluster_nodes: localhost:9300 # index_shards_number: 2 # index_replicas_number: 0 -storage: - h2: - url: jdbc:h2:tcp://localhost/~/test - user_name: sa \ No newline at end of file +#storage: +# h2: +# url: jdbc:h2:tcp://localhost/~/test +# user_name: sa \ No newline at end of file From 56e05528bbb47de0793d0453c47eb67cc20c8fea Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 17:02:38 +0800 Subject: [PATCH 05/10] move set value outside of else condition. --- .../standardization/ReferenceDecorator.java | 18 ++++++------------ .../segment/standardization/SpanDecorator.java | 12 ++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java index 0d9ab2beb..233a13438 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java @@ -69,9 +69,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setEntryServiceId(int value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setEntryServiceId(value); } + referenceBuilder.setEntryServiceId(value); } public String getEntryServiceName() { @@ -85,9 +84,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setEntryServiceName(String value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setEntryServiceName(value); } + referenceBuilder.setEntryServiceName(value); } public int getEntryApplicationInstanceId() { @@ -117,9 +115,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setParentServiceId(int value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setParentServiceId(value); } + referenceBuilder.setParentServiceId(value); } public int getParentSpanId() { @@ -141,9 +138,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setParentServiceName(String value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setParentServiceName(value); } + referenceBuilder.setParentServiceName(value); } public UniqueId getParentTraceSegmentId() { @@ -165,9 +161,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setNetworkAddressId(int value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setNetworkAddressId(value); } + referenceBuilder.setNetworkAddressId(value); } public String getNetworkAddress() { @@ -181,9 +176,8 @@ public class ReferenceDecorator implements StandardBuilder { public void setNetworkAddress(String value) { if (isOrigin) { toBuilder(); - } else { - referenceBuilder.setNetworkAddress(value); } + referenceBuilder.setNetworkAddress(value); } @Override public void toBuilder() { diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java index 46d47fb39..caeeb146d 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java @@ -133,9 +133,8 @@ public class SpanDecorator implements StandardBuilder { public void setPeerId(int peerId) { if (isOrigin) { toBuilder(); - } else { - spanBuilder.setPeerId(peerId); } + spanBuilder.setPeerId(peerId); } public String getPeer() { @@ -149,9 +148,8 @@ public class SpanDecorator implements StandardBuilder { public void setPeer(String peer) { if (isOrigin) { toBuilder(); - } else { - spanBuilder.setPeer(peer); } + spanBuilder.setPeer(peer); } public int getOperationNameId() { @@ -165,9 +163,8 @@ public class SpanDecorator implements StandardBuilder { public void setOperationNameId(int value) { if (isOrigin) { toBuilder(); - } else { - spanBuilder.setOperationNameId(value); } + spanBuilder.setOperationNameId(value); } public String getOperationName() { @@ -181,9 +178,8 @@ public class SpanDecorator implements StandardBuilder { public void setOperationName(String value) { if (isOrigin) { toBuilder(); - } else { - spanBuilder.setOperationName(value); } + spanBuilder.setOperationName(value); } public boolean getIsError() { From a6924e386cc2dc860291c5e0e2c48469ff3707e2 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 22:27:19 +0800 Subject: [PATCH 06/10] A mistake that reset the builder when id exchanged by the to builder method. --- .../standardization/ReferenceDecorator.java | 8 +++++--- .../standardization/SegmentDecorator.java | 2 +- .../segment/standardization/SpanDecorator.java | 8 +++++--- .../collector/agentstream/mock/SegmentPost.java | 16 ++++++++-------- .../src/main/resources/application.yml | 8 ++++---- .../collector/storage/h2/dao/BatchH2DAO.java | 17 ++++++++--------- .../collector/ui/dao/ServiceReferenceH2DAO.java | 2 +- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java index 233a13438..4c9f1db72 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java @@ -181,8 +181,10 @@ public class ReferenceDecorator implements StandardBuilder { } @Override public void toBuilder() { - this.isOrigin = false; - referenceBuilder = referenceObject.toBuilder(); - standardBuilder.toBuilder(); + if (this.isOrigin) { + this.isOrigin = false; + referenceBuilder = referenceObject.toBuilder(); + standardBuilder.toBuilder(); + } } } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java index 4a6168b63..2e0bf92c1 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java @@ -78,7 +78,7 @@ public class SegmentDecorator implements StandardBuilder { } @Override public void toBuilder() { - if (!isOrigin) { + if (isOrigin) { this.isOrigin = false; this.segmentBuilder = segmentObject.toBuilder(); } diff --git a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java index caeeb146d..e4373ae36 100644 --- a/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java +++ b/apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java @@ -191,8 +191,10 @@ public class SpanDecorator implements StandardBuilder { } @Override public void toBuilder() { - this.isOrigin = false; - spanBuilder = spanObject.toBuilder(); - standardBuilder.toBuilder(); + if (this.isOrigin) { + this.isOrigin = false; + spanBuilder = spanObject.toBuilder(); + standardBuilder.toBuilder(); + } } } diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java index 28af86e74..b44141f68 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java @@ -77,14 +77,14 @@ public class SegmentPost { IServiceNameDAO serviceNameDAO = (IServiceNameDAO)DAOContainer.INSTANCE.get(IServiceNameDAO.class.getName()); - ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1); - serviceNameDAO.save(serviceName1); - ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2); - serviceNameDAO.save(serviceName2); - ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3); - serviceNameDAO.save(serviceName3); - ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4); - serviceNameDAO.save(serviceName4); +// ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1); +// serviceNameDAO.save(serviceName1); +// ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2); +// serviceNameDAO.save(serviceName2); +// ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3); +// serviceNameDAO.save(serviceName3); +// ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4); +// serviceNameDAO.save(serviceName4); while (true) { JsonElement consumer = JsonFileReader.INSTANCE.read("json/segment/normal/dubbox-consumer.json"); diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 8a4f7b3b6..443c2b85f 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -34,7 +34,7 @@ collector_inside: # cluster_nodes: localhost:9300 # index_shards_number: 2 # index_replicas_number: 0 -#storage: -# h2: -# url: jdbc:h2:tcp://localhost/~/test -# user_name: sa \ No newline at end of file +storage: + h2: + url: jdbc:h2:tcp://localhost/~/test + user_name: sa \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java index fcf55c4df..4175f47bb 100644 --- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java +++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java @@ -18,18 +18,17 @@ package org.skywalking.apm.collector.storage.h2.dao; -import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.skywalking.apm.collector.client.h2.H2ClientException; +import org.skywalking.apm.collector.storage.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author peng-yongsheng @@ -41,7 +40,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO { public void batchPersistence(List batchCollection) { if (batchCollection != null && batchCollection.size() > 0) { logger.debug("the batch collection size is {}", batchCollection.size()); - Connection conn = null; + Connection conn; final Map batchSqls = new HashMap<>(); try { conn = getClient().getConnection(); @@ -59,7 +58,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO { Object[] params = e.getParams(); if (params != null) { - logger.debug("the sql is {}, params size is {}", e.getSql(), params.length); + logger.debug("the sql is {}, params size is {}, params: {}", e.getSql(), params.length, params); for (int i = 0; i < params.length; i++) { ps.setObject(i + 1, params[i]); } @@ -79,7 +78,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO { private H2SqlEntity getH2SqlEntity(Object entity) { if (entity instanceof H2SqlEntity) { - return (H2SqlEntity) entity; + return (H2SqlEntity)entity; } return null; } diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java index 090005967..543ccce9c 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java @@ -60,7 +60,7 @@ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO Map serviceReferenceMap = new LinkedHashMap<>(); try (ResultSet rs = client.executeQuery(sql, params)) { - if (rs.next()) { + while (rs.next()) { int frontServiceId = rs.getInt(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID); parseSubAggregate(serviceReferenceMap, rs, frontServiceId); } From 1331cfb36336eb4f7954c850b4d756439495ae9a Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 22:28:47 +0800 Subject: [PATCH 07/10] Reset the config. --- .../apm-collector-boot/src/main/resources/application.yml | 8 ++++---- .../apm-collector-boot/src/main/resources/log4j2.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 443c2b85f..8a4f7b3b6 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -34,7 +34,7 @@ collector_inside: # cluster_nodes: localhost:9300 # index_shards_number: 2 # index_replicas_number: 0 -storage: - h2: - url: jdbc:h2:tcp://localhost/~/test - user_name: sa \ No newline at end of file +#storage: +# h2: +# url: jdbc:h2:tcp://localhost/~/test +# user_name: sa \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml index a79b45677..a76ab8c13 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml +++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml @@ -17,7 +17,7 @@ ~ Project repository: https://github.com/OpenSkywalking/skywalking --> - + @@ -28,7 +28,7 @@ - + From 72c3faa624212302f347f8d27b4a7cdbdd5b3035 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 22:58:23 +0800 Subject: [PATCH 08/10] Fix unused import error --- .../collector/agentstream/mock/SegmentPost.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java index b44141f68..28af86e74 100644 --- a/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java +++ b/apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java @@ -77,14 +77,14 @@ public class SegmentPost { IServiceNameDAO serviceNameDAO = (IServiceNameDAO)DAOContainer.INSTANCE.get(IServiceNameDAO.class.getName()); -// ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1); -// serviceNameDAO.save(serviceName1); -// ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2); -// serviceNameDAO.save(serviceName2); -// ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3); -// serviceNameDAO.save(serviceName3); -// ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4); -// serviceNameDAO.save(serviceName4); + ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1); + serviceNameDAO.save(serviceName1); + ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2); + serviceNameDAO.save(serviceName2); + ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3); + serviceNameDAO.save(serviceName3); + ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4); + serviceNameDAO.save(serviceName4); while (true) { JsonElement consumer = JsonFileReader.INSTANCE.read("json/segment/normal/dubbox-consumer.json"); From f141efdda982cc2bdd654268193af3d939ab2274 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 23:01:06 +0800 Subject: [PATCH 09/10] delete the compile plugin in sharing jdbc agent plugin pom file. --- .../apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml index 4e63ec2e6..d8d571b87 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml @@ -72,15 +72,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - From 12c3c4ef692488acc03b585c0daff23f2afcf57f Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 24 Oct 2017 23:54:08 +0800 Subject: [PATCH 10/10] Plugin test must compile with jdk 1.6, so not allow to use lambda. --- .../apm/plugin/sjdbc/InterceptorTest.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/skywalking/apm/plugin/sjdbc/InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/skywalking/apm/plugin/sjdbc/InterceptorTest.java index 925174676..f7219d088 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/skywalking/apm/plugin/sjdbc/InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/skywalking/apm/plugin/sjdbc/InterceptorTest.java @@ -26,7 +26,7 @@ import com.dangdang.ddframe.rdb.sharding.executor.threadlocal.ExecutorDataMap; import com.dangdang.ddframe.rdb.sharding.util.EventBusInstance; import com.google.common.base.Optional; import java.sql.SQLException; -import java.util.Arrays; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -65,40 +65,40 @@ import static org.skywalking.apm.agent.test.tools.SpanAssert.assertTag; @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class InterceptorTest { - + private static ExecutorService ES; - + @SegmentStoragePoint private SegmentStorage segmentStorage; @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - + private ExecuteInterceptor executeInterceptor; - + private AsyncExecuteInterceptor asyncExecuteInterceptor; private Object[] allArguments; - + @BeforeClass public static void init() { ExecuteEventListener.init(); new ExecutorEngineConstructorInterceptor().onConstruct(null, null); ES = Executors.newSingleThreadExecutor(); } - + @AfterClass public static void finish() { ES.shutdown(); } - + @Before public void setUp() throws SQLException { executeInterceptor = new ExecuteInterceptor(); asyncExecuteInterceptor = new AsyncExecuteInterceptor(); - allArguments = new Object[]{SQLType.DQL, null}; + allArguments = new Object[] {SQLType.DQL, null}; } - + @Test public void assertSyncExecute() throws Throwable { executeInterceptor.beforeMethod(null, null, allArguments, null, null); @@ -106,7 +106,7 @@ public class InterceptorTest { executeInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); TraceSegment segment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(segment); + List spans = SegmentHelper.getSpans(segment); assertNotNull(spans); assertThat(spans.size(), is(2)); assertSpan(spans.get(0), 0); @@ -118,9 +118,11 @@ public class InterceptorTest { executeInterceptor.beforeMethod(null, null, allArguments, null, null); asyncExecuteInterceptor.beforeMethod(null, null, null, null, null); final Map dataMap = ExecutorDataMap.getDataMap(); - ES.submit(() -> { - ExecutorDataMap.setDataMap(dataMap); - sendEvent("ds_1", "select * from t_order_1"); + ES.submit(new Runnable() { + @Override public void run() { + ExecutorDataMap.setDataMap(dataMap); + sendEvent("ds_1", "select * from t_order_1"); + } }).get(); asyncExecuteInterceptor.afterMethod(null, null, null, null, null); sendEvent("ds_0", "select * from t_order_0"); @@ -140,15 +142,17 @@ public class InterceptorTest { assertSpan(spans1.get(0), 0); assertThat(spans1.get(1).getOperationName(), is("/SJDBC/TRUNK/DQL")); } - + @Test public void assertExecuteError() throws Throwable { executeInterceptor.beforeMethod(null, null, allArguments, null, null); asyncExecuteInterceptor.beforeMethod(null, null, null, null, null); final Map dataMap = ExecutorDataMap.getDataMap(); - ES.submit(() -> { - ExecutorDataMap.setDataMap(dataMap); - sendError(); + ES.submit(new Runnable() { + @Override public void run() { + ExecutorDataMap.setDataMap(dataMap); + sendError(); + } }).get(); asyncExecuteInterceptor.handleMethodException(null, null, null, null, new SQLException("test")); asyncExecuteInterceptor.afterMethod(null, null, null, null, null); @@ -178,18 +182,22 @@ public class InterceptorTest { assertThat(span.isExit(), is(true)); assertThat(span.getOperationName(), is("/SJDBC/BRANCH/QUERY")); } - + private void assertErrorSpan(AbstractTracingSpan span) { assertOccurException(span, true); } - + private void sendEvent(String datasource, String sql) { - DQLExecutionEvent event = new DQLExecutionEvent(datasource, sql, Arrays.asList("1", 100)); + List parameters = new ArrayList(); + parameters.add("1"); + parameters.add(100); + + DQLExecutionEvent event = new DQLExecutionEvent(datasource, sql, parameters); EventBusInstance.getInstance().post(event); event.setEventExecutionType(EventExecutionType.EXECUTE_SUCCESS); EventBusInstance.getInstance().post(event); } - + private void sendError() { DMLExecutionEvent event = new DMLExecutionEvent("", "", Collections.emptyList()); EventBusInstance.getInstance().post(event);