Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
38aeb92e
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,发现更多精彩内容 >>
提交
38aeb92e
编写于
7月 17, 2017
作者:
P
pengys5
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
collector compile successful
上级
8b22a52d
变更
30
隐藏空白更改
内联
并排
Showing
30 changed file
with
78 addition
and
121 deletion
+78
-121
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agent/stream/server/grpc/AgentStreamGRPCConfigParser.java
...agent/stream/server/grpc/AgentStreamGRPCConfigParser.java
+2
-2
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agent/stream/server/grpc/impl/TraceSegmentServiceImpl.java
...gent/stream/server/grpc/impl/TraceSegmentServiceImpl.java
+0
-63
apm-collector/apm-collector-boot/pom.xml
apm-collector/apm-collector-boot/pom.xml
+1
-1
apm-collector/apm-collector-client/pom.xml
apm-collector/apm-collector-client/pom.xml
+15
-0
apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
...java/org/skywalking/apm/collector/client/h2/H2Client.java
+5
-1
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java
...apm/collector/cluster/redis/ClusterRedisConfigParser.java
+3
-3
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java
...apm/collector/cluster/redis/ClusterRedisModuleDefine.java
+5
-0
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java
...tor/cluster/standalone/ClusterStandaloneModuleDefine.java
+5
-0
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
...pm/collector/cluster/zookeeper/ClusterZKConfigParser.java
+2
-2
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java
...collector/cluster/zookeeper/ClusterZKDataInitializer.java
+5
-5
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
...pm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
+5
-0
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleDefine.java
...m/collector/core/agentstream/AgentStreamModuleDefine.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleException.java
...ollector/core/agentstream/AgentStreamModuleException.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java
...king/apm/collector/core/cluster/ClusterModuleContext.java
+2
-2
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleInstaller.java
...ng/apm/collector/core/cluster/ClusterModuleInstaller.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java
...ywalking/apm/collector/core/framework/DefinitionFile.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java
...walking/apm/collector/core/module/ModuleConfigParser.java
+0
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstallerAdapter.java
...ing/apm/collector/core/module/ModuleInstallerAdapter.java
+0
-3
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleContext.java
...ywalking/apm/collector/core/queue/QueueModuleContext.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java
...va/org/skywalking/apm/collector/core/util/BytesUtils.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java
...g/skywalking/apm/collector/core/util/CollectionUtils.java
+2
-3
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java
...a/org/skywalking/apm/collector/core/util/ObjectUtils.java
+1
-3
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java
...a/org/skywalking/apm/collector/core/util/StringUtils.java
+2
-4
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalAsyncWorkerProvider.java
...llector/core/worker/AbstractLocalAsyncWorkerProvider.java
+1
-1
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/HashCodeSelector.java
.../apm/collector/core/worker/selector/HashCodeSelector.java
+2
-4
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/RollingSelector.java
...g/apm/collector/core/worker/selector/RollingSelector.java
+2
-4
apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java
...ector/queue/datacarrier/QueueDataCarrierModuleDefine.java
+1
-1
apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java
...collector/queue/disruptor/QueueDisruptorModuleDefine.java
+1
-1
apm-collector/apm-collector-remote/pom.xml
apm-collector/apm-collector-remote/pom.xml
+10
-10
apm-collector/pom.xml
apm-collector/pom.xml
+0
-1
未找到文件。
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agent/stream/server/grpc/AgentStreamGRPCConfigParser.java
浏览文件 @
38aeb92e
...
...
@@ -10,8 +10,8 @@ import org.skywalking.apm.collector.core.util.StringUtils;
*/
public
class
AgentStreamGRPCConfigParser
implements
ModuleConfigParser
{
private
final
String
HOST
=
"host"
;
private
final
String
PORT
=
"port"
;
private
static
final
String
HOST
=
"host"
;
private
static
final
String
PORT
=
"port"
;
@Override
public
void
parse
(
Map
config
)
throws
ConfigParseException
{
AgentStreamGRPCConfig
.
HOST
=
(
String
)
config
.
get
(
HOST
);
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agent/stream/server/grpc/impl/TraceSegmentServiceImpl.java
已删除
100644 → 0
浏览文件 @
8b22a52d
package
org.skywalking.apm.collector.agent.stream.server.grpc.impl
;
import
io.grpc.stub.StreamObserver
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.skywalking.apm.collector.actor.AbstractWorker
;
import
org.skywalking.apm.collector.actor.ClusterWorkerContext
;
import
org.skywalking.apm.collector.actor.ProviderNotFoundException
;
import
org.skywalking.apm.collector.actor.WorkerInvokeException
;
import
org.skywalking.apm.collector.actor.WorkerRef
;
import
org.skywalking.apm.collector.worker.grpcserver.WorkerCaller
;
import
org.skywalking.apm.network.proto.Downstream
;
import
org.skywalking.apm.network.proto.TraceSegmentServiceGrpc
;
import
org.skywalking.apm.network.proto.UpstreamSegment
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author pengys5
*/
public
class
TraceSegmentServiceImpl
extends
TraceSegmentServiceGrpc
.
TraceSegmentServiceImplBase
implements
WorkerCaller
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
TraceSegmentServiceImpl
.
class
);
private
ClusterWorkerContext
clusterWorkerContext
;
private
WorkerRef
segmentReceiverWorkRef
;
@Override
public
void
preStart
()
throws
ProviderNotFoundException
{
segmentReceiverWorkRef
=
clusterWorkerContext
.
findProvider
(
SegmentReceiver
.
WorkerRole
.
INSTANCE
).
create
(
AbstractWorker
.
noOwner
());
}
@Override
public
StreamObserver
<
UpstreamSegment
>
collect
(
StreamObserver
<
Downstream
>
responseObserver
)
{
return
new
StreamObserver
<
UpstreamSegment
>()
{
@Override
public
void
onNext
(
UpstreamSegment
segment
)
{
if
(
logger
.
isDebugEnabled
())
{
StringBuffer
globalTraceIds
=
new
StringBuffer
();
logger
.
debug
(
"global trace ids count: %s"
,
segment
.
getGlobalTraceIdsList
().
size
());
segment
.
getGlobalTraceIdsList
().
forEach
(
globalTraceId
->
{
globalTraceIds
.
append
(
globalTraceId
).
append
(
","
);
});
logger
.
debug
(
"receive segment, global trace ids: %s, segment byte size: %s"
,
globalTraceIds
,
segment
.
getSegment
().
size
());
try
{
segmentReceiverWorkRef
.
tell
(
segment
);
}
catch
(
WorkerInvokeException
e
)
{
onError
(
e
);
}
}
}
@Override
public
void
onError
(
Throwable
throwable
)
{
logger
.
error
(
throwable
.
getMessage
(),
throwable
);
}
@Override
public
void
onCompleted
()
{
responseObserver
.
onCompleted
();
}
};
}
@Override
public
void
inject
(
ClusterWorkerContext
clusterWorkerContext
)
{
this
.
clusterWorkerContext
=
clusterWorkerContext
;
}
}
apm-collector/apm-collector-boot/pom.xml
浏览文件 @
38aeb92e
...
...
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-collector-cluster
-new
</artifactId>
<artifactId>
apm-collector-cluster
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
...
...
apm-collector/apm-collector-client/pom.xml
浏览文件 @
38aeb92e
...
...
@@ -18,5 +18,20 @@
<artifactId>
apm-collector-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
com.h2database
</groupId>
<artifactId>
h2
</artifactId>
<version>
1.4.196
</version>
</dependency>
<dependency>
<groupId>
redis.clients
</groupId>
<artifactId>
jedis
</artifactId>
<version>
2.9.0
</version>
</dependency>
<dependency>
<groupId>
org.apache.zookeeper
</groupId>
<artifactId>
zookeeper
</artifactId>
<version>
3.4.10
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
浏览文件 @
38aeb92e
...
...
@@ -6,12 +6,16 @@ import java.sql.ResultSet;
import
java.sql.SQLException
;
import
java.sql.Statement
;
import
org.skywalking.apm.collector.core.client.Client
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author pengys5
*/
public
class
H2Client
implements
Client
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
H2Client
.
class
);
private
Connection
conn
;
@Override
public
void
initialize
()
throws
H2ClientException
{
...
...
@@ -40,7 +44,7 @@ public class H2Client implements Client {
statement
=
conn
.
createStatement
();
ResultSet
rs
=
statement
.
executeQuery
(
sql
);
while
(
rs
.
next
())
{
System
.
out
.
println
(
rs
.
getString
(
"ADDRESS"
)
+
","
+
rs
.
getString
(
"DATA"
));
logger
.
debug
(
rs
.
getString
(
"ADDRESS"
)
+
","
+
rs
.
getString
(
"DATA"
));
}
statement
.
closeOnCompletion
();
}
catch
(
SQLException
e
)
{
...
...
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java
浏览文件 @
38aeb92e
...
...
@@ -10,12 +10,12 @@ import org.skywalking.apm.collector.core.util.StringUtils;
*/
public
class
ClusterRedisConfigParser
implements
ModuleConfigParser
{
private
final
String
HOST
=
"host"
;
private
final
String
PORT
=
"port"
;
private
static
final
String
HOST
=
"host"
;
private
static
final
String
PORT
=
"port"
;
@Override
public
void
parse
(
Map
config
)
throws
ConfigParseException
{
ClusterRedisConfig
.
HOST
=
(
String
)
config
.
get
(
HOST
);
ClusterRedisConfig
.
PORT
=
(
(
Integer
)
config
.
get
(
PORT
)
);
ClusterRedisConfig
.
PORT
=
(
Integer
)
config
.
get
(
PORT
);
if
(
StringUtils
.
isEmpty
(
ClusterRedisConfig
.
HOST
)
||
ClusterRedisConfig
.
PORT
==
0
)
{
throw
new
ConfigParseException
(
""
);
}
...
...
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -3,6 +3,7 @@ package org.skywalking.apm.collector.cluster.redis;
import
org.skywalking.apm.collector.client.redis.RedisClient
;
import
org.skywalking.apm.collector.core.client.Client
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleDefine
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationWriter
;
import
org.skywalking.apm.collector.core.framework.DataInitializer
;
import
org.skywalking.apm.collector.core.module.ModuleConfigParser
;
...
...
@@ -40,4 +41,8 @@ public class ClusterRedisModuleDefine extends ClusterModuleDefine {
@Override
protected
ClusterModuleRegistrationWriter
registrationWriter
()
{
return
new
ClusterRedisModuleRegistrationWriter
(
getClient
());
}
@Override
protected
ClusterModuleRegistrationReader
registrationReader
()
{
return
null
;
}
}
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -3,6 +3,7 @@ package org.skywalking.apm.collector.cluster.standalone;
import
org.skywalking.apm.collector.client.h2.H2Client
;
import
org.skywalking.apm.collector.core.client.Client
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleDefine
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationWriter
;
import
org.skywalking.apm.collector.core.framework.DataInitializer
;
import
org.skywalking.apm.collector.core.module.ModuleConfigParser
;
...
...
@@ -40,4 +41,8 @@ public class ClusterStandaloneModuleDefine extends ClusterModuleDefine {
@Override
protected
ClusterModuleRegistrationWriter
registrationWriter
()
{
return
new
ClusterStandaloneModuleRegistrationWriter
(
getClient
());
}
@Override
protected
ClusterModuleRegistrationReader
registrationReader
()
{
return
null
;
}
}
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
浏览文件 @
38aeb92e
...
...
@@ -10,8 +10,8 @@ import org.skywalking.apm.collector.core.util.StringUtils;
*/
public
class
ClusterZKConfigParser
implements
ModuleConfigParser
{
private
final
String
HOST_PORT
=
"hostPort"
;
private
final
String
SESSION_TIMEOUT
=
"sessionTimeout"
;
private
static
final
String
HOST_PORT
=
"hostPort"
;
private
static
final
String
SESSION_TIMEOUT
=
"sessionTimeout"
;
@Override
public
void
parse
(
Map
config
)
throws
ConfigParseException
{
ClusterZKConfig
.
HOST_PORT
=
(
String
)
config
.
get
(
HOST_PORT
);
...
...
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java
浏览文件 @
38aeb92e
...
...
@@ -40,10 +40,10 @@ public class ClusterZKDataInitializer extends ClusterDataInitializer {
pathBuilder
.
append
(
"/"
).
append
(
catalog
);
}
if
(
zkClient
.
exists
(
pathBuilder
.
toString
(),
false
)
==
null
)
{
return
false
;
}
else
{
return
true
;
}
//
if (zkClient.exists(pathBuilder.toString(), false) == null) {
//
return false;
//
} else {
return
true
;
//
}
}
}
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -4,6 +4,7 @@ import org.skywalking.apm.collector.client.zookeeper.ZookeeperClient;
import
org.skywalking.apm.collector.core.client.Client
;
import
org.skywalking.apm.collector.core.cluster.ClusterDataInitializer
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleDefine
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationReader
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleRegistrationWriter
;
import
org.skywalking.apm.collector.core.module.ModuleConfigParser
;
import
org.skywalking.apm.collector.core.module.ModuleGroup
;
...
...
@@ -40,4 +41,8 @@ public class ClusterZKModuleDefine extends ClusterModuleDefine {
@Override
protected
ClusterModuleRegistrationWriter
registrationWriter
()
{
return
new
ClusterZKModuleRegistrationWriter
(
getClient
());
}
@Override
protected
ClusterModuleRegistrationReader
registrationReader
()
{
return
null
;
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -24,7 +24,7 @@ public abstract class AgentStreamModuleDefine extends ModuleDefine {
server
.
initialize
();
String
key
=
ClusterDataInitializer
.
BASE_CATALOG
+
"."
+
name
();
ClusterModuleContext
.
writer
.
write
(
key
,
registration
().
buildValue
());
ClusterModuleContext
.
WRITER
.
write
(
key
,
registration
().
buildValue
());
}
catch
(
ConfigParseException
|
ServerException
e
)
{
throw
new
AgentStreamModuleException
(
e
.
getMessage
(),
e
);
}
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleException.java
浏览文件 @
38aeb92e
...
...
@@ -5,7 +5,7 @@ import org.skywalking.apm.collector.core.module.ModuleException;
/**
* @author pengys5
*/
public
class
AgentStreamModuleException
extends
ModuleException
{
public
class
AgentStreamModuleException
extends
ModuleException
{
public
AgentStreamModuleException
(
String
message
)
{
super
(
message
);
}
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java
浏览文件 @
38aeb92e
...
...
@@ -4,7 +4,7 @@ package org.skywalking.apm.collector.core.cluster;
* @author pengys5
*/
public
class
ClusterModuleContext
{
public
static
ClusterModuleRegistrationWriter
writer
;
public
static
ClusterModuleRegistrationWriter
WRITER
;
public
static
ClusterModuleRegistrationReader
reader
;
public
static
ClusterModuleRegistrationReader
READER
;
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleInstaller.java
浏览文件 @
38aeb92e
...
...
@@ -38,6 +38,6 @@ public class ClusterModuleInstaller implements ModuleInstaller {
moduleDefine
=
moduleDefineMap
.
get
(
clusterConfigEntry
.
getKey
());
moduleDefine
.
initialize
(
clusterConfigEntry
.
getValue
());
}
ClusterModuleContext
.
writer
=
((
ClusterModuleDefine
)
moduleDefine
).
registrationWriter
();
ClusterModuleContext
.
WRITER
=
((
ClusterModuleDefine
)
moduleDefine
).
registrationWriter
();
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/DefinitionFile.java
浏览文件 @
38aeb92e
...
...
@@ -5,7 +5,7 @@ package org.skywalking.apm.collector.core.framework;
*/
public
abstract
class
DefinitionFile
{
private
final
String
CATALOG
=
"META-INF/defines/"
;
private
static
final
String
CATALOG
=
"META-INF/defines/"
;
protected
abstract
String
fileName
();
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleConfigParser.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.module
;
import
java.util.Map
;
import
org.skywalking.apm.collector.core.config.Config
;
import
org.skywalking.apm.collector.core.config.ConfigParseException
;
/**
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstallerAdapter.java
浏览文件 @
38aeb92e
...
...
@@ -4,7 +4,6 @@ import java.util.Map;
import
org.skywalking.apm.collector.core.client.ClientException
;
import
org.skywalking.apm.collector.core.cluster.ClusterModuleInstaller
;
import
org.skywalking.apm.collector.core.framework.DefineException
;
import
org.skywalking.apm.collector.core.worker.WorkerModuleInstaller
;
/**
* @author pengys5
...
...
@@ -16,8 +15,6 @@ public class ModuleInstallerAdapter implements ModuleInstaller {
public
ModuleInstallerAdapter
(
ModuleGroup
moduleGroup
)
{
if
(
ModuleGroup
.
Cluster
.
equals
(
moduleGroup
))
{
moduleInstaller
=
new
ClusterModuleInstaller
();
}
else
if
(
ModuleGroup
.
Worker
.
equals
(
moduleGroup
))
{
moduleInstaller
=
new
WorkerModuleInstaller
();
}
}
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleContext.java
浏览文件 @
38aeb92e
...
...
@@ -4,5 +4,5 @@ package org.skywalking.apm.collector.core.queue;
* @author pengys5
*/
public
class
QueueModuleContext
{
public
static
Creator
creator
;
public
static
Creator
CREATOR
;
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/BytesUtils.java
浏览文件 @
38aeb92e
...
...
@@ -18,7 +18,7 @@ public class BytesUtils {
long
num
=
0
;
for
(
int
ix
=
0
;
ix
<
8
;
++
ix
)
{
num
<<=
8
;
num
|=
(
byteNum
[
ix
]
&
0xff
)
;
num
|=
byteNum
[
ix
]
&
0xff
;
}
return
num
;
}
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/CollectionUtils.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.util
;
import
com.sun.istack.internal.Nullable
;
import
java.util.Map
;
/**
...
...
@@ -8,7 +7,7 @@ import java.util.Map;
*/
public
class
CollectionUtils
{
public
static
boolean
isEmpty
(
@Nullable
Map
map
)
{
return
(
map
==
null
||
map
.
size
()
==
0
)
;
public
static
boolean
isEmpty
(
Map
map
)
{
return
map
==
null
||
map
.
size
()
==
0
;
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/ObjectUtils.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.util
;
import
com.sun.istack.internal.Nullable
;
/**
* @author pengys5
*/
public
class
ObjectUtils
{
public
static
boolean
isEmpty
(
@Nullable
Object
obj
)
{
public
static
boolean
isEmpty
(
Object
obj
)
{
return
obj
==
null
;
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/StringUtils.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.util
;
import
com.sun.istack.internal.Nullable
;
/**
* @author pengys5
*/
...
...
@@ -9,7 +7,7 @@ public class StringUtils {
public
static
final
String
EMPTY_STRING
=
""
;
public
static
boolean
isEmpty
(
@Nullable
Object
str
)
{
return
(
str
==
null
||
EMPTY_STRING
.
equals
(
str
)
);
public
static
boolean
isEmpty
(
Object
str
)
{
return
str
==
null
||
EMPTY_STRING
.
equals
(
str
);
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalAsyncWorkerProvider.java
浏览文件 @
38aeb92e
...
...
@@ -15,7 +15,7 @@ public abstract class AbstractLocalAsyncWorkerProvider<T extends AbstractLocalAs
T
localAsyncWorker
=
workerInstance
(
getClusterContext
());
localAsyncWorker
.
preStart
();
QueueEventHandler
queueEventHandler
=
QueueModuleContext
.
creator
.
create
(
queueSize
(),
localAsyncWorker
);
QueueEventHandler
queueEventHandler
=
QueueModuleContext
.
CREATOR
.
create
(
queueSize
(),
localAsyncWorker
);
LocalAsyncWorkerRef
workerRef
=
new
LocalAsyncWorkerRef
(
role
(),
queueEventHandler
);
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/HashCodeSelector.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.worker.selector
;
import
org.skywalking.apm.collector.actor.AbstractWorker
;
import
org.skywalking.apm.collector.actor.WorkerRef
;
import
java.util.List
;
import
org.skywalking.apm.collector.core.worker.WorkerRef
;
/**
* The <code>HashCodeSelector</code> is a simple implementation of {@link WorkerSelector}. It choose {@link WorkerRef}
...
...
@@ -19,7 +17,7 @@ public class HashCodeSelector implements WorkerSelector<WorkerRef> {
* Use message hashcode to select {@link WorkerRef}.
*
* @param members given {@link WorkerRef} list, which size is greater than 0;
* @param message the {@link AbstractWorker} is going to send.
* @param message the {@link
org.skywalking.apm.collector.core.worker.
AbstractWorker} is going to send.
* @return the selected {@link WorkerRef}
*/
@Override
...
...
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/RollingSelector.java
浏览文件 @
38aeb92e
package
org.skywalking.apm.collector.core.worker.selector
;
import
org.skywalking.apm.collector.actor.AbstractWorker
;
import
org.skywalking.apm.collector.actor.WorkerRef
;
import
java.util.List
;
import
org.skywalking.apm.collector.core.worker.WorkerRef
;
/**
* The <code>RollingSelector</code> is a simple implementation of {@link WorkerSelector}.
...
...
@@ -20,7 +18,7 @@ public class RollingSelector implements WorkerSelector<WorkerRef> {
* Use round-robin to select {@link WorkerRef}.
*
* @param members given {@link WorkerRef} list, which size is greater than 0;
* @param message message the {@link AbstractWorker} is going to send.
* @param message message the {@link
org.skywalking.apm.collector.core.worker.
AbstractWorker} is going to send.
* @return the selected {@link WorkerRef}
*/
@Override
...
...
apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -25,6 +25,6 @@ public class QueueDataCarrierModuleDefine extends QueueModuleDefine {
}
@Override
public
final
void
initialize
(
Map
config
)
throws
DefineException
,
ClientException
{
QueueModuleContext
.
creator
=
new
DataCarrierCreator
();
QueueModuleContext
.
CREATOR
=
new
DataCarrierCreator
();
}
}
apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java
浏览文件 @
38aeb92e
...
...
@@ -25,6 +25,6 @@ public class QueueDisruptorModuleDefine extends QueueModuleDefine {
}
@Override
public
final
void
initialize
(
Map
config
)
throws
DefineException
,
ClientException
{
QueueModuleContext
.
creator
=
new
DisruptorCreator
();
QueueModuleContext
.
CREATOR
=
new
DisruptorCreator
();
}
}
apm-collector/apm-collector-remote/pom.xml
浏览文件 @
38aeb92e
...
...
@@ -19,16 +19,16 @@
</properties>
<dependencies>
<
!--<dependency>--
>
<
!--<groupId>org.skywalking</groupId>--
>
<
!--<artifactId>apm-collector-core</artifactId>--
>
<
!--<version>${project.version}</version>--
>
<
!--</dependency>--
>
<
!--<dependency>--
>
<
!--<groupId>org.skywalking</groupId>--
>
<
!--<artifactId>apm-collector-server</artifactId>--
>
<
!--<version>${project.version}</version>--
>
<
!--</dependency>--
>
<
dependency
>
<
groupId>
org.skywalking
</groupId
>
<
artifactId>
apm-collector-core
</artifactId
>
<
version>
${project.version}
</version
>
<
/dependency
>
<
dependency
>
<
groupId>
org.skywalking
</groupId
>
<
artifactId>
apm-collector-server
</artifactId
>
<
version>
${project.version}
</version
>
<
/dependency
>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-netty
</artifactId>
...
...
apm-collector/pom.xml
浏览文件 @
38aeb92e
...
...
@@ -7,7 +7,6 @@
<module>
apm-collector-core
</module>
<module>
apm-collector-queue
</module>
<module>
apm-collector-storage
</module>
<module>
apm-collector-cluster
</module>
<module>
apm-collector-client
</module>
<module>
apm-collector-server
</module>
<module>
apm-collector-discovery
</module>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录