kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the version of some modules.

This commit is contained in:
peng-yongsheng 2017-12-09 23:31:09 +08:00
parent a9ff0b2812
commit 9b76ecd218
9 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
View File

@ -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<InstanceReferenceMetric> persistenceQueueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
Node<?, ServiceReferenceMetric> 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<?, ServiceReferenceMetric> 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);
}

2
apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-alerting</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-alerting</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-alerting/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-configuration</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-configuration</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-configuration/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.3.0-2017</version>
<version>5.0-2018-preview</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java
View File

@ -24,11 +24,11 @@ import org.skywalking.apm.collector.core.data.Data;
/**
* @author peng-yongsheng
*/
public class DataCache<DataImpl extends Data> extends Window<DataCollection<DataImpl>> {
public class DataCache<DATA_IMPL extends Data> extends Window<DataCollection<DATA_IMPL>> {
private DataCollection<DataImpl> lockedDataCollection;
private DataCollection<DATA_IMPL> lockedDataCollection;
@Override public DataCollection<DataImpl> collectionInstance() {
@Override public DataCollection<DATA_IMPL> collectionInstance() {
return new DataCollection<>();
}
@ -40,7 +40,7 @@ public class DataCache<DataImpl extends Data> extends Window<DataCollection<Data
return lockedDataCollection.get(id);
}
public void put(String id, DataImpl data) {
public void put(String id, DATA_IMPL data) {
lockedDataCollection.put(id, data);
}

10
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java
View File

@ -26,8 +26,8 @@ import org.skywalking.apm.collector.core.data.Data;
/**
* @author peng-yongsheng
*/
public class DataCollection<DataImpl extends Data> implements Collection<Map<String, DataImpl>> {
private Map<String, DataImpl> data;
public class DataCollection<DATA_IMPL extends Data> implements Collection<Map<String, DATA_IMPL>> {
private Map<String, DATA_IMPL> data;
private volatile boolean writing;
private volatile boolean reading;
@ -65,11 +65,11 @@ public class DataCollection<DataImpl extends Data> implements Collection<Map<Str
return data.containsKey(key);
}
void put(String key, DataImpl value) {
void put(String key, DATA_IMPL value) {
data.put(key, value);
}
public DataImpl get(String key) {
public DATA_IMPL get(String key) {
return data.get(key);
}
@ -81,7 +81,7 @@ public class DataCollection<DataImpl extends Data> implements Collection<Map<Str
data.clear();
}
public Map<String, DataImpl> collection() {
public Map<String, DATA_IMPL> collection() {
return data;
}
}