Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
27dfc3e5
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
27dfc3e5
编写于
11月 09, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use cache service from cache module.
上级
b1e2ebd4
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
187 addition
and
72 deletion
+187
-72
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
...ctor/apm-collector-ui/collector-ui-jetty-provider/pom.xml
+5
-0
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
...walking/apm/collector/ui/jetty/UIModuleJettyProvider.java
+38
-16
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java
.../apm/collector/ui/jetty/handler/SegmentTopGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java
...alking/apm/collector/ui/jetty/handler/SpanGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java
...ng/apm/collector/ui/jetty/handler/TraceDagGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java
.../apm/collector/ui/jetty/handler/TraceStackGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java
.../ui/jetty/handler/application/ApplicationsGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java
...etty/handler/instancehealth/InstanceHealthGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java
...instancemetric/InstanceMetricGetOneTimeBucketHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java
...stancemetric/InstanceMetricGetRangeTimeBucketHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java
...etty/handler/instancemetric/InstanceOsInfoGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java
.../ui/jetty/handler/servicetree/EntryServiceGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java
.../jetty/handler/servicetree/ServiceTreeGetByIdHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java
.../ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java
.../ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java
+3
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java
...ywalking/apm/collector/ui/service/ApplicationService.java
+4
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java
...walking/apm/collector/ui/service/CacheServiceManager.java
+69
-0
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java
...lking/apm/collector/ui/service/InstanceHealthService.java
+4
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java
...ywalking/apm/collector/ui/service/InstanceJVMService.java
+3
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java
...kywalking/apm/collector/ui/service/SegmentTopService.java
+3
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java
...ywalking/apm/collector/ui/service/ServiceTreeService.java
+4
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
.../org/skywalking/apm/collector/ui/service/SpanService.java
+5
-5
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java
...king/apm/collector/ui/service/TimeSynchronousService.java
+3
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java
...walking/apm/collector/ui/service/TraceDagDataBuilder.java
+2
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java
.../skywalking/apm/collector/ui/service/TraceDagService.java
+3
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java
...kywalking/apm/collector/ui/service/TraceStackService.java
+5
-5
apm-collector/apm-collector-ui/pom.xml
apm-collector/apm-collector-ui/pom.xml
+0
-5
未找到文件。
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
浏览文件 @
27dfc3e5
...
...
@@ -56,5 +56,10 @@
<artifactId>
collector-storage-define
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-cache-define
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
浏览文件 @
27dfc3e5
...
...
@@ -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
;
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/EntryServiceGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java
浏览文件 @
27dfc3e5
...
...
@@ -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
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
;
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/CacheServiceManager.java
0 → 100644
浏览文件 @
27dfc3e5
/*
* 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
;
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
);
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
)
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
,
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
);
}
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
);
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
()
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java
浏览文件 @
27dfc3e5
...
...
@@ -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.
defin
e.noderef.NodeReferenceTable
;
import
org.skywalking.apm.collector.storage.
tabl
e.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
<
String
,
String
>
mappingMap
=
new
HashMap
<>();
private
Map
<
String
,
String
>
nodeCompMap
=
new
HashMap
<>();
private
Map
<
String
,
Integer
>
nodeIdMap
=
new
HashMap
<>();
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
)
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java
浏览文件 @
27dfc3e5
...
...
@@ -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
)
{
...
...
apm-collector/apm-collector-ui/pom.xml
浏览文件 @
27dfc3e5
...
...
@@ -22,10 +22,5 @@
<artifactId>
apm-collector-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-collector-cache
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录