Commit 0149dcf2 authored by pengys5's avatar pengys5
Browse files

Merge branch 'feature/367' into feature/365 

# Conflicts:
#	apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java

#365
parents a6d9111d 0bf8ec44

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

+5 −5
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@ 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.agentjvm.worker.gc.GCMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.gc.define.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.agentjvm.worker.memorypool.MemoryPoolMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.memorypool.define.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;

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

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

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

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

import org.skywalking.apm.collector.stream.StreamModuleContext;

import org.skywalking.apm.collector.stream.StreamModuleGroupDefine;

import org.skywalking.apm.collector.stream.worker.WorkerInvokeException;
@@ -111,7 +111,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 


        memoryPools.forEach(memoryPool -> {

            MemoryPoolMetricDataDefine.MemoryPoolMetric memoryPoolMetric = new MemoryPoolMetricDataDefine.MemoryPoolMetric();

            memoryPoolMetric.setId(timeBucket + Const.ID_SPLIT + applicationInstanceId + Const.ID_SPLIT + String.valueOf(memoryPool.getType().getNumber()));

            memoryPoolMetric.setId(timeBucket + Const.ID_SPLIT + applicationInstanceId + Const.ID_SPLIT + memoryPool.getIsHeap() + Const.ID_SPLIT + String.valueOf(memoryPool.getType().getNumber()));

            memoryPoolMetric.setApplicationInstanceId(applicationInstanceId);

            memoryPoolMetric.setPoolType(memoryPool.getType().getNumber());

            memoryPoolMetric.setHeap(memoryPool.getIsHeap());

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.storage.table.jvm.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 −1
Original line number Diff line number Diff line
@@ -2,7 +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.table.jvm.CpuMetricTable;

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 −1
Original line number Diff line number Diff line
@@ -2,7 +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.table.jvm.CpuMetricTable;

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



/**

 * @author pengys5