Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
8c3fbe4c
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,发现更多精彩内容 >>
提交
8c3fbe4c
编写于
11月 16, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Provider agent register and trace stream by http json request.
上级
19367166
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
263 addition
and
24 deletion
+263
-24
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
...agent/grpc/handler/ApplicationRegisterServiceHandler.java
+1
-8
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
...g/apm/collector/agent/jetty/AgentModuleJettyProvider.java
+7
-1
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
...gent/jetty/handler/ApplicationRegisterServletHandler.java
+75
-0
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
.../agent/jetty/handler/InstanceDiscoveryServletHandler.java
+78
-0
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
...ent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
+82
-0
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
...ector/agent/jetty/handler/TraceSegmentServletHandler.java
+8
-1
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferManager.java
...m/collector/agent/stream/buffer/SegmentBufferManager.java
+3
-2
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferReader.java
...pm/collector/agent/stream/buffer/SegmentBufferReader.java
+5
-2
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java
.../parser/standardization/SegmentStandardizationWorker.java
+1
-1
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationIDService.java
...or/agent/stream/worker/register/ApplicationIDService.java
+1
-3
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java
...ector/agent/stream/worker/register/InstanceIDService.java
+2
-6
未找到文件。
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
浏览文件 @
8c3fbe4c
...
...
@@ -22,8 +22,6 @@ import com.google.protobuf.ProtocolStringList;
import
io.grpc.stub.StreamObserver
;
import
org.skywalking.apm.collector.agent.stream.worker.register.ApplicationIDService
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.module.ModuleNotFoundException
;
import
org.skywalking.apm.collector.core.module.ServiceNotProvidedException
;
import
org.skywalking.apm.collector.server.grpc.GRPCHandler
;
import
org.skywalking.apm.network.proto.Application
;
import
org.skywalking.apm.network.proto.ApplicationMapping
;
...
...
@@ -52,12 +50,7 @@ public class ApplicationRegisterServiceHandler extends ApplicationRegisterServic
ApplicationMapping
.
Builder
builder
=
ApplicationMapping
.
newBuilder
();
for
(
int
i
=
0
;
i
<
applicationCodes
.
size
();
i
++)
{
String
applicationCode
=
applicationCodes
.
get
(
i
);
int
applicationId
=
0
;
try
{
applicationId
=
applicationIDService
.
getOrCreate
(
applicationCode
);
}
catch
(
ModuleNotFoundException
|
ServiceNotProvidedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
int
applicationId
=
applicationIDService
.
getOrCreate
(
applicationCode
);
if
(
applicationId
!=
0
)
{
KeyWithIntegerValue
value
=
KeyWithIntegerValue
.
newBuilder
().
setKey
(
applicationCode
).
setValue
(
applicationId
).
build
();
...
...
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
浏览文件 @
8c3fbe4c
...
...
@@ -20,6 +20,9 @@ package org.skywalking.apm.collector.agent.jetty;
import
java.util.Properties
;
import
org.skywalking.apm.collector.agent.AgentModule
;
import
org.skywalking.apm.collector.agent.jetty.handler.ApplicationRegisterServletHandler
;
import
org.skywalking.apm.collector.agent.jetty.handler.InstanceDiscoveryServletHandler
;
import
org.skywalking.apm.collector.agent.jetty.handler.ServiceNameDiscoveryServiceHandler
;
import
org.skywalking.apm.collector.agent.jetty.handler.TraceSegmentServletHandler
;
import
org.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingHandler
;
import
org.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingListener
;
...
...
@@ -89,6 +92,9 @@ public class AgentModuleJettyProvider extends ModuleProvider {
}
private
void
addHandlers
(
Server
jettyServer
)
{
jettyServer
.
addHandler
(
new
TraceSegmentServletHandler
());
jettyServer
.
addHandler
(
new
TraceSegmentServletHandler
(
getManager
()));
jettyServer
.
addHandler
(
new
ApplicationRegisterServletHandler
(
getManager
()));
jettyServer
.
addHandler
(
new
InstanceDiscoveryServletHandler
(
getManager
()));
jettyServer
.
addHandler
(
new
ServiceNameDiscoveryServiceHandler
(
getManager
()));
}
}
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
0 → 100644
浏览文件 @
8c3fbe4c
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.jetty.handler
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
java.io.IOException
;
import
javax.servlet.http.HttpServletRequest
;
import
org.skywalking.apm.collector.agent.stream.worker.register.ApplicationIDService
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.server.jetty.ArgumentsParseException
;
import
org.skywalking.apm.collector.server.jetty.JettyHandler
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
class
ApplicationRegisterServletHandler
extends
JettyHandler
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ApplicationRegisterServletHandler
.
class
);
private
final
ApplicationIDService
applicationIDService
;
private
Gson
gson
=
new
Gson
();
private
static
final
String
APPLICATION_CODE
=
"c"
;
private
static
final
String
APPLICATION_ID
=
"i"
;
public
ApplicationRegisterServletHandler
(
ModuleManager
moduleManager
)
{
this
.
applicationIDService
=
new
ApplicationIDService
(
moduleManager
);
}
@Override
public
String
pathSpec
()
{
return
"/application/register"
;
}
@Override
protected
JsonElement
doGet
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
throw
new
UnsupportedOperationException
();
}
@Override
protected
JsonElement
doPost
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
JsonArray
responseArray
=
new
JsonArray
();
try
{
JsonArray
applicationCodes
=
gson
.
fromJson
(
req
.
getReader
(),
JsonArray
.
class
);
for
(
int
i
=
0
;
i
<
applicationCodes
.
size
();
i
++)
{
String
applicationCode
=
applicationCodes
.
get
(
i
).
getAsString
();
int
applicationId
=
applicationIDService
.
getOrCreate
(
applicationCode
);
JsonObject
mapping
=
new
JsonObject
();
mapping
.
addProperty
(
APPLICATION_CODE
,
applicationCode
);
mapping
.
addProperty
(
APPLICATION_ID
,
applicationId
);
responseArray
.
add
(
mapping
);
}
}
catch
(
IOException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
responseArray
;
}
}
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
0 → 100644
浏览文件 @
8c3fbe4c
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.jetty.handler
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
java.io.IOException
;
import
javax.servlet.http.HttpServletRequest
;
import
org.skywalking.apm.collector.agent.stream.worker.register.InstanceIDService
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.server.jetty.ArgumentsParseException
;
import
org.skywalking.apm.collector.server.jetty.JettyHandler
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
class
InstanceDiscoveryServletHandler
extends
JettyHandler
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
InstanceDiscoveryServletHandler
.
class
);
private
final
InstanceIDService
instanceIDService
;
private
Gson
gson
=
new
Gson
();
private
static
final
String
APPLICATION_ID
=
"ai"
;
private
static
final
String
AGENT_UUID
=
"au"
;
private
static
final
String
REGISTER_TIME
=
"rt"
;
private
static
final
String
INSTANCE_ID
=
"ii"
;
private
static
final
String
OS_INFO
=
"oi"
;
public
InstanceDiscoveryServletHandler
(
ModuleManager
moduleManager
)
{
this
.
instanceIDService
=
new
InstanceIDService
(
moduleManager
);
}
@Override
public
String
pathSpec
()
{
return
"/instance/register"
;
}
@Override
protected
JsonElement
doGet
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
throw
new
UnsupportedOperationException
();
}
@Override
protected
JsonElement
doPost
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
JsonObject
responseJson
=
new
JsonObject
();
try
{
JsonObject
instance
=
gson
.
fromJson
(
req
.
getReader
(),
JsonObject
.
class
);
int
applicationId
=
instance
.
get
(
APPLICATION_ID
).
getAsInt
();
String
agentUUID
=
instance
.
get
(
AGENT_UUID
).
getAsString
();
long
registerTime
=
instance
.
get
(
REGISTER_TIME
).
getAsLong
();
JsonObject
osInfo
=
instance
.
get
(
OS_INFO
).
getAsJsonObject
();
int
instanceId
=
instanceIDService
.
getOrCreate
(
applicationId
,
agentUUID
,
registerTime
,
osInfo
.
toString
());
responseJson
.
addProperty
(
APPLICATION_ID
,
applicationId
);
responseJson
.
addProperty
(
INSTANCE_ID
,
instanceId
);
}
catch
(
IOException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
responseJson
;
}
}
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
0 → 100644
浏览文件 @
8c3fbe4c
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.jetty.handler
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
java.io.IOException
;
import
javax.servlet.http.HttpServletRequest
;
import
org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameService
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.server.jetty.ArgumentsParseException
;
import
org.skywalking.apm.collector.server.jetty.JettyHandler
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
class
ServiceNameDiscoveryServiceHandler
extends
JettyHandler
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ServiceNameDiscoveryServiceHandler
.
class
);
private
final
ServiceNameService
serviceNameService
;
private
Gson
gson
=
new
Gson
();
private
static
final
String
APPLICATION_ID
=
"ai"
;
private
static
final
String
SERVICE_NAME
=
"sn"
;
private
static
final
String
SERVICE_ID
=
"si"
;
private
static
final
String
ELEMENT
=
"el"
;
public
ServiceNameDiscoveryServiceHandler
(
ModuleManager
moduleManager
)
{
this
.
serviceNameService
=
new
ServiceNameService
(
moduleManager
);
}
@Override
public
String
pathSpec
()
{
return
"/servicename/discovery"
;
}
@Override
protected
JsonElement
doGet
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
throw
new
UnsupportedOperationException
();
}
@Override
protected
JsonElement
doPost
(
HttpServletRequest
req
)
throws
ArgumentsParseException
{
JsonArray
responseArray
=
new
JsonArray
();
try
{
JsonArray
services
=
gson
.
fromJson
(
req
.
getReader
(),
JsonArray
.
class
);
for
(
JsonElement
service
:
services
)
{
int
applicationId
=
service
.
getAsJsonObject
().
get
(
APPLICATION_ID
).
getAsInt
();
String
serviceName
=
service
.
getAsJsonObject
().
get
(
SERVICE_NAME
).
getAsString
();
int
serviceId
=
serviceNameService
.
getOrCreate
(
applicationId
,
serviceName
);
if
(
serviceId
!=
0
)
{
JsonObject
responseJson
=
new
JsonObject
();
responseJson
.
addProperty
(
SERVICE_ID
,
serviceId
);
responseJson
.
add
(
ELEMENT
,
service
);
responseArray
.
add
(
responseJson
);
}
}
}
catch
(
IOException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
responseArray
;
}
}
apm-collector/apm-collector-agent/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
浏览文件 @
8c3fbe4c
...
...
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import
org.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegment
;
import
org.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegmentJsonReader
;
import
org.skywalking.apm.collector.agent.stream.parser.SegmentParse
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.server.jetty.ArgumentsParseException
;
import
org.skywalking.apm.collector.server.jetty.JettyHandler
;
import
org.slf4j.Logger
;
...
...
@@ -38,6 +39,12 @@ public class TraceSegmentServletHandler extends JettyHandler {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
TraceSegmentServletHandler
.
class
);
private
final
ModuleManager
moduleManager
;
public
TraceSegmentServletHandler
(
ModuleManager
moduleManager
)
{
this
.
moduleManager
=
moduleManager
;
}
@Override
public
String
pathSpec
()
{
return
"/segments"
;
}
...
...
@@ -64,7 +71,7 @@ public class TraceSegmentServletHandler extends JettyHandler {
reader
.
beginArray
();
while
(
reader
.
hasNext
())
{
SegmentParse
segmentParse
=
new
SegmentParse
(
null
);
SegmentParse
segmentParse
=
new
SegmentParse
(
moduleManager
);
TraceSegment
traceSegment
=
jsonReader
.
read
(
reader
);
segmentParse
.
parse
(
traceSegment
.
getUpstreamSegment
(),
SegmentParse
.
Source
.
Agent
);
}
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferManager.java
浏览文件 @
8c3fbe4c
...
...
@@ -21,6 +21,7 @@ package org.skywalking.apm.collector.agent.stream.buffer;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
import
org.skywalking.apm.collector.core.util.TimeBucketUtils
;
...
...
@@ -39,7 +40,7 @@ public enum SegmentBufferManager {
public
static
final
String
DATA_FILE_PREFIX
=
"data"
;
private
FileOutputStream
outputStream
;
public
synchronized
void
initialize
()
{
public
synchronized
void
initialize
(
ModuleManager
moduleManager
)
{
logger
.
info
(
"segment buffer initialize"
);
try
{
OffsetManager
.
INSTANCE
.
initialize
();
...
...
@@ -58,7 +59,7 @@ public enum SegmentBufferManager {
newDataFile
();
}
}
SegmentBufferReader
.
INSTANCE
.
initialize
();
SegmentBufferReader
.
INSTANCE
.
initialize
(
moduleManager
);
}
catch
(
IOException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferReader.java
浏览文件 @
8c3fbe4c
...
...
@@ -27,6 +27,7 @@ import java.io.InputStream;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.TimeUnit
;
import
org.skywalking.apm.collector.agent.stream.parser.SegmentParse
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.util.CollectionUtils
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
...
...
@@ -42,8 +43,10 @@ public enum SegmentBufferReader {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
SegmentBufferReader
.
class
);
private
InputStream
inputStream
;
private
ModuleManager
moduleManager
;
public
void
initialize
()
{
public
void
initialize
(
ModuleManager
moduleManager
)
{
this
.
moduleManager
=
moduleManager
;
Executors
.
newSingleThreadScheduledExecutor
().
scheduleAtFixedRate
(
this
::
preRead
,
3
,
3
,
TimeUnit
.
SECONDS
);
}
...
...
@@ -117,7 +120,7 @@ public enum SegmentBufferReader {
while
(
readFile
.
length
()
>
readFileOffset
&&
readFileOffset
<
endPoint
)
{
UpstreamSegment
upstreamSegment
=
UpstreamSegment
.
parser
().
parseDelimitedFrom
(
inputStream
);
SegmentParse
parse
=
new
SegmentParse
(
null
);
SegmentParse
parse
=
new
SegmentParse
(
moduleManager
);
if
(!
parse
.
parse
(
upstreamSegment
,
SegmentParse
.
Source
.
Buffer
))
{
return
false
;
}
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java
浏览文件 @
8c3fbe4c
...
...
@@ -38,7 +38,7 @@ public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker<Segme
public
SegmentStandardizationWorker
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
SegmentBufferManager
.
INSTANCE
.
initialize
();
SegmentBufferManager
.
INSTANCE
.
initialize
(
moduleManager
);
}
@Override
public
int
id
()
{
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationIDService.java
浏览文件 @
8c3fbe4c
...
...
@@ -24,8 +24,6 @@ import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
import
org.skywalking.apm.collector.core.graph.Graph
;
import
org.skywalking.apm.collector.core.graph.GraphManager
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.module.ModuleNotFoundException
;
import
org.skywalking.apm.collector.core.module.ServiceNotProvidedException
;
import
org.skywalking.apm.collector.storage.table.register.Application
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -45,7 +43,7 @@ public class ApplicationIDService {
this
.
applicationRegisterGraph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
RegisterStreamGraph
.
APPLICATION_REGISTER_GRAPH_ID
,
Application
.
class
);
}
public
int
getOrCreate
(
String
applicationCode
)
throws
ModuleNotFoundException
,
ServiceNotProvidedException
{
public
int
getOrCreate
(
String
applicationCode
)
{
ApplicationCacheService
service
=
moduleManager
.
find
(
CacheModule
.
NAME
).
getService
(
ApplicationCacheService
.
class
);
int
applicationId
=
service
.
get
(
applicationCode
);
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java
浏览文件 @
8c3fbe4c
...
...
@@ -24,8 +24,6 @@ import org.skywalking.apm.collector.cache.service.InstanceCacheService;
import
org.skywalking.apm.collector.core.graph.Graph
;
import
org.skywalking.apm.collector.core.graph.GraphManager
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.module.ModuleNotFoundException
;
import
org.skywalking.apm.collector.core.module.ServiceNotProvidedException
;
import
org.skywalking.apm.collector.storage.StorageModule
;
import
org.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO
;
import
org.skywalking.apm.collector.storage.table.register.Instance
;
...
...
@@ -49,8 +47,7 @@ public class InstanceIDService {
this
.
instanceRegisterDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IInstanceRegisterDAO
.
class
);
}
public
int
getOrCreate
(
int
applicationId
,
String
agentUUID
,
long
registerTime
,
String
osInfo
)
throws
ModuleNotFoundException
,
ServiceNotProvidedException
{
public
int
getOrCreate
(
int
applicationId
,
String
agentUUID
,
long
registerTime
,
String
osInfo
)
{
logger
.
debug
(
"get or create instance id, application id: {}, agentUUID: {}, registerTime: {}, osInfo: {}"
,
applicationId
,
agentUUID
,
registerTime
,
osInfo
);
InstanceCacheService
service
=
moduleManager
.
find
(
CacheModule
.
NAME
).
getService
(
InstanceCacheService
.
class
);
int
instanceId
=
service
.
getInstanceId
(
applicationId
,
agentUUID
);
...
...
@@ -69,8 +66,7 @@ public class InstanceIDService {
return
instanceId
;
}
public
void
recover
(
int
instanceId
,
int
applicationId
,
long
registerTime
,
String
osInfo
)
throws
ModuleNotFoundException
,
ServiceNotProvidedException
{
public
void
recover
(
int
instanceId
,
int
applicationId
,
long
registerTime
,
String
osInfo
)
{
logger
.
debug
(
"instance recover, instance id: {}, application id: {}, register time: {}"
,
instanceId
,
applicationId
,
registerTime
);
Instance
instance
=
new
Instance
(
String
.
valueOf
(
instanceId
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录