From 0f871bd6ce68f96c6d1614a1eb281b030c3d6209 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Tue, 19 Dec 2017 19:06:48 +0800 Subject: [PATCH] Compile success. --- .../agent-grpc/agent-grpc-provider/pom.xml | 10 ++++++++ .../ApplicationRegisterServiceHandler.java | 7 +++--- .../InstanceDiscoveryServiceHandler.java | 7 +++--- .../handler/JVMMetricsServiceHandler.java | 23 +++++++++---------- .../ServiceNameDiscoveryServiceHandler.java | 7 +++--- .../naming/AgentGRPCNamingListener.java | 3 +-- .../agent-jetty/agent-jetty-provider/pom.xml | 10 ++++++++ .../ApplicationRegisterServletHandler.java | 7 +++--- .../InstanceDiscoveryServletHandler.java | 7 +++--- .../ServiceNameDiscoveryServiceHandler.java | 7 +++--- .../handler/TraceSegmentServletHandler.java | 11 ++++----- .../naming/AgentJettyNamingListener.java | 3 +-- .../analysis-alarm/alarm-provider/pom.xml | 10 ++++++++ .../worker/AlertingListAggregationWorker.java | 3 +-- .../worker/AlertingListPersistenceWorker.java | 12 ++++------ .../standardization/ReferenceIdExchanger.java | 6 ++--- .../standardization/SpanIdExchanger.java | 6 ++--- .../collector/boot/CollectorBootStartUp.java | 14 +---------- .../collector/core/graph/GraphManager.java | 6 ++++- .../core/graph/GraphManagerTest.java | 5 ++-- .../src/main/proto/RemoteCommonService.proto | 1 - 21 files changed, 86 insertions(+), 79 deletions(-) diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml index a4fe82e07a..2d9a3f83df 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml @@ -55,5 +55,15 @@ segment-parser-define ${project.version} + + org.apache.skywalking + jvm-define + ${project.version} + + + org.apache.skywalking + register-define + ${project.version} + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java index efb139ee89..286e19c8bf 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java @@ -16,13 +16,12 @@ * */ - package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import com.google.protobuf.ProtocolStringList; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; import org.apache.skywalking.apm.network.proto.Application; @@ -42,7 +41,7 @@ public class ApplicationRegisterServiceHandler extends ApplicationRegisterServic private final IApplicationIDService applicationIDService; public ApplicationRegisterServiceHandler(ModuleManager moduleManager) { - applicationIDService = moduleManager.find(AgentStreamModule.NAME).getService(IApplicationIDService.class); + applicationIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IApplicationIDService.class); } @Override public void register(Application request, StreamObserver responseObserver) { diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java index 5ff4a26024..38f174ef32 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java @@ -16,14 +16,13 @@ * */ - package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; @@ -46,7 +45,7 @@ public class InstanceDiscoveryServiceHandler extends InstanceDiscoveryServiceGrp private final IInstanceIDService instanceIDService; public InstanceDiscoveryServiceHandler(ModuleManager moduleManager) { - this.instanceIDService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceIDService.class); + this.instanceIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IInstanceIDService.class); } @Override diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java index 079a5c9c56..b192a6c0bd 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java @@ -16,17 +16,16 @@ * */ - package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import io.grpc.stub.StreamObserver; import java.util.List; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.jvm.IGCMetricService; -import org.apache.skywalking.apm.collector.agent.stream.service.jvm.IInstanceHeartBeatService; -import org.apache.skywalking.apm.collector.agent.stream.service.jvm.IMemoryMetricService; -import org.apache.skywalking.apm.collector.agent.stream.service.jvm.IMemoryPoolMetricService; -import org.apache.skywalking.apm.collector.agent.stream.service.jvm.ICpuMetricService; +import org.apache.skywalking.apm.collector.analysis.jvm.define.AnalysisJVMModule; +import org.apache.skywalking.apm.collector.analysis.jvm.define.service.ICpuMetricService; +import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IGCMetricService; +import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IInstanceHeartBeatService; +import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IMemoryMetricService; +import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IMemoryPoolMetricService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; @@ -54,11 +53,11 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe private final IInstanceHeartBeatService instanceHeartBeatService; public JVMMetricsServiceHandler(ModuleManager moduleManager) { - this.cpuMetricService = moduleManager.find(AgentStreamModule.NAME).getService(ICpuMetricService.class); - this.gcMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IGCMetricService.class); - this.memoryMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IMemoryMetricService.class); - this.memoryPoolMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IMemoryPoolMetricService.class); - this.instanceHeartBeatService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceHeartBeatService.class); + this.cpuMetricService = moduleManager.find(AnalysisJVMModule.NAME).getService(ICpuMetricService.class); + this.gcMetricService = moduleManager.find(AnalysisJVMModule.NAME).getService(IGCMetricService.class); + this.memoryMetricService = moduleManager.find(AnalysisJVMModule.NAME).getService(IMemoryMetricService.class); + this.memoryPoolMetricService = moduleManager.find(AnalysisJVMModule.NAME).getService(IMemoryPoolMetricService.class); + this.instanceHeartBeatService = moduleManager.find(AnalysisJVMModule.NAME).getService(IInstanceHeartBeatService.class); } @Override public void collect(JVMMetrics request, StreamObserver responseObserver) { diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java index 7cf381f60e..ee7cab7e67 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java @@ -16,14 +16,13 @@ * */ - package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import io.grpc.stub.StreamObserver; import java.util.List; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IServiceNameService; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; import org.apache.skywalking.apm.network.proto.ServiceNameCollection; import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc; @@ -43,7 +42,7 @@ public class ServiceNameDiscoveryServiceHandler extends ServiceNameDiscoveryServ private final IServiceNameService serviceNameService; public ServiceNameDiscoveryServiceHandler(ModuleManager moduleManager) { - this.serviceNameService = moduleManager.find(AgentStreamModule.NAME).getService(IServiceNameService.class); + this.serviceNameService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IServiceNameService.class); } @Override public void discovery(ServiceNameCollection request, diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java index 4125895229..c6e2310320 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java @@ -16,10 +16,9 @@ * */ - package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming; -import org.apache.skywalking.apm.collector.agent.grpc.AgentGRPCModule; +import org.apache.skywalking.apm.collector.agent.grpc.define.AgentGRPCModule; import org.apache.skywalking.apm.collector.agent.grpc.provider.AgentModuleGRPCProvider; import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml index 058fc884d2..3de56cd05a 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml @@ -51,5 +51,15 @@ collector-jetty-manager-define ${project.version} + + org.apache.skywalking + register-define + ${project.version} + + + org.apache.skywalking + segment-parser-define + ${project.version} + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java index 31cb368b28..77296190e8 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.agent.jetty.provider.handler; import com.google.gson.Gson; @@ -25,8 +24,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.apache.skywalking.apm.collector.server.jetty.JettyHandler; @@ -46,7 +45,7 @@ public class ApplicationRegisterServletHandler extends JettyHandler { private static final String APPLICATION_ID = "i"; public ApplicationRegisterServletHandler(ModuleManager moduleManager) { - this.applicationIDService = moduleManager.find(AgentStreamModule.NAME).getService(IApplicationIDService.class); + this.applicationIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IApplicationIDService.class); } @Override public String pathSpec() { diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java index 8839e97c22..feac021020 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.agent.jetty.provider.handler; import com.google.gson.Gson; @@ -24,8 +23,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.apache.skywalking.apm.collector.server.jetty.JettyHandler; @@ -49,7 +48,7 @@ public class InstanceDiscoveryServletHandler extends JettyHandler { private static final String OS_INFO = "oi"; public InstanceDiscoveryServletHandler(ModuleManager moduleManager) { - this.instanceIDService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceIDService.class); + this.instanceIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IInstanceIDService.class); } @Override public String pathSpec() { diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java index b395682a7c..15cc4c0659 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.agent.jetty.provider.handler; import com.google.gson.Gson; @@ -25,8 +24,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.register.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.apache.skywalking.apm.collector.server.jetty.JettyHandler; @@ -49,7 +48,7 @@ public class ServiceNameDiscoveryServiceHandler extends JettyHandler { private static final String ELEMENT = "el"; public ServiceNameDiscoveryServiceHandler(ModuleManager moduleManager) { - this.serviceNameService = moduleManager.find(AgentStreamModule.NAME).getService(IServiceNameService.class); + this.serviceNameService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IServiceNameService.class); } @Override public String pathSpec() { diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java index 495f5bfd54..11b1d235d4 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.agent.jetty.provider.handler; import com.google.gson.JsonElement; @@ -26,8 +25,8 @@ import java.io.IOException; import javax.servlet.http.HttpServletRequest; import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegment; import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegmentJsonReader; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; -import org.apache.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService; +import org.apache.skywalking.apm.collector.analysis.segment.parser.define.AnalysisSegmentParserModule; +import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.apache.skywalking.apm.collector.server.jetty.JettyHandler; @@ -41,10 +40,10 @@ public class TraceSegmentServletHandler extends JettyHandler { private final Logger logger = LoggerFactory.getLogger(TraceSegmentServletHandler.class); - private final ITraceSegmentService traceSegmentService; + private final ISegmentParseService segmentParseService; public TraceSegmentServletHandler(ModuleManager moduleManager) { - this.traceSegmentService = moduleManager.find(AgentStreamModule.NAME).getService(ITraceSegmentService.class); + this.segmentParseService = moduleManager.find(AnalysisSegmentParserModule.NAME).getService(ISegmentParseService.class); } @Override public String pathSpec() { @@ -74,7 +73,7 @@ public class TraceSegmentServletHandler extends JettyHandler { reader.beginArray(); while (reader.hasNext()) { TraceSegment traceSegment = jsonReader.read(reader); - traceSegmentService.send(traceSegment.getUpstreamSegment()); + segmentParseService.parse(traceSegment.getUpstreamSegment(), ISegmentParseService.Source.Agent); } reader.endArray(); } diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java index ada3f16e3f..863569045c 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java @@ -16,10 +16,9 @@ * */ - package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming; -import org.apache.skywalking.apm.collector.agent.jetty.AgentJettyModule; +import org.apache.skywalking.apm.collector.agent.jetty.define.AgentJettyModule; import org.apache.skywalking.apm.collector.agent.jetty.provider.AgentModuleJettyProvider; import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener; diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml index 887faf325d..6ba73c2178 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml @@ -36,5 +36,15 @@ alarm-define ${project.version} + + org.apache.skywalking + collector-storage-define + ${project.version} + + + org.apache.skywalking + analysis-worker-model + ${project.version} + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java index 7d5fd8b84c..6e0f4e602a 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java @@ -16,13 +16,12 @@ * */ - package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker; import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.table.alerting.AlertingList; -import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java index 886b121297..0546a497d8 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java @@ -16,17 +16,15 @@ * */ - package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker; -import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; +import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; import org.apache.skywalking.apm.collector.storage.StorageModule; +import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.apache.skywalking.apm.collector.storage.dao.IAlertingListPersistenceDAO; import org.apache.skywalking.apm.collector.storage.table.alerting.AlertingList; -import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; /** * @author peng-yongsheng @@ -51,8 +49,8 @@ public class AlertingListPersistenceWorker extends PersistenceWorker { - public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) { - super(moduleManager, queueCreatorService); + public Factory(ModuleManager moduleManager) { + super(moduleManager); } @Override public AlertingListPersistenceWorker workerInstance(ModuleManager moduleManager) { diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java index d136d1c9ec..1dd97b4e90 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java @@ -18,7 +18,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator; @@ -50,8 +50,8 @@ public class ReferenceIdExchanger implements IdExchanger { } private ReferenceIdExchanger(ModuleManager moduleManager) { - applicationIDService = moduleManager.find(AnalysisLayerRegisterModule.NAME).getService(IApplicationIDService.class); - serviceNameService = moduleManager.find(AnalysisLayerRegisterModule.NAME).getService(IServiceNameService.class); + applicationIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IApplicationIDService.class); + serviceNameService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IServiceNameService.class); instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class); } diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java index ddffaccbe8..44a7ebe20a 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java @@ -18,7 +18,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator; @@ -47,8 +47,8 @@ public class SpanIdExchanger implements IdExchanger { } private SpanIdExchanger(ModuleManager moduleManager) { - applicationIDService = moduleManager.find(AnalysisLayerRegisterModule.NAME).getService(IApplicationIDService.class); - serviceNameService = moduleManager.find(AnalysisLayerRegisterModule.NAME).getService(IServiceNameService.class); + applicationIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IApplicationIDService.class); + serviceNameService = moduleManager.find(AnalysisRegisterModule.NAME).getService(IServiceNameService.class); } @Override public boolean exchange(SpanDecorator standardBuilder, int applicationId) { diff --git a/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/CollectorBootStartUp.java b/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/CollectorBootStartUp.java index 9fa9506b62..007e55b2cc 100644 --- a/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/CollectorBootStartUp.java +++ b/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/CollectorBootStartUp.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.boot; import org.apache.skywalking.apm.collector.boot.config.ApplicationConfigLoader; @@ -42,19 +41,8 @@ public class CollectorBootStartUp { try { ApplicationConfiguration applicationConfiguration = configLoader.load(); manager.init(applicationConfiguration); - } catch (ConfigFileNotFoundException e) { - logger.error(e.getMessage(), e); - } catch (ModuleNotFoundException e) { - logger.error(e.getMessage(), e); - } catch (ProviderNotFoundException e) { - logger.error(e.getMessage(), e); - } catch (ServiceNotProvidedException e) { + } catch (ConfigFileNotFoundException | ModuleNotFoundException | ProviderNotFoundException | ServiceNotProvidedException e) { logger.error(e.getMessage(), e); } - - try { - Thread.sleep(60000); - } catch (InterruptedException e) { - } } } diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/graph/GraphManager.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/graph/GraphManager.java index cdd7dac365..3a807e594d 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/graph/GraphManager.java +++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/graph/GraphManager.java @@ -45,7 +45,7 @@ public enum GraphManager { } } - public Graph findGraph(int graphId, Class input) { + public Graph findGraph(int graphId) { Graph graph = allGraphs.get(graphId); if (graph == null) { throw new GraphNotFoundException("Graph id=" + graphId + " not found in this GraphManager"); @@ -53,6 +53,10 @@ public enum GraphManager { return graph; } + public Graph findGraph(int graphId, Class input) { + return findGraph(graphId); + } + public void reset() { allGraphs.clear(); } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/graph/GraphManagerTest.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/graph/GraphManagerTest.java index ae31cb71d9..f3feac5207 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/graph/GraphManagerTest.java +++ b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/graph/GraphManagerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.collector.core.graph; import java.io.ByteArrayOutputStream; @@ -88,7 +87,7 @@ public class GraphManagerTest { Graph graph = GraphManager.INSTANCE.createIfAbsent(4, String.class); graph.addNode(new Node1Processor()).addNext(new Node2Processor()).addNext(new Node4Processor()); - Next next = GraphManager.INSTANCE.findGraph(4).toFinder().findNext(2); + Next next = GraphManager.INSTANCE.findGraph(4, String.class).toFinder().findNext(2); next.execute(123); String output = outputStream.toString(); @@ -103,7 +102,7 @@ public class GraphManagerTest { Graph graph = GraphManager.INSTANCE.createIfAbsent(5, String.class); graph.addNode(new Node1Processor()).addNext(new Node2Processor()).addNext(new Node4Processor()); - Next next = GraphManager.INSTANCE.findGraph(5).toFinder().findNext(3); + Next next = GraphManager.INSTANCE.findGraph(5, String.class).toFinder().findNext(3); } @Test diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/proto/RemoteCommonService.proto b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/proto/RemoteCommonService.proto index 2d831481dd..7be736bbc4 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/proto/RemoteCommonService.proto +++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/proto/RemoteCommonService.proto @@ -20,7 +20,6 @@ message RemoteData { repeated int64 dataLongs = 2; repeated double dataDoubles = 3; repeated int32 dataIntegers = 4; - // repeated bytes dataBytes = 5; repeated bool dataBooleans = 5; } -- GitLab