Commit 0afd4bc2 authored Dec 04, 2017 by 吴晟

Merge branch 'feature/3.2.x'

* feature/3.2.x:
  Fix worker ids.

parents e19f0a99 11b31056

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker<Segme
		}

		@Override public int id() {
		return SegmentStandardizationWorker.class.hashCode();
		return 108;
		}

		@Override protected void onWork(SegmentStandardization segmentStandardization) throws WorkerException {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class CpuMetricPersistenceWorker extends PersistenceWorker<CpuMetric, Cpu
		}

		@Override public int id() {
		return 0;
		return 115;
		}

		@Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMet
		}

		@Override public int id() {
		return 0;
		return 112;
		}

		@Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance,
		}

		@Override public int id() {
		return InstHeartBeatPersistenceWorker.class.hashCode();
		return 113;
		}

		@Override protected boolean needMergeDBData() {

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetri
		}

		@Override public int id() {
		return 0;
		return 119;
		}

		@Override protected boolean needMergeDBData() {