From 9b76ecd21894d7c999d8ffd62315c882f288ddc8 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Sat, 9 Dec 2017 23:31:09 +0800 Subject: [PATCH] Change the version of some modules. --- .../agent/stream/graph/TraceStreamGraph.java | 17 ++++------------- .../collector-alerting-define/pom.xml | 2 +- .../collector-alerting-provider/pom.xml | 2 +- apm-collector/apm-collector-alerting/pom.xml | 2 +- .../collector-configuration-define/pom.xml | 2 +- .../collector-configuration-provider/pom.xml | 2 +- .../apm-collector-configuration/pom.xml | 2 +- .../stream/worker/impl/data/DataCache.java | 8 ++++---- .../stream/worker/impl/data/DataCollection.java | 10 +++++----- 9 files changed, 19 insertions(+), 28 deletions(-) diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java index 117acdea8..73afc1876 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java @@ -20,21 +20,14 @@ package org.skywalking.apm.collector.agent.stream.graph; import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardization; import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardizationWorker; -import org.skywalking.apm.collector.agent.stream.service.graph.ServiceGraphNodeIdDefine; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentAggregationWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentPersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentRemoteWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingAggregationWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingPersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingRemoteWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricAggregationWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricPersistenceWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricRemoteWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.global.GlobalTracePersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceMetricPersistenceWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferenceMetricAggregationWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferenceMetricRemoteWorker; -import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferencePersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentCostPersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentPersistenceWorker; import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntryAggregationWorker; @@ -45,7 +38,6 @@ import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceRef import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceReferenceMetricRemoteWorker; import org.skywalking.apm.collector.core.graph.Graph; import org.skywalking.apm.collector.core.graph.GraphManager; -import org.skywalking.apm.collector.core.graph.Node; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.queue.QueueModule; import org.skywalking.apm.collector.queue.service.QueueCreatorService; @@ -71,7 +63,6 @@ public class TraceStreamGraph { public static final int INSTANCE_METRIC_GRAPH_ID = 301; public static final int APPLICATION_COMPONENT_GRAPH_ID = 302; public static final int APPLICATION_MAPPING_GRAPH_ID = 303; - public static final int APPLICATION_REFERENCE_METRIC_GRAPH_ID = 304; public static final int SERVICE_ENTRY_GRAPH_ID = 305; public static final int SERVICE_REFERENCE_GRAPH_ID = 306; public static final int SEGMENT_GRAPH_ID = 307; @@ -162,10 +153,10 @@ public class TraceStreamGraph { QueueCreatorService persistenceQueueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class); RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class); - Node serviceReferenceMetricNode = graph.toFinder().findNode(ServiceGraphNodeIdDefine.SERVICE_REFERENCE_METRIC_AGGREGATION_NODE_ID, ServiceReferenceMetric.class); - serviceReferenceMetricNode.addNext(new InstanceReferenceMetricAggregationWorker.Factory(moduleManager, aggregationQueueCreatorService).create(workerCreateListener)) - .addNext(new InstanceReferenceMetricRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_REFERENCE_GRAPH_ID).create(workerCreateListener)) - .addNext(new InstanceReferencePersistenceWorker.Factory(moduleManager, persistenceQueueCreatorService).create(workerCreateListener)); +// Node serviceReferenceMetricNode = graph.toFinder().findNode(ServiceGraphNodeIdDefine.SERVICE_REFERENCE_METRIC_AGGREGATION_NODE_ID, ServiceReferenceMetric.class); +// serviceReferenceMetricNode.addNext(new InstanceReferenceMetricAggregationWorker.Factory(moduleManager, aggregationQueueCreatorService).create(workerCreateListener)) +// .addNext(new InstanceReferenceMetricRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_REFERENCE_GRAPH_ID).create(workerCreateListener)) +// .addNext(new InstanceReferencePersistenceWorker.Factory(moduleManager, persistenceQueueCreatorService).create(workerCreateListener)); createApplicationReferenceMetricGraph(graph); } diff --git a/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml b/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml index 427e656e2..be7530c6c 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml +++ b/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-alerting org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml index 457f1c2c5..82f00c755 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml +++ b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-alerting org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 diff --git a/apm-collector/apm-collector-alerting/pom.xml b/apm-collector/apm-collector-alerting/pom.xml index d72721195..745fb8b6e 100644 --- a/apm-collector/apm-collector-alerting/pom.xml +++ b/apm-collector/apm-collector-alerting/pom.xml @@ -23,7 +23,7 @@ apm-collector org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 diff --git a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml index 3d3db6f87..bd5f21188 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml @@ -23,7 +23,7 @@ apm-collector-configuration org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml index 69c7045f6..d99d9f753 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml @@ -23,7 +23,7 @@ apm-collector-configuration org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 diff --git a/apm-collector/apm-collector-configuration/pom.xml b/apm-collector/apm-collector-configuration/pom.xml index 1f5ccaf0f..2b03e511a 100644 --- a/apm-collector/apm-collector-configuration/pom.xml +++ b/apm-collector/apm-collector-configuration/pom.xml @@ -23,7 +23,7 @@ apm-collector org.skywalking - 3.3.0-2017 + 5.0-2018-preview 4.0.0 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 1514bdf6b..c5df260ed 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 @@ -24,11 +24,11 @@ import org.skywalking.apm.collector.core.data.Data; /** * @author peng-yongsheng */ -public class DataCache extends Window> { +public class DataCache extends Window> { - private DataCollection lockedDataCollection; + private DataCollection lockedDataCollection; - @Override public DataCollection collectionInstance() { + @Override public DataCollection collectionInstance() { return new DataCollection<>(); } @@ -40,7 +40,7 @@ public class DataCache extends Window implements Collection> { - private Map data; +public class DataCollection implements Collection> { + private Map data; private volatile boolean writing; private volatile boolean reading; @@ -65,11 +65,11 @@ public class DataCollection implements Collection implements Collection collection() { + public Map collection() { return data; } }