Commit 2fe5362a authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #368 from wu-sheng/feature/367 

Feature/367 move data define to storage module
parents 2de7fefd d57a85aa

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java

+7 −7
Original line number Diff line number Diff line
@@ -3,15 +3,15 @@ package org.skywalking.apm.collector.agentjvm.grpc.handler; 
import io.grpc.stub.StreamObserver;

import java.util.List;

import org.skywalking.apm.collector.agentjvm.worker.cpu.CpuMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.cpu.define.CpuMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.gc.GCMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.gc.define.GCMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.GCMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.heartbeat.InstHeartBeatPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.heartbeat.define.InstanceHeartBeatDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.memory.MemoryMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.memory.define.MemoryMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.memorypool.MemoryPoolMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.memorypool.define.MemoryPoolMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricDataDefine;

import org.skywalking.apm.collector.core.framework.CollectorContextHelper;

import org.skywalking.apm.collector.core.util.Const;

import org.skywalking.apm.collector.server.grpc.GRPCHandler;
@@ -44,7 +44,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
        StreamModuleContext context = (StreamModuleContext)CollectorContextHelper.INSTANCE.getContext(StreamModuleGroupDefine.GROUP_NAME);

        request.getMetricsList().forEach(metric -> {

            long time = TimeBucketUtils.INSTANCE.getSecondTimeBucket(metric.getTime());

            senToInstanceHeartBeatPersistenceWorker(context, applicationInstanceId, time);

            senToInstanceHeartBeatPersistenceWorker(context, applicationInstanceId, metric.getTime());

            sendToCpuMetricPersistenceWorker(context, applicationInstanceId, time, metric.getCpu());

            sendToMemoryMetricPersistenceWorker(context, applicationInstanceId, time, metric.getMemoryList());

            sendToMemoryPoolMetricPersistenceWorker(context, applicationInstanceId, time, metric.getMemoryPoolList());
@@ -59,8 +59,8 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
        long heartBeatTime) {

        InstanceHeartBeatDataDefine.InstanceHeartBeat heartBeat = new InstanceHeartBeatDataDefine.InstanceHeartBeat();

        heartBeat.setId(String.valueOf(applicationInstanceId));

        heartBeat.setHeartbeatTime(heartBeatTime);

        heartBeat.setApplicationInstanceId(applicationInstanceId);

        heartBeat.setHeartBeatTime(heartBeatTime);

        heartBeat.setInstanceId(applicationInstanceId);

        try {

            logger.debug("send to instance heart beat persistence worker, id: {}", heartBeat.getId());

            context.getClusterWorkerContext().lookup(InstHeartBeatPersistenceWorker.WorkerRole.INSTANCE).tell(heartBeat.toData());

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java

+2 −2
Original line number Diff line number Diff line 
package org.skywalking.apm.collector.agentjvm.worker.cpu;



import org.skywalking.apm.collector.agentjvm.worker.cpu.dao.ICpuMetricDAO;

import org.skywalking.apm.collector.agentjvm.worker.cpu.define.CpuMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine;

import org.skywalking.apm.collector.storage.dao.DAOContainer;

import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext;
@@ -9,7 +9,7 @@ import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; 
import org.skywalking.apm.collector.stream.worker.Role;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;

import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;

import org.skywalking.apm.collector.stream.worker.impl.data.DataDefine;

import org.skywalking.apm.collector.storage.define.DataDefine;

import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;

import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java

+3 −3
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ import java.util.HashMap; 
import java.util.Map;

import org.elasticsearch.action.index.IndexRequestBuilder;

import org.elasticsearch.action.update.UpdateRequestBuilder;

import org.skywalking.apm.collector.agentjvm.worker.cpu.define.CpuMetricTable;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable;

import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO;

import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;

import org.skywalking.apm.collector.stream.worker.impl.data.Data;

import org.skywalking.apm.collector.stream.worker.impl.data.DataDefine;

import org.skywalking.apm.collector.core.stream.Data;

import org.skywalking.apm.collector.storage.define.DataDefine;



/**

 * @author pengys5

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.define; 


import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine;

import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable;



/**

 * @author pengys5

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.define; 


import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;

import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable;



/**

 * @author pengys5