Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
2ccee15b
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
2ccee15b
编写于
8月 11, 2017
作者:
wu-sheng
提交者:
GitHub
8月 11, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #353 from wu-sheng/feature/351
Feature/351
上级
604fcdeb
903a15a3
变更
90
隐藏空白更改
内联
并排
Showing
90 changed file
with
303 addition
and
69 deletion
+303
-69
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java
...ector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java
+1
-1
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricTable.java
.../collector/agentjvm/worker/cpu/define/CpuMetricTable.java
+1
-1
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricTable.java
...pm/collector/agentjvm/worker/gc/define/GCMetricTable.java
+1
-1
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricTable.java
...ctor/agentjvm/worker/memory/define/MemoryMetricTable.java
+1
-1
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricTable.java
...ntjvm/worker/memorypool/define/MemoryPoolMetricTable.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/cache/ServiceNameCache.java
.../collector/agentstream/worker/cache/ServiceNameCache.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java
...ector/agentstream/worker/global/dao/GlobalTraceEsDAO.java
+4
-3
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceDataDefine.java
...entstream/worker/global/define/GlobalTraceDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java
...stream/worker/global/define/GlobalTraceEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java
...stream/worker/global/define/GlobalTraceH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java
...ream/worker/node/component/NodeComponentSpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java
...tstream/worker/node/component/dao/NodeComponentEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentDataDefine.java
...worker/node/component/define/NodeComponentDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java
...ker/node/component/define/NodeComponentEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java
...ker/node/component/define/NodeComponentH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java
...ntstream/worker/node/mapping/NodeMappingSpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java
...agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingDataDefine.java
...eam/worker/node/mapping/define/NodeMappingDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java
.../worker/node/mapping/define/NodeMappingEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java
.../worker/node/mapping/define/NodeMappingH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/NodeRefSpanListener.java
...tstream/worker/noderef/reference/NodeRefSpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/dao/NodeReferenceEsDAO.java
...ream/worker/noderef/reference/dao/NodeReferenceEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefDataDefine.java
...am/worker/noderef/reference/define/NodeRefDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefEsTableDefine.java
...worker/noderef/reference/define/NodeRefEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefH2TableDefine.java
...worker/noderef/reference/define/NodeRefH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/NodeRefSumSpanListener.java
...stream/worker/noderef/summary/NodeRefSumSpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/dao/NodeRefSumEsDAO.java
...entstream/worker/noderef/summary/dao/NodeRefSumEsDAO.java
+2
-2
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumDataDefine.java
...m/worker/noderef/summary/define/NodeRefSumDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumEsTableDefine.java
...orker/noderef/summary/define/NodeRefSumEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumH2TableDefine.java
...orker/noderef/summary/define/NodeRefSumH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationDataDefine.java
...am/worker/register/application/ApplicationDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationEsTableDefine.java
...worker/register/application/ApplicationEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationH2TableDefine.java
...worker/register/application/ApplicationH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationRegisterSerialWorker.java
...register/application/ApplicationRegisterSerialWorker.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/dao/ApplicationEsDAO.java
...eam/worker/register/application/dao/ApplicationEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceDataDefine.java
...ntstream/worker/register/instance/InstanceDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceEsTableDefine.java
...tream/worker/register/instance/InstanceEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceH2TableDefine.java
...tream/worker/register/instance/InstanceH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/dao/InstanceEsDAO.java
...entstream/worker/register/instance/dao/InstanceEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameDataDefine.java
...am/worker/register/servicename/ServiceNameDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameEsTableDefine.java
...worker/register/servicename/ServiceNameEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameH2TableDefine.java
...worker/register/servicename/ServiceNameH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/dao/ServiceNameEsDAO.java
...eam/worker/register/servicename/dao/ServiceNameEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java
...agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostDataDefine.java
...eam/worker/segment/cost/define/SegmentCostDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java
.../worker/segment/cost/define/SegmentCostEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java
.../worker/segment/cost/define/SegmentCostH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java
...r/agentstream/worker/segment/origin/dao/SegmentEsDAO.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentDataDefine.java
...tream/worker/segment/origin/define/SegmentDataDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java
...am/worker/segment/origin/define/SegmentEsTableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java
...am/worker/segment/origin/define/SegmentH2TableDefine.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java
...stream/worker/service/entry/ServiceEntrySpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryTable.java
...stream/worker/service/entry/define/ServiceEntryTable.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/reference/ServiceRefSpanListener.java
...m/worker/serviceref/reference/ServiceRefSpanListener.java
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/reference/define/ServiceRefTable.java
...m/worker/serviceref/reference/define/ServiceRefTable.java
+1
-1
apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java
...kywalking/apm/collector/agentstream/mock/SegmentPost.java
+10
-0
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java
...ywalking/apm/collector/core/storage/StorageInstaller.java
+2
-2
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/Const.java
...in/java/org/skywalking/apm/collector/core/util/Const.java
+3
-1
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/CommonTable.java
...g/skywalking/apm/collector/storage/table/CommonTable.java
+1
-1
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java
.../apm/collector/storage/table/global/GlobalTraceTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java
.../apm/collector/storage/table/node/NodeComponentTable.java
+10
-0
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java
...ng/apm/collector/storage/table/node/NodeMappingTable.java
+10
-0
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeRefSumTable.java
.../apm/collector/storage/table/noderef/NodeRefSumTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeRefTable.java
...ing/apm/collector/storage/table/noderef/NodeRefTable.java
+10
-0
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java
...pm/collector/storage/table/register/ApplicationTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java
...g/apm/collector/storage/table/register/InstanceTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java
...pm/collector/storage/table/register/ServiceNameTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java
...apm/collector/storage/table/segment/SegmentCostTable.java
+2
-2
apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java
...ing/apm/collector/storage/table/segment/SegmentTable.java
+2
-2
apm-collector/apm-collector-ui/pom.xml
apm-collector/apm-collector-ui/pom.xml
+0
-5
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/cache/ApplicationCache.java
...g/skywalking/apm/collector/ui/cache/ApplicationCache.java
+27
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/cache/ServiceNameCache.java
...g/skywalking/apm/collector/ui/cache/ServiceNameCache.java
+27
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ApplicationEsDAO.java
...org/skywalking/apm/collector/ui/dao/ApplicationEsDAO.java
+30
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ApplicationH2DAO.java
...org/skywalking/apm/collector/ui/dao/ApplicationH2DAO.java
+13
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java
...org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java
+1
-1
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IApplicationDAO.java
.../org/skywalking/apm/collector/ui/dao/IApplicationDAO.java
+8
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceNameDAO.java
.../org/skywalking/apm/collector/ui/dao/IServiceNameDAO.java
+8
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java
...g/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java
+2
-2
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java
...org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java
+2
-2
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeRefSumEsDAO.java
.../org/skywalking/apm/collector/ui/dao/NodeRefSumEsDAO.java
+2
-2
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java
...g/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java
+2
-2
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java
...org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java
+2
-2
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java
...ava/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java
+1
-1
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceNameEsDAO.java
...org/skywalking/apm/collector/ui/dao/ServiceNameEsDAO.java
+25
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceNameH2DAO.java
...org/skywalking/apm/collector/ui/dao/ServiceNameH2DAO.java
+13
-0
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
.../org/skywalking/apm/collector/ui/service/SpanService.java
+6
-1
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java
...walking/apm/collector/ui/service/TraceDagDataBuilder.java
+1
-1
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java
...kywalking/apm/collector/ui/service/TraceStackService.java
+8
-2
apm-collector/apm-collector-ui/src/main/resources/META-INF/defines/es_dao.define
...ctor-ui/src/main/resources/META-INF/defines/es_dao.define
+3
-1
apm-collector/apm-collector-ui/src/main/resources/META-INF/defines/h2_dao.define
...ctor-ui/src/main/resources/META-INF/defines/h2_dao.define
+3
-1
未找到文件。
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java
浏览文件 @
2ccee15b
...
...
@@ -16,7 +16,7 @@ import org.skywalking.apm.collector.stream.StreamModuleContext;
import
org.skywalking.apm.collector.stream.StreamModuleGroupDefine
;
import
org.skywalking.apm.collector.stream.worker.WorkerInvokeException
;
import
org.skywalking.apm.collector.stream.worker.WorkerNotFoundException
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.stream.worker.util.TimeBucketUtils
;
import
org.skywalking.apm.network.proto.CPU
;
import
org.skywalking.apm.network.proto.Downstream
;
...
...
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentjvm.worker.cpu.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentjvm.worker.gc.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentjvm.worker.memory.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentjvm.worker.memorypool.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/cache/ServiceNameCache.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.cache;
import
com.google.common.cache.Cache
;
import
com.google.common.cache.CacheBuilder
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.register.servicename.dao.IServiceNameDAO
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -4,8 +4,9 @@ import java.util.HashMap;
import
java.util.Map
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.global.define.GlobalTraceTable
;
import
org.skywalking.apm.collector.
core.framework.UnexpectedException
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
import
org.skywalking.apm.collector.stream.worker.impl.data.DataDefine
;
...
...
@@ -20,11 +21,11 @@ public class GlobalTraceEsDAO extends EsDAO implements IGlobalTraceDAO, IPersist
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
GlobalTraceEsDAO
.
class
);
@Override
public
Data
get
(
String
id
,
DataDefine
dataDefine
)
{
return
null
;
throw
new
UnexpectedException
(
"There is no need to merge stream data with database data."
)
;
}
@Override
public
UpdateRequestBuilder
prepareBatchUpdate
(
Data
data
)
{
return
null
;
throw
new
UnexpectedException
(
"There is no need to merge stream data with database data."
)
;
}
@Override
public
IndexRequestBuilder
prepareBatchInsert
(
Data
data
)
{
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.global.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.global.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.global.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.component;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.node.component.define.NodeComponentDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.segment.EntrySpanListener
;
import
org.skywalking.apm.collector.agentstream.worker.segment.ExitSpanListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -5,7 +5,7 @@ import java.util.Map;
import
org.elasticsearch.action.get.GetResponse
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.node.component.defin
e.NodeComponentTable
;
import
org.skywalking.apm.collector.
storage.table.nod
e.NodeComponentTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.node.component.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.node.NodeComponentTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.component.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.node.NodeComponentTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.component.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.node.NodeComponentTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.node.mapping.define.NodeMappingDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.segment.FirstSpanListener
;
import
org.skywalking.apm.collector.agentstream.worker.segment.RefsListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -5,7 +5,7 @@ import java.util.Map;
import
org.elasticsearch.action.get.GetResponse
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.node.mapping.defin
e.NodeMappingTable
;
import
org.skywalking.apm.collector.
storage.table.nod
e.NodeMappingTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.node.mapping.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.node.NodeMappingTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.node.NodeMappingTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.node.NodeMappingTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/NodeRefSpanListener.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.reference;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.cache.InstanceCache
;
import
org.skywalking.apm.collector.agentstream.worker.noderef.reference.define.NodeRefDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.segment.EntrySpanListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/dao/NodeReferenceEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -5,7 +5,7 @@ import java.util.Map;
import
org.elasticsearch.action.get.GetResponse
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.noderef.reference.define
.NodeRefTable
;
import
org.skywalking.apm.collector.
storage.table.noderef
.NodeRefTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.noderef.reference.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.reference.define
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define/NodeRefH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.reference.define
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/NodeRefSumSpanListener.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.summary;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.cache.InstanceCache
;
import
org.skywalking.apm.collector.agentstream.worker.noderef.summary.define.NodeRefSumDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.segment.EntrySpanListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/dao/NodeRefSumEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -5,8 +5,8 @@ import java.util.Map;
import
org.elasticsearch.action.get.GetResponse
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.noderef.reference.define
.NodeRefTable
;
import
org.skywalking.apm.collector.
agentstream.worker.noderef.summary.define
.NodeRefSumTable
;
import
org.skywalking.apm.collector.
storage.table.noderef
.NodeRefTable
;
import
org.skywalking.apm.collector.
storage.table.noderef
.NodeRefSumTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.noderef.summary.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefSumTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.summary.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefSumTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define/NodeRefSumH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.summary.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefSumTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.register.application
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.register.ApplicationTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.DataDefine
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.application;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.register.ApplicationTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.application;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.register.ApplicationTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/ApplicationRegisterSerialWorker.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.register.application
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.register.IdAutoIncrement
;
import
org.skywalking.apm.collector.agentstream.worker.register.application.dao.IApplicationDAO
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application/dao/ApplicationEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -10,7 +10,7 @@ import org.elasticsearch.action.support.WriteRequest;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.SearchHit
;
import
org.skywalking.apm.collector.agentstream.worker.register.application.ApplicationDataDefine
;
import
org.skywalking.apm.collector.
agentstream.worker.register.application
.ApplicationTable
;
import
org.skywalking.apm.collector.
storage.table.register
.ApplicationTable
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.slf4j.Logger
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.register.instance
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.register.InstanceTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.DataDefine
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.instance;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.register.InstanceTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.instance;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.register.InstanceTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/dao/InstanceEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -13,7 +13,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.SearchHit
;
import
org.skywalking.apm.collector.agentstream.worker.register.instance.InstanceDataDefine
;
import
org.skywalking.apm.collector.
agentstream.worker.register.instance
.InstanceTable
;
import
org.skywalking.apm.collector.
storage.table.register
.InstanceTable
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.slf4j.Logger
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.register.servicename
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.register.ServiceNameTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.DataDefine
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.servicename;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.register.ServiceNameTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/ServiceNameH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.register.servicename;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.register.ServiceNameTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename/dao/ServiceNameEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -11,7 +11,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.SearchHit
;
import
org.skywalking.apm.collector.agentstream.worker.register.servicename.ServiceNameDataDefine
;
import
org.skywalking.apm.collector.
agentstream.worker.register.servicename
.ServiceNameTable
;
import
org.skywalking.apm.collector.
storage.table.register
.ServiceNameTable
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.slf4j.Logger
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -4,7 +4,7 @@ import java.util.HashMap;
import
java.util.Map
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.segment.cost.define
.SegmentCostTable
;
import
org.skywalking.apm.collector.
storage.table.segment
.SegmentCostTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostDataDefine.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.segment.cost.define
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentCostTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentCostTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentCostTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -5,7 +5,7 @@ import java.util.HashMap;
import
java.util.Map
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.
agentstream.worker.segment.origin.define
.SegmentTable
;
import
org.skywalking.apm.collector.
storage.table.segment
.SegmentTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentDataDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.define;
import
com.google.protobuf.ByteString
;
import
org.skywalking.apm.collector.remote.grpc.proto.RemoteData
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentTable
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Attribute
;
import
org.skywalking.apm.collector.stream.worker.impl.data.AttributeType
;
import
org.skywalking.apm.collector.stream.worker.impl.data.Data
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.define;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine
;
import
org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java
浏览文件 @
2ccee15b
...
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.define;
import
org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine
;
import
org.skywalking.apm.collector.storage.h2.define.H2TableDefine
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.service.entry
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.segment.EntrySpanListener
;
import
org.skywalking.apm.collector.agentstream.worker.segment.FirstSpanListener
;
import
org.skywalking.apm.collector.agentstream.worker.segment.RefsListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.service.entry.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/reference/ServiceRefSpanListener.java
浏览文件 @
2ccee15b
...
...
@@ -2,7 +2,7 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref.reference;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.cache.InstanceCache
;
import
org.skywalking.apm.collector.agentstream.worker.segment.EntrySpanListener
;
import
org.skywalking.apm.collector.agentstream.worker.segment.ExitSpanListener
;
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/reference/define/ServiceRefTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.agentstream.worker.serviceref.reference.define
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java
浏览文件 @
2ccee15b
...
...
@@ -3,6 +3,8 @@ package org.skywalking.apm.collector.agentstream.mock;
import
com.google.gson.JsonElement
;
import
java.io.IOException
;
import
org.skywalking.apm.collector.agentstream.HttpClientTools
;
import
org.skywalking.apm.collector.agentstream.worker.register.application.ApplicationDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.register.application.dao.ApplicationEsDAO
;
import
org.skywalking.apm.collector.agentstream.worker.register.instance.InstanceDataDefine
;
import
org.skywalking.apm.collector.agentstream.worker.register.instance.dao.InstanceEsDAO
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
...
...
@@ -25,6 +27,14 @@ public class SegmentPost {
InstanceDataDefine
.
Instance
providerInstance
=
new
InstanceDataDefine
.
Instance
(
"3"
,
3
,
"dubbox-provider"
,
1501858094526L
,
3
);
instanceEsDAO
.
save
(
providerInstance
);
ApplicationEsDAO
applicationEsDAO
=
new
ApplicationEsDAO
();
applicationEsDAO
.
setClient
(
client
);
ApplicationDataDefine
.
Application
consumerApplication
=
new
ApplicationDataDefine
.
Application
(
"2"
,
"dubbox-consumer"
,
2
);
applicationEsDAO
.
save
(
consumerApplication
);
ApplicationDataDefine
.
Application
providerApplication
=
new
ApplicationDataDefine
.
Application
(
"3"
,
"dubbox-provider"
,
3
);
applicationEsDAO
.
save
(
providerApplication
);
JsonElement
consumer
=
JsonFileReader
.
INSTANCE
.
read
(
"json/segment/normal/dubbox-consumer.json"
);
HttpClientTools
.
INSTANCE
.
post
(
"http://localhost:12800/segments"
,
consumer
.
toString
());
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/storage/StorageInstaller.java
浏览文件 @
2ccee15b
...
...
@@ -23,11 +23,11 @@ public abstract class StorageInstaller {
if
(!
isExists
(
client
,
tableDefine
))
{
logger
.
info
(
"table: {} not exists"
,
tableDefine
.
getName
());
tableDefine
.
initialize
();
createTable
(
client
,
tableDefine
);
}
else
{
logger
.
info
(
"table: {} exists"
,
tableDefine
.
getName
());
deleteTable
(
client
,
tableDefine
);
//
deleteTable(client, tableDefine);
}
createTable
(
client
,
tableDefine
);
}
}
catch
(
DefineException
e
)
{
throw
new
StorageInstallException
(
e
.
getMessage
(),
e
);
...
...
apm-collector/apm-collector-
stream/src/main/java/org/skywalking/apm/collector/stream/worker
/util/Const.java
→
apm-collector/apm-collector-
core/src/main/java/org/skywalking/apm/collector/core
/util/Const.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
stream.worker
.util
;
package
org.skywalking.apm.collector.
core
.util
;
/**
* @author pengys5
...
...
@@ -9,4 +9,6 @@ public class Const {
public
static
final
int
USER_ID
=
1
;
public
static
final
String
USER_CODE
=
"User"
;
public
static
final
String
SEGMENT_SPAN_SPLIT
=
"S"
;
public
static
final
String
UNKNOWN
=
"Unknown"
;
public
static
final
String
EXCEPTION
=
"Exception"
;
}
apm-collector/apm-collector-st
ream/src/main/java/org/skywalking/apm/collector/stream/worker/storag
e/CommonTable.java
→
apm-collector/apm-collector-st
orage/src/main/java/org/skywalking/apm/collector/storage/tabl
e/CommonTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.st
ream.worker.storag
e
;
package
org.skywalking.apm.collector.st
orage.tabl
e
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define
/GlobalTraceTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/global
/GlobalTraceTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.global.define
;
package
org.skywalking.apm.collector.
storage.table.global
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/defin
e/NodeComponentTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/nod
e/NodeComponentTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.node.component.defin
e
;
package
org.skywalking.apm.collector.
storage.table.nod
e
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/defin
e/NodeMappingTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/nod
e/NodeMappingTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.node.mapping.defin
e
;
package
org.skywalking.apm.collector.
storage.table.nod
e
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/summary/define
/NodeRefSumTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/noderef
/NodeRefSumTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.noderef.summary.define
;
package
org.skywalking.apm.collector.
storage.table.noderef
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/reference/define
/NodeRefTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/noderef
/NodeRefTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.noderef.reference.define
;
package
org.skywalking.apm.collector.
storage.table.noderef
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/application
/ApplicationTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/register
/ApplicationTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.register.application
;
package
org.skywalking.apm.collector.
storage.table.register
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance
/InstanceTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/register
/InstanceTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.register.instance
;
package
org.skywalking.apm.collector.
storage.table.register
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/servicename
/ServiceNameTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/register
/ServiceNameTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.register.servicename
;
package
org.skywalking.apm.collector.
storage.table.register
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define
/SegmentCostTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/segment
/SegmentCostTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.segment.cost.define
;
package
org.skywalking.apm.collector.
storage.table.segment
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-
agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define
/SegmentTable.java
→
apm-collector/apm-collector-
storage/src/main/java/org/skywalking/apm/collector/storage/table/segment
/SegmentTable.java
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.
agentstream.worker.segment.origin.define
;
package
org.skywalking.apm.collector.
storage.table.segment
;
import
org.skywalking.apm.collector.st
ream.worker.storag
e.CommonTable
;
import
org.skywalking.apm.collector.st
orage.tabl
e.CommonTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-ui/pom.xml
浏览文件 @
2ccee15b
...
...
@@ -33,10 +33,5 @@
<artifactId>
apm-collector-storage
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-collector-agentstream
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/cache/ApplicationCache.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.cache
;
import
com.google.common.cache.Cache
;
import
com.google.common.cache.CacheBuilder
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
import
org.skywalking.apm.collector.ui.dao.IApplicationDAO
;
/**
* @author pengys5
*/
public
class
ApplicationCache
{
//TODO size configuration
private
static
Cache
<
Integer
,
String
>
CACHE
=
CacheBuilder
.
newBuilder
().
maximumSize
(
1000
).
build
();
public
static
String
get
(
int
applicationId
)
{
try
{
return
CACHE
.
get
(
applicationId
,
()
->
{
IApplicationDAO
dao
=
(
IApplicationDAO
)
DAOContainer
.
INSTANCE
.
get
(
IApplicationDAO
.
class
.
getName
());
return
dao
.
getApplicationCode
(
applicationId
);
});
}
catch
(
Throwable
e
)
{
return
Const
.
EXCEPTION
;
}
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/cache/ServiceNameCache.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.cache
;
import
com.google.common.cache.Cache
;
import
com.google.common.cache.CacheBuilder
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
import
org.skywalking.apm.collector.ui.dao.IServiceNameDAO
;
/**
* @author pengys5
*/
public
class
ServiceNameCache
{
//TODO size configuration
private
static
Cache
<
Integer
,
String
>
CACHE
=
CacheBuilder
.
newBuilder
().
maximumSize
(
1000
).
build
();
public
static
String
get
(
int
serviceId
)
{
try
{
return
CACHE
.
get
(
serviceId
,
()
->
{
IServiceNameDAO
dao
=
(
IServiceNameDAO
)
DAOContainer
.
INSTANCE
.
get
(
IServiceNameDAO
.
class
.
getName
());
return
dao
.
getServiceName
(
serviceId
);
});
}
catch
(
Throwable
e
)
{
return
Const
.
EXCEPTION
;
}
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ApplicationEsDAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
import
org.elasticsearch.action.get.GetRequestBuilder
;
import
org.elasticsearch.action.get.GetResponse
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.register.ApplicationTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author pengys5
*/
public
class
ApplicationEsDAO
extends
EsDAO
implements
IApplicationDAO
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ApplicationEsDAO
.
class
);
@Override
public
String
getApplicationCode
(
int
applicationId
)
{
logger
.
debug
(
"get application code, applicationId: {}"
,
applicationId
);
ElasticSearchClient
client
=
getClient
();
GetRequestBuilder
getRequestBuilder
=
client
.
prepareGet
(
ApplicationTable
.
TABLE
,
String
.
valueOf
(
applicationId
));
GetResponse
getResponse
=
getRequestBuilder
.
get
();
if
(
getResponse
.
isExists
())
{
return
(
String
)
getResponse
.
getSource
().
get
(
ApplicationTable
.
COLUMN_APPLICATION_CODE
);
}
return
Const
.
UNKNOWN
;
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ApplicationH2DAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
import
org.skywalking.apm.collector.storage.h2.dao.H2DAO
;
/**
* @author pengys5
*/
public
class
ApplicationH2DAO
extends
H2DAO
implements
IApplicationDAO
{
@Override
public
String
getApplicationCode
(
int
applicationId
)
{
return
null
;
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -7,8 +7,8 @@ import org.elasticsearch.action.search.SearchResponse;
import
org.elasticsearch.action.search.SearchType
;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.SearchHit
;
import
org.skywalking.apm.collector.agentstream.worker.global.define.GlobalTraceTable
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IApplicationDAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
/**
* @author pengys5
*/
public
interface
IApplicationDAO
{
String
getApplicationCode
(
int
applicationId
);
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IServiceNameDAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
/**
* @author pengys5
*/
public
interface
IServiceNameDAO
{
String
getServiceName
(
int
serviceId
);
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -8,9 +8,9 @@ import org.elasticsearch.action.search.SearchType;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.aggregations.AggregationBuilders
;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.skywalking.apm.collector.stream.worker.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.node.component.define.NodeComponentTable
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.node.NodeComponentTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -8,9 +8,9 @@ import org.elasticsearch.action.search.SearchType;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.aggregations.AggregationBuilders
;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.skywalking.apm.collector.stream.worker.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.node.mapping.define.NodeMappingTable
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.node.NodeMappingTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeRefSumEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -10,9 +10,9 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder
;
import
org.elasticsearch.search.aggregations.metrics.sum.Sum
;
import
org.skywalking.apm.collector.stream.worker.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.noderef.summary.define.NodeRefSumTable
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefSumTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -8,9 +8,9 @@ import org.elasticsearch.action.search.SearchType;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.aggregations.AggregationBuilders
;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.skywalking.apm.collector.stream.worker.util.Const
;
import
org.skywalking.apm.collector.agentstream.worker.noderef.reference.define.NodeRefTable
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.noderef.NodeRefTable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -12,12 +12,12 @@ import org.elasticsearch.index.query.QueryBuilders;
import
org.elasticsearch.index.query.RangeQueryBuilder
;
import
org.elasticsearch.search.SearchHit
;
import
org.elasticsearch.search.sort.SortOrder
;
import
org.skywalking.apm.collector.agentstream.worker.global.define.GlobalTraceTable
;
import
org.skywalking.apm.collector.agentstream.worker.segment.cost.define.SegmentCostTable
;
import
org.skywalking.apm.collector.core.util.CollectionUtils
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.global.GlobalTraceTable
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentCostTable
;
/**
* @author pengys5
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java
浏览文件 @
2ccee15b
...
...
@@ -4,9 +4,9 @@ import com.google.protobuf.InvalidProtocolBufferException;
import
java.util.Base64
;
import
java.util.Map
;
import
org.elasticsearch.action.get.GetResponse
;
import
org.skywalking.apm.collector.agentstream.worker.segment.origin.define.SegmentTable
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.segment.SegmentTable
;
import
org.skywalking.apm.network.proto.TraceSegmentObject
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceNameEsDAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
import
org.elasticsearch.action.get.GetRequestBuilder
;
import
org.elasticsearch.action.get.GetResponse
;
import
org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.register.ServiceNameTable
;
/**
* @author pengys5
*/
public
class
ServiceNameEsDAO
extends
EsDAO
implements
IServiceNameDAO
{
@Override
public
String
getServiceName
(
int
serviceId
)
{
ElasticSearchClient
client
=
getClient
();
GetRequestBuilder
getRequestBuilder
=
client
.
prepareGet
(
ServiceNameTable
.
TABLE
,
String
.
valueOf
(
serviceId
));
GetResponse
getResponse
=
getRequestBuilder
.
get
();
if
(
getResponse
.
isExists
())
{
return
(
String
)
getResponse
.
getSource
().
get
(
ServiceNameTable
.
COLUMN_SERVICE_NAME
);
}
return
Const
.
UNKNOWN
;
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceNameH2DAO.java
0 → 100644
浏览文件 @
2ccee15b
package
org.skywalking.apm.collector.ui.dao
;
import
org.skywalking.apm.collector.storage.h2.dao.H2DAO
;
/**
* @author pengys5
*/
public
class
ServiceNameH2DAO
extends
H2DAO
implements
IServiceNameDAO
{
@Override
public
String
getServiceName
(
int
serviceId
)
{
return
null
;
}
}
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
浏览文件 @
2ccee15b
...
...
@@ -4,6 +4,7 @@ import com.google.gson.JsonArray;
import
com.google.gson.JsonObject
;
import
java.util.List
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
import
org.skywalking.apm.collector.ui.cache.ServiceNameCache
;
import
org.skywalking.apm.collector.ui.dao.ISegmentDAO
;
import
org.skywalking.apm.network.proto.KeyWithStringValue
;
import
org.skywalking.apm.network.proto.LogMessage
;
...
...
@@ -23,7 +24,11 @@ public class SpanService {
List
<
SpanObject
>
spans
=
segmentObject
.
getSpansList
();
for
(
SpanObject
spanObject
:
spans
)
{
if
(
spanId
==
spanObject
.
getSpanId
())
{
spanJson
.
addProperty
(
"operationName"
,
spanObject
.
getOperationName
());
String
operationName
=
spanObject
.
getOperationName
();
if
(
spanObject
.
getOperationNameId
()
!=
0
)
{
operationName
=
ServiceNameCache
.
get
(
spanObject
.
getOperationNameId
());
}
spanJson
.
addProperty
(
"operationName"
,
operationName
);
spanJson
.
addProperty
(
"startTime"
,
spanObject
.
getStartTime
());
spanJson
.
addProperty
(
"endTime"
,
spanObject
.
getEndTime
());
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java
浏览文件 @
2ccee15b
...
...
@@ -4,7 +4,7 @@ import com.google.gson.JsonArray;
import
com.google.gson.JsonObject
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.skywalking.apm.collector.
stream.worker
.util.Const
;
import
org.skywalking.apm.collector.
core
.util.Const
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java
浏览文件 @
2ccee15b
...
...
@@ -4,10 +4,12 @@ import com.google.gson.JsonArray;
import
com.google.gson.JsonObject
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.stream.worker.util.Const
;
import
org.skywalking.apm.collector.core.util.CollectionUtils
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.ObjectUtils
;
import
org.skywalking.apm.collector.storage.dao.DAOContainer
;
import
org.skywalking.apm.collector.ui.cache.ApplicationCache
;
import
org.skywalking.apm.collector.ui.cache.ServiceNameCache
;
import
org.skywalking.apm.collector.ui.dao.IGlobalTraceDAO
;
import
org.skywalking.apm.collector.ui.dao.ISegmentDAO
;
import
org.skywalking.apm.network.proto.SpanObject
;
...
...
@@ -93,8 +95,12 @@ public class TraceStackService {
String
segmentSpanId
=
segmentId
+
Const
.
SEGMENT_SPAN_SPLIT
+
String
.
valueOf
(
spanId
);
String
segmentParentSpanId
=
segmentId
+
Const
.
SEGMENT_SPAN_SPLIT
+
String
.
valueOf
(
parentSpanId
);
long
startTime
=
spanObject
.
getStartTime
();
String
operationName
=
spanObject
.
getOperationName
();
String
applicationCode
=
"Code"
+
String
.
valueOf
(
segment
.
getApplicationId
());
if
(
spanObject
.
getOperationNameId
()
!=
0
)
{
operationName
=
ServiceNameCache
.
get
(
spanObject
.
getOperationNameId
());
}
String
applicationCode
=
ApplicationCache
.
get
(
segment
.
getApplicationId
());
long
cost
=
spanObject
.
getEndTime
()
-
spanObject
.
getStartTime
();
if
(
cost
==
0
)
{
...
...
apm-collector/apm-collector-ui/src/main/resources/META-INF/defines/es_dao.define
浏览文件 @
2ccee15b
...
...
@@ -4,4 +4,6 @@ org.skywalking.apm.collector.ui.dao.NodeReferenceEsDAO
org.skywalking.apm.collector.ui.dao.NodeRefSumEsDAO
org.skywalking.apm.collector.ui.dao.SegmentCostEsDAO
org.skywalking.apm.collector.ui.dao.GlobalTraceEsDAO
org.skywalking.apm.collector.ui.dao.SegmentEsDAO
\ No newline at end of file
org.skywalking.apm.collector.ui.dao.SegmentEsDAO
org.skywalking.apm.collector.ui.dao.ApplicationEsDAO
org.skywalking.apm.collector.ui.dao.ServiceNameEsDAO
\ No newline at end of file
apm-collector/apm-collector-ui/src/main/resources/META-INF/defines/h2_dao.define
浏览文件 @
2ccee15b
...
...
@@ -4,4 +4,6 @@ org.skywalking.apm.collector.ui.dao.NodeReferenceH2DAO
org.skywalking.apm.collector.ui.dao.NodeRefSumH2DAO
org.skywalking.apm.collector.ui.dao.SegmentCostH2DAO
org.skywalking.apm.collector.ui.dao.GlobalTraceH2DAO
org.skywalking.apm.collector.ui.dao.SegmentH2DAO
\ No newline at end of file
org.skywalking.apm.collector.ui.dao.SegmentH2DAO
org.skywalking.apm.collector.ui.dao.ApplicationH2DAO
org.skywalking.apm.collector.ui.dao.ServiceNameH2DAO
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录