diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml index 71243c5f4b9b9a936917ba7236d07d59b4106710..08a3c488501949dab461f5317210fc25d0841a8f 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml +++ b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml @@ -36,5 +36,10 @@ collector-stream-provider ${project.version} + + org.skywalking + collector-cache-define + ${project.version} + diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java new file mode 100644 index 0000000000000000000000000000000000000000..c2ce349ba410ed0c7380303777fe5f124986dca3 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java @@ -0,0 +1,42 @@ +/* + * Copyright 2017, OpenSkywalking Organization All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Project repository: https://github.com/OpenSkywalking/skywalking + */ + +package org.skywalking.apm.collector.agent.stream; + +/** + * @author peng-yongsheng + */ +public enum IdAutoIncrement { + INSTANCE; + + public int increment(int min, int max) { + int instanceId; + if (min == max) { + instanceId = -1; + } else if (min + max == 0) { + instanceId = max + 1; + } else if (min + max > 0) { + instanceId = min - 1; + } else if (max < 0) { + instanceId = 1; + } else { + instanceId = max + 1; + } + return instanceId; + } +} diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java index c3adcd8e56284c8273a1d5f4e21f1e3523e4372a..4981ae588209777ed22588d1df802f67d9cc229e 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agent.stream.worker.jvm; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO; @@ -31,34 +32,33 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; */ public class CpuMetricPersistenceWorker extends PersistenceWorker { - private final DAOService daoService; + public CpuMetricPersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } @Override public int id() { return 0; } - public CpuMetricPersistenceWorker(DAOService daoService) { - super(daoService); - this.daoService = daoService; - } - @Override protected boolean needMergeDBData() { return false; } @Override protected IPersistenceDAO persistenceDAO() { - return daoService.getPersistenceDAO(ICpuMetricPersistenceDAO.class); + return getDaoService().getPersistenceDAO(ICpuMetricPersistenceDAO.class); } public static class Factory extends AbstractLocalAsyncWorkerProvider { - public Factory(DAOService daoService, QueueCreatorService queueCreatorService) { - super(daoService, queueCreatorService); + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); } @Override - public CpuMetricPersistenceWorker workerInstance(DAOService daoService) { - return new CpuMetricPersistenceWorker(daoService); + public CpuMetricPersistenceWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new CpuMetricPersistenceWorker(getDaoService(), getCacheServiceManager()); } @Override diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java index ad28c10c2a50401469eee40786150fc9b0cf8ae2..47cdc5b8bc59fda34b0ed3df3720e36153921ee5 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agent.stream.worker.jvm; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO; @@ -31,15 +32,12 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; */ public class GCMetricPersistenceWorker extends PersistenceWorker { - private final DAOService daoService; - @Override public int id() { return 0; } - public GCMetricPersistenceWorker(DAOService daoService) { - super(daoService); - this.daoService = daoService; + public GCMetricPersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); } @Override protected boolean needMergeDBData() { @@ -47,18 +45,20 @@ public class GCMetricPersistenceWorker extends PersistenceWorker { - public Factory(DAOService daoService, QueueCreatorService queueCreatorService) { - super(daoService, queueCreatorService); + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); } @Override - public GCMetricPersistenceWorker workerInstance(DAOService daoService) { - return new GCMetricPersistenceWorker(daoService); + public GCMetricPersistenceWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new GCMetricPersistenceWorker(getDaoService(), getCacheServiceManager()); } @Override diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java index bde7fb1c7565e027d288211d0a5848143d387c80..c43766fa791b971e39b9c3fefc3bba34b56e044f 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agent.stream.worker.jvm; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersistenceDAO; @@ -31,15 +32,12 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; */ public class InstHeartBeatPersistenceWorker extends PersistenceWorker { - private final DAOService daoService; - @Override public int id() { return 0; } - public InstHeartBeatPersistenceWorker(DAOService daoService) { - super(daoService); - this.daoService = daoService; + public InstHeartBeatPersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); } @Override protected boolean needMergeDBData() { @@ -47,18 +45,19 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker { - public Factory(DAOService daoService, QueueCreatorService queueCreatorService) { - super(daoService, queueCreatorService); + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); } - @Override - public InstHeartBeatPersistenceWorker workerInstance(DAOService daoService) { - return new InstHeartBeatPersistenceWorker(daoService); + @Override public InstHeartBeatPersistenceWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new InstHeartBeatPersistenceWorker(getDaoService(), getCacheServiceManager()); } @Override diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java index b91966f4874019a6ff46118c7826de327c59f9e0..1621190d8ddf00acf4dd2efe03d22ce9d9e339b7 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agent.stream.worker.jvm; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IMemoryMetricPersistenceDAO; @@ -31,34 +32,32 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; */ public class MemoryMetricPersistenceWorker extends PersistenceWorker { - private final DAOService daoService; + public MemoryMetricPersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } @Override public int id() { return 0; } - public MemoryMetricPersistenceWorker(DAOService daoService) { - super(daoService); - this.daoService = daoService; - } - @Override protected boolean needMergeDBData() { return false; } @Override protected IPersistenceDAO persistenceDAO() { - return daoService.getPersistenceDAO(IMemoryMetricPersistenceDAO.class); + return getDaoService().getPersistenceDAO(IMemoryMetricPersistenceDAO.class); } public static class Factory extends AbstractLocalAsyncWorkerProvider { - public Factory(DAOService daoService, QueueCreatorService queueCreatorService) { - super(daoService, queueCreatorService); + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); } - @Override - public MemoryMetricPersistenceWorker workerInstance(DAOService daoService) { - return new MemoryMetricPersistenceWorker(daoService); + @Override public MemoryMetricPersistenceWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new MemoryMetricPersistenceWorker(getDaoService(), getCacheServiceManager()); } @Override diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java index d54fee8b5c1ddd70a57808eb1d2a83df1a3f5478..fc22e5a4b5cc196d4ef4ef03c428806bd6c25a31 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.agent.stream.worker.jvm; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO; @@ -31,15 +32,12 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; */ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker { - private final DAOService daoService; - @Override public int id() { return 0; } - public MemoryPoolMetricPersistenceWorker(DAOService daoService) { - super(daoService); - this.daoService = daoService; + public MemoryPoolMetricPersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); } @Override protected boolean needMergeDBData() { @@ -47,18 +45,19 @@ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker { - public Factory(DAOService daoService, QueueCreatorService queueCreatorService) { - super(daoService, queueCreatorService); + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); } - @Override - public MemoryPoolMetricPersistenceWorker workerInstance(DAOService daoService) { - return new MemoryPoolMetricPersistenceWorker(daoService); + @Override public MemoryPoolMetricPersistenceWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new MemoryPoolMetricPersistenceWorker(getDaoService(), getCacheServiceManager()); } @Override diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java new file mode 100644 index 0000000000000000000000000000000000000000..b816cb4a7b2bfd49010690d1aa86131cf2b47bb8 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java @@ -0,0 +1,63 @@ +/* + * Copyright 2017, OpenSkywalking Organization All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Project repository: https://github.com/OpenSkywalking/skywalking + */ + +package org.skywalking.apm.collector.agent.stream.worker.register; + +import org.skywalking.apm.collector.cache.CacheServiceManager; +import org.skywalking.apm.collector.remote.service.RemoteClientService; +import org.skywalking.apm.collector.storage.service.DAOService; +import org.skywalking.apm.collector.storage.table.register.Application; +import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker; +import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider; +import org.skywalking.apm.collector.stream.worker.base.WorkerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @author peng-yongsheng + */ +public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker { + + private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterRemoteWorker.class); + + public ApplicationRegisterRemoteWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } + + @Override public int id() { + return 0; + } + + @Override protected void onWork(Application message) throws WorkerException { + logger.debug("application code: {}", message.getApplicationCode()); + onNext(message); + } + + public static class Factory extends AbstractRemoteWorkerProvider { + + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + RemoteClientService remoteClientService) { + super(daoService, cacheServiceManager, remoteClientService); + } + + @Override public ApplicationRegisterRemoteWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new ApplicationRegisterRemoteWorker(getDaoService(), getCacheServiceManager()); + } + } +} diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java new file mode 100644 index 0000000000000000000000000000000000000000..1d7523b1eecd90cdc0d1ac5b28a2a9607c279388 --- /dev/null +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java @@ -0,0 +1,91 @@ +/* + * Copyright 2017, OpenSkywalking Organization All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Project repository: https://github.com/OpenSkywalking/skywalking + */ + +package org.skywalking.apm.collector.agent.stream.worker.register; + +import org.skywalking.apm.collector.agent.stream.IdAutoIncrement; +import org.skywalking.apm.collector.cache.CacheServiceManager; +import org.skywalking.apm.collector.core.util.Const; +import org.skywalking.apm.collector.queue.service.QueueCreatorService; +import org.skywalking.apm.collector.storage.dao.IApplicationStreamDAO; +import org.skywalking.apm.collector.storage.service.DAOService; +import org.skywalking.apm.collector.storage.table.register.Application; +import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker; +import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; +import org.skywalking.apm.collector.stream.worker.base.WorkerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @author peng-yongsheng + */ +public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker { + + private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterSerialWorker.class); + + public ApplicationRegisterSerialWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } + + @Override public int id() { + return 0; + } + + @Override protected void onWork(Application application) throws WorkerException { + logger.debug("register application, application code: {}", application.getApplicationCode()); + int applicationId = getCacheServiceManager().getApplicationCacheService().get(application.getApplicationCode()); + + if (applicationId == 0) { + IApplicationStreamDAO dao = (IApplicationStreamDAO)getDaoService().get(IApplicationStreamDAO.class); + int min = dao.getMinApplicationId(); + if (min == 0) { + Application userApplication = new Application(String.valueOf(Const.USER_ID)); + userApplication.setApplicationCode(Const.USER_CODE); + userApplication.setApplicationId(Const.USER_ID); + dao.save(userApplication); + + application = new Application("-1"); + application.setApplicationId(-1); + } else { + int max = dao.getMaxApplicationId(); + applicationId = IdAutoIncrement.INSTANCE.increment(min, max); + + application = new Application(String.valueOf(applicationId)); + application.setApplicationId(applicationId); + } + dao.save(application); + } + } + + public static class Factory extends AbstractLocalAsyncWorkerProvider { + + public Factory(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager, queueCreatorService); + } + + @Override public ApplicationRegisterSerialWorker workerInstance(DAOService daoService, + CacheServiceManager cacheServiceManager) { + return new ApplicationRegisterSerialWorker(daoService, cacheServiceManager); + } + + @Override public int queueSize() { + return 256; + } + } +} diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationStreamDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationStreamDAO.java index de2818cd0d4f6dc3198fb9b9e519f8f8173f9a02..32e3ecff5bacd208712cd1767ddc3877390d9b60 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationStreamDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationStreamDAO.java @@ -18,12 +18,13 @@ package org.skywalking.apm.collector.storage.dao; +import org.skywalking.apm.collector.storage.base.dao.DAO; import org.skywalking.apm.collector.storage.table.register.Application; /** * @author peng-yongsheng */ -public interface IApplicationStreamDAO { +public interface IApplicationStreamDAO extends DAO { int getMaxApplicationId(); int getMinApplicationId(); diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/Application.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/Application.java index bea8135cac7248fabe055e0e183de0f4b233515b..e27d75753f106c2333ee58a16ac725d7d93b114f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/Application.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/Application.java @@ -50,7 +50,15 @@ public class Application extends Data { return getDataString(1); } + public void setApplicationCode(String applicationCode) { + setDataString(1, applicationCode); + } + public int getApplicationId() { return getDataInteger(0); } + + public void setApplicationId(int applicationId) { + setDataInteger(0, applicationId); + } } diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/StreamModuleProvider.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/StreamModuleProvider.java index 78ae60ca6599ecee00276fc0ff55f701f7f6ee21..d74b0d75f6870af3a957d21b2c34f08841619b09 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/StreamModuleProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/StreamModuleProvider.java @@ -19,6 +19,7 @@ package org.skywalking.apm.collector.stream; import java.util.Properties; +import org.skywalking.apm.collector.cache.CacheModule; import org.skywalking.apm.collector.core.module.Module; import org.skywalking.apm.collector.core.module.ModuleNotFoundException; import org.skywalking.apm.collector.core.module.ModuleProvider; @@ -64,6 +65,6 @@ public class StreamModuleProvider extends ModuleProvider { } @Override public String[] requiredModules() { - return new String[] {RemoteModule.NAME, QueueModule.NAME, StorageModule.NAME}; + return new String[] {RemoteModule.NAME, QueueModule.NAME, StorageModule.NAME, CacheModule.NAME}; } } diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java index b3d3ee2282af2cfddf7651103ea1c9cad62942fe..dcafca158e137046c0f8a712aefa9f3c9b264abe 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java @@ -18,8 +18,10 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.queue.base.QueueExecutor; +import org.skywalking.apm.collector.storage.service.DAOService; /** * The AbstractLocalAsyncWorker implementations represent workers, @@ -30,6 +32,10 @@ import org.skywalking.apm.collector.queue.base.QueueExecutor; */ public abstract class AbstractLocalAsyncWorker extends AbstractWorker implements QueueExecutor { + public AbstractLocalAsyncWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } + /** * Receive message * diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java index d87ffebf1229f713a1a059a89d412397de630522..e07545687e2d8bbc4fb78009f103954b09cfc6fc 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.queue.base.QueueEventHandler; import org.skywalking.apm.collector.queue.base.QueueExecutor; @@ -31,17 +32,17 @@ public abstract class AbstractLocalAsyncWorkerProvider queueCreatorService; - public AbstractLocalAsyncWorkerProvider(DAOService daoService, QueueCreatorService queueCreatorService) { - this.daoService = daoService; + public AbstractLocalAsyncWorkerProvider(DAOService daoService, CacheServiceManager cacheServiceManager, + QueueCreatorService queueCreatorService) { + super(daoService, cacheServiceManager); this.queueCreatorService = queueCreatorService; } @Override final public WorkerRef create(WorkerCreateListener workerCreateListener) throws ProviderNotFoundException { - WorkerType localAsyncWorker = workerInstance(daoService); + WorkerType localAsyncWorker = workerInstance(getDaoService(), getCacheServiceManager()); workerCreateListener.addWorker(localAsyncWorker); QueueEventHandler queueEventHandler = queueCreatorService.create(queueSize(), localAsyncWorker); return new LocalAsyncWorkerRef<>(localAsyncWorker, queueEventHandler); diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java index 52341beabb378d1bb21a0b680e63fde267638985..419e1c3cee0048e81df9b89eaaae26af81a50770 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java @@ -18,7 +18,9 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; +import org.skywalking.apm.collector.storage.service.DAOService; /** * The AbstractRemoteWorker implementations represent workers, @@ -31,6 +33,10 @@ import org.skywalking.apm.collector.core.data.Data; */ public abstract class AbstractRemoteWorker extends AbstractWorker { + public AbstractRemoteWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + } + /** * This method use for message producer to call for send message. * diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java index dce4fe55e448fdd12c3c5bbea1a202352312fe89..73d2da0140d01df18700670e8027e8f6c1eaada5 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.remote.service.RemoteClientService; import org.skywalking.apm.collector.storage.service.DAOService; @@ -32,11 +33,11 @@ import org.skywalking.apm.collector.storage.service.DAOService; */ public abstract class AbstractRemoteWorkerProvider> extends AbstractWorkerProvider { - private final DAOService daoService; private final RemoteClientService remoteClientService; - public AbstractRemoteWorkerProvider(DAOService daoService, RemoteClientService remoteClientService) { - this.daoService = daoService; + public AbstractRemoteWorkerProvider(DAOService daoService, CacheServiceManager cacheServiceManager, + RemoteClientService remoteClientService) { + super(daoService, cacheServiceManager); this.remoteClientService = remoteClientService; } @@ -48,7 +49,7 @@ public abstract class AbstractRemoteWorkerProvider workerRef = new RemoteWorkerRef<>(remoteWorker); return workerRef; diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java index 65bfb418522557ebd1842f641d61de31a1ff8427..8a04a093bc50cde89e361546f8b1ba29c5945059 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java @@ -18,9 +18,11 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.core.graph.Next; import org.skywalking.apm.collector.core.graph.NodeProcessor; +import org.skywalking.apm.collector.storage.service.DAOService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +33,22 @@ public abstract class AbstractWorker im private final Logger logger = LoggerFactory.getLogger(AbstractWorker.class); + private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; + + public AbstractWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; + } + + public DAOService getDaoService() { + return daoService; + } + + public CacheServiceManager getCacheServiceManager() { + return cacheServiceManager; + } + private Next next; /** diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java index 3af9127669c9dfc738f268bbe59a6ce75c47d468..4b4b0643df22d0763429ddc57f9436884d90b1da 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.stream.worker.base; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.service.DAOService; @@ -25,5 +26,22 @@ import org.skywalking.apm.collector.storage.service.DAOService; * @author peng-yongsheng */ public abstract class AbstractWorkerProvider> implements Provider { - public abstract WorkerType workerInstance(DAOService daoService); + + private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; + + public AbstractWorkerProvider(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; + } + + public final DAOService getDaoService() { + return daoService; + } + + public final CacheServiceManager getCacheServiceManager() { + return cacheServiceManager; + } + + public abstract WorkerType workerInstance(DAOService daoService, CacheServiceManager cacheServiceManager); } diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java index 9df8223360c5e41386aba9556fd759c455faaf7d..32d94975bedc314f8070b222ce8990155124a7ac 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java @@ -18,7 +18,9 @@ package org.skywalking.apm.collector.stream.worker.impl; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; +import org.skywalking.apm.collector.storage.service.DAOService; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.base.WorkerException; import org.skywalking.apm.collector.stream.worker.impl.data.DataCache; @@ -35,8 +37,9 @@ public abstract class AggregationWorker private DataCache dataCache; private int messageNum; - public AggregationWorker() { - dataCache = new DataCache(); + public AggregationWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); + this.dataCache = new DataCache(); } @Override protected final void onWork(INPUT message) throws WorkerException { diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java index 6c63cdf3213a6d31b8e3f9fff2fc081efceb3fe5..7e2a22c30fa7f8a109d745c16763b4f5102103ad 100644 --- a/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java @@ -21,6 +21,7 @@ package org.skywalking.apm.collector.stream.worker.impl; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; @@ -39,12 +40,11 @@ public abstract class PersistenceWorker private final Logger logger = LoggerFactory.getLogger(PersistenceWorker.class); - private final DAOService daoService; private final DataCache dataCache; - public PersistenceWorker(DAOService daoService) { + public PersistenceWorker(DAOService daoService, CacheServiceManager cacheServiceManager) { + super(daoService, cacheServiceManager); this.dataCache = new DataCache(); - this.daoService = daoService; } public final void flushAndSwitch() { @@ -64,7 +64,7 @@ public abstract class PersistenceWorker dataCache.switchPointer(); List collection = buildBatchCollection(); - IBatchDAO dao = (IBatchDAO)daoService.get(IBatchDAO.class); + IBatchDAO dao = (IBatchDAO)getDaoService().get(IBatchDAO.class); dao.batchPersistence(collection); } } finally { diff --git a/apm-collector/apm-collector-stream/pom.xml b/apm-collector/apm-collector-stream/pom.xml index 2544a549e0790b295b9387e6a0ec0e50711c8117..c4ab405af2e575552d0f98b9c0d3f95175ec935a 100644 --- a/apm-collector/apm-collector-stream/pom.xml +++ b/apm-collector/apm-collector-stream/pom.xml @@ -55,5 +55,10 @@ collector-remote-define ${project.version} + + org.skywalking + collector-cache-define + ${project.version} + \ No newline at end of file diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java index d108d028975be02a473aec472299a60989e5e4fa..d83df0a7b1f88b6a1e04676647a890c732d3387a 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java @@ -54,7 +54,7 @@ import org.skywalking.apm.collector.ui.jetty.handler.servicetree.EntryServiceGet import org.skywalking.apm.collector.ui.jetty.handler.servicetree.ServiceTreeGetByIdHandler; import org.skywalking.apm.collector.ui.jetty.handler.time.AllInstanceLastTimeGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.time.OneInstanceLastTimeGetHandler; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java index 86f5a5a203a7a10be28f61bc6be158f80808be5e..7c1eb885a1dc5264c411195e03b29608888b0b36 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.dao.ISegmentCostUIDAO; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.SegmentTopService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java index c144c8f84a47240c013536e265fa792ea9ff937b..32502d1c6bd920718a6159b0cc051304f23b2512 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.SpanService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java index 8550f16f1fb703e5eb0f5ef039c62c0ec5e047f6..ff499a5e4b5b9e90e061fcce804a505459ec758a 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.TraceDagService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java index 03f091222e5b2f7112a5f2d219859d372598a300..ed98765f12255e1510b95034641a572b438f93b0 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.TraceStackService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java index ac9d5ddd992e72f83bf21627e7405ca2d43fc802..2b038a8acb8f39ec22a62ce84ec78f16f4902cef 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; import org.skywalking.apm.collector.ui.service.ApplicationService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java index 4e8c934aa1b5d078c57d670d56002d4515d855b3..a3c17ff2ca4ea56f9dcea96b44ac98a9743e9784 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.InstanceHealthService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java index 31934be18c27d86a2dc8fa49a02b606eecddca55..6d3482b70879a9b2a08e33b2844267ba9772b1e9 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java index 2a98f829bdda6e0d42259c4e133bbcf1fa4f076c..683a7934620f8d91fc7b219b42b3eec00b30d22b 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java index c2512d56519cdc8968772a94b1c27315db412280..6da9011a7eb820c26d01894c90417acd4fe852d4 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java index 9dfb29976f50862d89a7c2c740937dd84f233e90..ddee2c4c8f8e8b07944242db44b03779e06b2cb6 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.ServiceTreeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java index 280fac6514c6667efb4e2be38a23c915881947bb..d62c5170ccb91863d23ef456199f2c2aef9c133d 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.ServiceTreeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java index aa2bccb4a94e56feff0ec25fc759cd5a49b3bf04..a401244c9d389142dfc8a2d37d76c0b4b832dfa7 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.TimeSynchronousService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java index 57e3718370e63e898795307a34c5e8f546c5fc0d..2c7fea2bb2daddd84b443cd4b34a44c00b069c66 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import org.skywalking.apm.collector.server.jetty.ArgumentsParseException; import org.skywalking.apm.collector.server.jetty.JettyHandler; import org.skywalking.apm.collector.storage.service.DAOService; -import org.skywalking.apm.collector.ui.service.CacheServiceManager; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.ui.service.TimeSynchronousService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java index 5919fd2e07e08a574a09c3c857b652a6255a6285..071392533f7d4cdab802da1105123bd94e4098c4 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java @@ -20,6 +20,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.storage.dao.IInstanceUIDAO; import org.skywalking.apm.collector.storage.service.DAOService; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java index 55bdebdb96d0dd82071ec3302658cd49dbea5923..896f6aeb0127e019b15ee9838940263e79f1d250 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java @@ -21,6 +21,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import java.util.List; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IGCMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IInstPerformanceUIDAO; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java index ab412c534fbb0b499e68519a78d3ff213ef2dee4..1f9eaaf2127ba052d0ee6d34f17481a85d80e2de 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java @@ -21,6 +21,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.Gson; import com.google.gson.JsonObject; import java.util.Set; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.UnexpectedException; import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.storage.dao.ICpuMetricUIDAO; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java index 04d94c032f16df5ef9de6479ebb8d414e8e5b814..27f9635c937628cf9c7ced3d7f3afe0279b68b5c 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java @@ -21,6 +21,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonObject; import java.util.LinkedList; import java.util.List; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.dao.IGlobalTraceUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostUIDAO; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java index cfa960ca1922924e7091e971921b49a57a88dfb0..2c13178ad039cbc23b965748dbc3f2c068498583 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java @@ -23,6 +23,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import java.util.Iterator; import java.util.Map; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java index 6436cb940bbac915abb4ecf1f63a7b6a532620cc..fd208519bc5867f1d6a83e579f53f2b47030537d 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java @@ -21,6 +21,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import java.util.List; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.dao.ISegmentUIDAO; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java index 0172124cba90a5530d9677c20df737980c8381eb..55af010c92044fc88099f8d2beecb2a9ea21d5c6 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java @@ -18,6 +18,7 @@ package org.skywalking.apm.collector.ui.service; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.storage.dao.IInstanceUIDAO; import org.skywalking.apm.collector.storage.service.DAOService; import org.slf4j.Logger; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java index ae80cd47af1a38005cc979b702766cfd24257718..f292d5666d51b2f5341e3a3e23940bf4e6a8517d 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java @@ -20,6 +20,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java index 052a238a9ee7a29a191b9eabcfb029d55afbb2bd..ca7973fc4051a1f3d583055b268b5b919ee7d37c 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java @@ -22,6 +22,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import java.util.ArrayList; import java.util.List; +import org.skywalking.apm.collector.cache.CacheServiceManager; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils;