From 27dfc3e587531f9dd499ed2480e471ee2ab6f1fd Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Thu, 9 Nov 2017 19:29:39 +0800 Subject: [PATCH] Use cache service from cache module. --- .../collector-ui-jetty-provider/pom.xml | 5 ++ .../ui/jetty/UIModuleJettyProvider.java | 54 ++++++++++----- .../jetty/handler/SegmentTopGetHandler.java | 5 +- .../ui/jetty/handler/SpanGetHandler.java | 5 +- .../ui/jetty/handler/TraceDagGetHandler.java | 5 +- .../jetty/handler/TraceStackGetHandler.java | 5 +- .../application/ApplicationsGetHandler.java | 5 +- .../InstanceHealthGetHandler.java | 5 +- ...InstanceMetricGetOneTimeBucketHandler.java | 5 +- ...stanceMetricGetRangeTimeBucketHandler.java | 5 +- .../InstanceOsInfoGetHandler.java | 5 +- .../servicetree/EntryServiceGetHandler.java | 5 +- .../ServiceTreeGetByIdHandler.java | 5 +- .../time/AllInstanceLastTimeGetHandler.java | 5 +- .../time/OneInstanceLastTimeGetHandler.java | 5 +- .../ui/service/ApplicationService.java | 7 +- .../ui/service/CacheServiceManager.java | 69 +++++++++++++++++++ .../ui/service/InstanceHealthService.java | 7 +- .../ui/service/InstanceJVMService.java | 4 +- .../ui/service/SegmentTopService.java | 4 +- .../ui/service/ServiceTreeService.java | 7 +- .../apm/collector/ui/service/SpanService.java | 10 +-- .../ui/service/TimeSynchronousService.java | 4 +- .../ui/service/TraceDagDataBuilder.java | 4 +- .../collector/ui/service/TraceDagService.java | 4 +- .../ui/service/TraceStackService.java | 10 +-- apm-collector/apm-collector-ui/pom.xml | 5 -- 27 files changed, 187 insertions(+), 72 deletions(-) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml index f43a94d971..168eff851e 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml @@ -56,5 +56,10 @@ collector-storage-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 44142449e3..d108d02897 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 @@ -19,6 +19,11 @@ package org.skywalking.apm.collector.ui.jetty; import java.util.Properties; +import org.skywalking.apm.collector.cache.CacheModule; +import org.skywalking.apm.collector.cache.service.ApplicationCacheService; +import org.skywalking.apm.collector.cache.service.InstanceCacheService; +import org.skywalking.apm.collector.cache.service.ServiceIdCacheService; +import org.skywalking.apm.collector.cache.service.ServiceNameCacheService; import org.skywalking.apm.collector.cluster.ClusterModule; import org.skywalking.apm.collector.cluster.service.ModuleListenerService; import org.skywalking.apm.collector.cluster.service.ModuleRegisterService; @@ -49,6 +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; /** * @author peng-yongsheng @@ -86,11 +92,13 @@ public class UIModuleJettyProvider extends ModuleProvider { NamingHandlerRegisterService namingHandlerRegisterService = getManager().find(NamingModule.NAME).getService(NamingHandlerRegisterService.class); namingHandlerRegisterService.register(new UIJettyNamingHandler(namingListener)); + CacheServiceManager cacheServiceManager = initCacheServiceManager(); + DAOService daoService = getManager().find(StorageModule.NAME).getService(DAOService.class); JettyManagerService managerService = getManager().find(JettyManagerModule.NAME).getService(JettyManagerService.class); Server jettyServer = managerService.getOrCreateIfAbsent(host, port, contextPath); - addHandlers(daoService, jettyServer); + addHandlers(daoService, jettyServer, cacheServiceManager); } catch (ModuleNotFoundException e) { throw new ServiceNotProvidedException(e.getMessage()); } @@ -101,22 +109,36 @@ public class UIModuleJettyProvider extends ModuleProvider { } @Override public String[] requiredModules() { - return new String[] {ClusterModule.NAME, JettyManagerModule.NAME, NamingModule.NAME}; + return new String[] {ClusterModule.NAME, JettyManagerModule.NAME, NamingModule.NAME, CacheModule.NAME}; + } + + private void addHandlers(DAOService daoService, Server jettyServer, CacheServiceManager cacheServiceManager) { + jettyServer.addHandler(new ApplicationsGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new InstanceHealthGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new InstanceMetricGetOneTimeBucketHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new InstanceMetricGetRangeTimeBucketHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new InstanceOsInfoGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new EntryServiceGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new ServiceTreeGetByIdHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new AllInstanceLastTimeGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new OneInstanceLastTimeGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new SegmentTopGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new SpanGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new TraceDagGetHandler(daoService, cacheServiceManager)); + jettyServer.addHandler(new TraceStackGetHandler(daoService, cacheServiceManager)); } - private void addHandlers(DAOService daoService, Server jettyServer) { - jettyServer.addHandler(new ApplicationsGetHandler(daoService)); - jettyServer.addHandler(new InstanceHealthGetHandler(daoService)); - jettyServer.addHandler(new InstanceMetricGetOneTimeBucketHandler(daoService)); - jettyServer.addHandler(new InstanceMetricGetRangeTimeBucketHandler(daoService)); - jettyServer.addHandler(new InstanceOsInfoGetHandler(daoService)); - jettyServer.addHandler(new EntryServiceGetHandler(daoService)); - jettyServer.addHandler(new ServiceTreeGetByIdHandler(daoService)); - jettyServer.addHandler(new AllInstanceLastTimeGetHandler(daoService)); - jettyServer.addHandler(new OneInstanceLastTimeGetHandler(daoService)); - jettyServer.addHandler(new SegmentTopGetHandler(daoService)); - jettyServer.addHandler(new SpanGetHandler(daoService)); - jettyServer.addHandler(new TraceDagGetHandler(daoService)); - jettyServer.addHandler(new TraceStackGetHandler(daoService)); + private CacheServiceManager initCacheServiceManager() throws ModuleNotFoundException, ServiceNotProvidedException { + ApplicationCacheService applicationCacheService = getManager().find(CacheModule.NAME).getService(ApplicationCacheService.class); + InstanceCacheService instanceCacheService = getManager().find(CacheModule.NAME).getService(InstanceCacheService.class); + ServiceIdCacheService serviceIdCacheService = getManager().find(CacheModule.NAME).getService(ServiceIdCacheService.class); + ServiceNameCacheService serviceNameCacheService = getManager().find(CacheModule.NAME).getService(ServiceNameCacheService.class); + + CacheServiceManager serviceManager = new CacheServiceManager(); + serviceManager.setApplicationCacheService(applicationCacheService); + serviceManager.setInstanceCacheService(instanceCacheService); + serviceManager.setServiceIdCacheService(serviceIdCacheService); + serviceManager.setServiceNameCacheService(serviceNameCacheService); + return serviceManager; } } 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 cb7e5e12ed..86f5a5a203 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,6 +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.ui.service.SegmentTopService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +43,8 @@ public class SegmentTopGetHandler extends JettyHandler { private final SegmentTopService service; - public SegmentTopGetHandler(DAOService daoService) { - this.service = new SegmentTopService(daoService); + public SegmentTopGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new SegmentTopService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 38aede49a3..c144c8f84a 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,6 +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.ui.service.SpanService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class SpanGetHandler extends JettyHandler { private final SpanService service; - public SpanGetHandler(DAOService daoService) { - this.service = new SpanService(daoService); + public SpanGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new SpanService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 a178ac7d97..8550f16f1f 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,6 +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.ui.service.TraceDagService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class TraceDagGetHandler extends JettyHandler { private final TraceDagService service; - public TraceDagGetHandler(DAOService daoService) { - this.service = new TraceDagService(daoService); + public TraceDagGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new TraceDagService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 e54e9d07fb..03f091222e 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,6 +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.ui.service.TraceStackService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class TraceStackGetHandler extends JettyHandler { private final TraceStackService service; - public TraceStackGetHandler(DAOService daoService) { - this.service = new TraceStackService(daoService); + public TraceStackGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new TraceStackService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 6c0f48127d..ac9d5ddd99 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,6 +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class ApplicationsGetHandler extends JettyHandler { private final ApplicationService applicationService; - public ApplicationsGetHandler(DAOService daoService) { - this.applicationService = new ApplicationService(daoService); + public ApplicationsGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.applicationService = new ApplicationService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 398d68440c..4e8c934aa1 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,6 +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.ui.service.InstanceHealthService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +43,8 @@ public class InstanceHealthGetHandler extends JettyHandler { private final InstanceHealthService service; - public InstanceHealthGetHandler(DAOService daoService) { - this.service = new InstanceHealthService(daoService); + public InstanceHealthGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new InstanceHealthService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 6522e89fe6..31934be18c 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,6 +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.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +43,8 @@ public class InstanceMetricGetOneTimeBucketHandler extends JettyHandler { private final InstanceJVMService service; - public InstanceMetricGetOneTimeBucketHandler(DAOService daoService) { - this.service = new InstanceJVMService(daoService); + public InstanceMetricGetOneTimeBucketHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new InstanceJVMService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 aa6d5f7d68..2a98f829bd 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,6 +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.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,8 +43,8 @@ public class InstanceMetricGetRangeTimeBucketHandler extends JettyHandler { private final InstanceJVMService service; - public InstanceMetricGetRangeTimeBucketHandler(DAOService daoService) { - this.service = new InstanceJVMService(daoService); + public InstanceMetricGetRangeTimeBucketHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new InstanceJVMService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 cc103d47b1..c2512d5651 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,6 +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.ui.service.InstanceJVMService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class InstanceOsInfoGetHandler extends JettyHandler { private final InstanceJVMService service; - public InstanceOsInfoGetHandler(DAOService daoService) { - this.service = new InstanceJVMService(daoService); + public InstanceOsInfoGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new InstanceJVMService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 cdb3fb574d..9dfb29976f 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,6 +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.ui.service.ServiceTreeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class EntryServiceGetHandler extends JettyHandler { private final ServiceTreeService service; - public EntryServiceGetHandler(DAOService daoService) { - this.service = new ServiceTreeService(daoService); + public EntryServiceGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new ServiceTreeService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 9675b54bb6..280fac6514 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,6 +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.ui.service.ServiceTreeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +41,8 @@ public class ServiceTreeGetByIdHandler extends JettyHandler { private final ServiceTreeService service; - public ServiceTreeGetByIdHandler(DAOService daoService) { - this.service = new ServiceTreeService(daoService); + public ServiceTreeGetByIdHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new ServiceTreeService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 9d43b0acfc..aa2bccb4a9 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,6 +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.ui.service.TimeSynchronousService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +44,8 @@ public class AllInstanceLastTimeGetHandler extends JettyHandler { private final TimeSynchronousService service; - public AllInstanceLastTimeGetHandler(DAOService daoService) { - this.service = new TimeSynchronousService(daoService); + public AllInstanceLastTimeGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new TimeSynchronousService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 b561e9fc9d..57e3718370 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,6 +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.ui.service.TimeSynchronousService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,8 +42,8 @@ public class OneInstanceLastTimeGetHandler extends JettyHandler { private final TimeSynchronousService service; - public OneInstanceLastTimeGetHandler(DAOService daoService) { - this.service = new TimeSynchronousService(daoService); + public OneInstanceLastTimeGetHandler(DAOService daoService, CacheServiceManager cacheServiceManager) { + this.service = new TimeSynchronousService(daoService, cacheServiceManager); } @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException { 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 11a7559e43..5919fd2e07 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,7 +20,6 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.storage.dao.IInstanceUIDAO; import org.skywalking.apm.collector.storage.service.DAOService; @@ -30,9 +29,11 @@ import org.skywalking.apm.collector.storage.service.DAOService; public class ApplicationService { private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public ApplicationService(DAOService daoService) { + public ApplicationService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonArray getApplications(long startTime, long endTime) { @@ -42,7 +43,7 @@ public class ApplicationService { applications.forEach(jsonElement -> { JsonObject application = jsonElement.getAsJsonObject(); int applicationId = application.get("applicationId").getAsInt(); - String applicationCode = ApplicationCache.get(applicationId); + String applicationCode = cacheServiceManager.getApplicationCacheService().get(applicationId); application.addProperty("applicationCode", applicationCode); }); return applications; diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java new file mode 100644 index 0000000000..a348bd4668 --- /dev/null +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java @@ -0,0 +1,69 @@ +/* + * 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.ui.service; + +import org.skywalking.apm.collector.cache.service.ApplicationCacheService; +import org.skywalking.apm.collector.cache.service.InstanceCacheService; +import org.skywalking.apm.collector.cache.service.ServiceIdCacheService; +import org.skywalking.apm.collector.cache.service.ServiceNameCacheService; + +/** + * @author peng-yongsheng + */ +public class CacheServiceManager { + + private ApplicationCacheService applicationCacheService; + private InstanceCacheService instanceCacheService; + private ServiceIdCacheService serviceIdCacheService; + private ServiceNameCacheService serviceNameCacheService; + + public ApplicationCacheService getApplicationCacheService() { + return applicationCacheService; + } + + public void setApplicationCacheService( + ApplicationCacheService applicationCacheService) { + this.applicationCacheService = applicationCacheService; + } + + public InstanceCacheService getInstanceCacheService() { + return instanceCacheService; + } + + public void setInstanceCacheService(InstanceCacheService instanceCacheService) { + this.instanceCacheService = instanceCacheService; + } + + public ServiceIdCacheService getServiceIdCacheService() { + return serviceIdCacheService; + } + + public void setServiceIdCacheService(ServiceIdCacheService serviceIdCacheService) { + this.serviceIdCacheService = serviceIdCacheService; + } + + public ServiceNameCacheService getServiceNameCacheService() { + return serviceNameCacheService; + } + + public void setServiceNameCacheService( + ServiceNameCacheService serviceNameCacheService) { + this.serviceNameCacheService = serviceNameCacheService; + } +} 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 d69a2a2dc5..55bdebdb96 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,7 +21,6 @@ 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.ApplicationCache; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IGCMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IInstPerformanceUIDAO; @@ -39,9 +38,11 @@ public class InstanceHealthService { private final Logger logger = LoggerFactory.getLogger(InstanceHealthService.class); private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public InstanceHealthService(DAOService daoService) { + public InstanceHealthService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject getInstances(long timeBucket, int applicationId) { @@ -56,7 +57,7 @@ public class InstanceHealthService { response.add("instances", instances); instanceList.forEach(instance -> { - response.addProperty("applicationCode", ApplicationCache.get(applicationId)); + response.addProperty("applicationCode", cacheServiceManager.getApplicationCacheService().get(applicationId)); response.addProperty("applicationId", applicationId); IInstPerformanceUIDAO instPerformanceDAO = (IInstPerformanceUIDAO)daoService.get(IInstPerformanceUIDAO.class); 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 29e128fb9a..ab412c534f 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 @@ -45,9 +45,11 @@ public class InstanceJVMService { private final Gson gson = new Gson(); private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public InstanceJVMService(DAOService daoService) { + public InstanceJVMService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject getInstanceOsInfo(int instanceId) { 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 1771824c38..04d94c032f 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 @@ -36,9 +36,11 @@ public class SegmentTopService { private final Logger logger = LoggerFactory.getLogger(SegmentTopService.class); private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public SegmentTopService(DAOService daoService) { + public SegmentTopService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject loadTop(long startTime, long endTime, long minCost, long maxCost, String operationName, 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 d3f9d69d89..cfa960ca19 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,7 +23,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import java.util.Iterator; import java.util.Map; -import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils; @@ -39,9 +38,11 @@ import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceTab public class ServiceTreeService { private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public ServiceTreeService(DAOService daoService) { + public ServiceTreeService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject loadEntryService(int applicationId, String entryServiceName, long startTime, long endTime, @@ -53,7 +54,7 @@ public class ServiceTreeService { for (JsonElement element : entryServices) { JsonObject entryService = element.getAsJsonObject(); int respApplication = entryService.get(ColumnNameUtils.INSTANCE.rename(ServiceEntryTable.COLUMN_APPLICATION_ID)).getAsInt(); - String applicationCode = ApplicationCache.get(respApplication); + String applicationCode = cacheServiceManager.getApplicationCacheService().get(respApplication); entryService.addProperty("applicationCode", applicationCode); } 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 c4e032b0f5..6436cb940b 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,8 +21,6 @@ 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.ApplicationCache; -import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.dao.ISegmentUIDAO; @@ -39,9 +37,11 @@ import org.skywalking.apm.network.trace.component.ComponentsDefine; public class SpanService { private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public SpanService(DAOService daoService) { + public SpanService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject load(String segmentId, int spanId) { @@ -54,7 +54,7 @@ public class SpanService { if (spanId == spanObject.getSpanId()) { String operationName = spanObject.getOperationName(); if (spanObject.getOperationNameId() != 0) { - String serviceName = ServiceNameCache.get(spanObject.getOperationNameId()); + String serviceName = cacheServiceManager.getServiceNameCacheService().get(spanObject.getOperationNameId()); if (StringUtils.isNotEmpty(serviceName)) { operationName = serviceName.split(Const.ID_SPLIT)[1]; } @@ -102,7 +102,7 @@ public class SpanService { if (spanObject.getPeerId() == 0) { peerJson.addProperty("value", spanObject.getPeer()); } else { - peerJson.addProperty("value", ApplicationCache.get(spanObject.getPeerId())); + peerJson.addProperty("value", cacheServiceManager.getServiceNameCacheService().get(spanObject.getPeerId())); } tagsArray.add(peerJson); 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 8fc7671ddc..0172124cba 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 @@ -31,9 +31,11 @@ public class TimeSynchronousService { private final Logger logger = LoggerFactory.getLogger(TimeSynchronousService.class); private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public TimeSynchronousService(DAOService daoService) { + public TimeSynchronousService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public Long allInstanceLastTime() { diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java index 1249a0d750..7de9db66bf 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public class TraceDagDataBuilder { private final Logger logger = LoggerFactory.getLogger(TraceDagDataBuilder.class); - private Integer nodeId = new Integer(-1); + private Integer nodeId = -1; private Map mappingMap = new HashMap<>(); private Map nodeCompMap = new HashMap<>(); private Map nodeIdMap = new HashMap<>(); 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 04b7e07f1f..ae80cd47af 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 @@ -35,9 +35,11 @@ public class TraceDagService { private final Logger logger = LoggerFactory.getLogger(TraceDagService.class); private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public TraceDagService(DAOService daoService) { + public TraceDagService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonObject load(long startTime, long endTime) { 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 974788901f..052a238a9e 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,8 +22,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import java.util.ArrayList; import java.util.List; -import org.skywalking.apm.collector.cache.ApplicationCache; -import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils; @@ -42,9 +40,11 @@ import org.skywalking.apm.network.proto.UniqueId; public class TraceStackService { private final DAOService daoService; + private final CacheServiceManager cacheServiceManager; - public TraceStackService(DAOService daoService) { + public TraceStackService(DAOService daoService, CacheServiceManager cacheServiceManager) { this.daoService = daoService; + this.cacheServiceManager = cacheServiceManager; } public JsonArray load(String globalTraceId) { @@ -123,14 +123,14 @@ public class TraceStackService { String operationName = spanObject.getOperationName(); if (spanObject.getOperationNameId() != 0) { - String serviceName = ServiceNameCache.get(spanObject.getOperationNameId()); + String serviceName = cacheServiceManager.getServiceNameCacheService().get(spanObject.getOperationNameId()); if (StringUtils.isNotEmpty(serviceName)) { operationName = serviceName.split(Const.ID_SPLIT)[1]; } else { operationName = Const.EMPTY_STRING; } } - String applicationCode = ApplicationCache.get(segment.getApplicationId()); + String applicationCode = cacheServiceManager.getApplicationCacheService().get(segment.getApplicationId()); long cost = spanObject.getEndTime() - spanObject.getStartTime(); if (cost == 0) { diff --git a/apm-collector/apm-collector-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml index c8ead2bbce..e3520b03b2 100644 --- a/apm-collector/apm-collector-ui/pom.xml +++ b/apm-collector/apm-collector-ui/pom.xml @@ -22,10 +22,5 @@ apm-collector-core ${project.version} - - org.skywalking - apm-collector-cache - ${project.version} - \ No newline at end of file -- GitLab