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

Merge branch 'master' into zhangxin/feature/add-default-span-layer

parents 77069695 2ccee15b

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import org.skywalking.apm.collector.stream.StreamModuleContext; 
import org.skywalking.apm.collector.stream.StreamModuleGroupDefine;

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

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

import org.skywalking.apm.collector.stream.worker.util.Const;

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

import org.skywalking.apm.collector.stream.worker.util.TimeBucketUtils;

import org.skywalking.apm.network.proto.CPU;

import org.skywalking.apm.network.proto.Downstream;

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

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



import org.skywalking.apm.collector.stream.worker.storage.CommonTable;

import org.skywalking.apm.collector.storage.table.CommonTable;



/**

 * @author pengys5

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricTable.java

+1 −1
Original line number Diff line number Diff line 
package org.skywalking.apm.collector.agentjvm.worker.gc.define;



import org.skywalking.apm.collector.stream.worker.storage.CommonTable;

import org.skywalking.apm.collector.storage.table.CommonTable;



/**

 * @author pengys5

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricTable.java

+1 −1
Original line number Diff line number Diff line 
package org.skywalking.apm.collector.agentjvm.worker.memory.define;



import org.skywalking.apm.collector.stream.worker.storage.CommonTable;

import org.skywalking.apm.collector.storage.table.CommonTable;



/**

 * @author pengys5

apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricTable.java

+1 −1
Original line number Diff line number Diff line 
package org.skywalking.apm.collector.agentjvm.worker.memorypool.define;



import org.skywalking.apm.collector.stream.worker.storage.CommonTable;

import org.skywalking.apm.collector.storage.table.CommonTable;



/**

 * @author pengys5