Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
b6487399
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,发现更多精彩内容 >>
提交
b6487399
编写于
3月 20, 2017
作者:
P
pengys5
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature/collector' of
https://github.com/wu-sheng/sky-walking
into feature/collector
上级
73417f92
a4619318
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
8 addition
and
88 deletion
+8
-88
pom.xml
pom.xml
+0
-24
skywalking-sniffer/skywalking-agent/pom.xml
skywalking-sniffer/skywalking-agent/pom.xml
+8
-32
skywalking-sniffer/skywalking-api/pom.xml
skywalking-sniffer/skywalking-api/pom.xml
+0
-5
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java
...m/a/eye/skywalking/api/client/CollectorClientService.java
+0
-16
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java
...i/src/main/java/com/a/eye/skywalking/api/conf/Config.java
+0
-2
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
...m/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
+0
-7
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
...eye/skywalking/api/conf/SnifferConfigInitializerTest.java
+0
-1
skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
...ffer/skywalking-api/src/test/resources/sky-walking.config
+0
-1
未找到文件。
pom.xml
浏览文件 @
b6487399
...
...
@@ -53,30 +53,6 @@
<scala.compiler.version>
2.11.7
</scala.compiler.version>
<powermock.version>
1.6.4
</powermock.version>
<docker.plugin.version>
0.4.13
</docker.plugin.version>
<shade.package>
com.a.eye.skywalking.dependencies
</shade.package>
<shade.net.bytebuddy.source>
net.bytebuddy
</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>
${shade.package}.${shade.net.bytebuddy.source}
</shade.net.bytebuddy.target>
<shade.com.lmax.disruptor.source>
com.lmax.disruptor
</shade.com.lmax.disruptor.source>
<shade.com.lmax.disruptor.target>
${shade.package}.${shade.com.lmax.disruptor.source}
</shade.com.lmax.disruptor.target>
<shade.akka.source>
akka
</shade.akka.source>
<shade.akka.target>
${shade.package}.${shade.akka.source}
</shade.akka.target>
<shade.scala.source>
scala
</shade.scala.source>
<shade.scala.target>
${shade.package}.${shade.scala.source}
</shade.scala.target>
<shade.org.agrona.source>
org.agrona
</shade.org.agrona.source>
<shade.org.agrona.target>
${shade.package}.${shade.org.agrona.source}
</shade.org.agrona.target>
<shade.org.jboss.netty.source>
org.jboss.netty
</shade.org.jboss.netty.source>
<shade.org.jboss.netty.target>
${shade.package}.${shade.org.jboss.netty.source}
</shade.org.jboss.netty.target>
<shade.org.reactivestreams.source>
org.reactivestreams
</shade.org.reactivestreams.source>
<shade.org.reactivestreams.target>
${shade.package}.${shade.org.reactivestreams.source}
</shade.org.reactivestreams.target>
<shade.org.uncommons.maths.source>
org.uncommons.maths
</shade.org.uncommons.maths.source>
<shade.org.uncommons.maths.target>
${shade.package}.${shade.org.uncommons.maths.source}
</shade.org.uncommons.maths.target>
<shade.com.google.source>
com.google
</shade.com.google.source>
<shade.com.google.target>
${shade.package}.${shade.com.google.source}
</shade.com.google.target>
<shade.io.aeron.source>
io.aeron
</shade.io.aeron.source>
<shade.io.aeron.target>
${shade.package}.${shade.io.aeron.source}
</shade.io.aeron.target>
<shade.com.typesafe.source>
com.typesafe
</shade.com.typesafe.source>
<shade.com.typesafe.target>
${shade.package}.${shade.com.typesafe.source}
</shade.com.typesafe.target>
</properties>
<dependencies>
...
...
skywalking-sniffer/skywalking-agent/pom.xml
浏览文件 @
b6487399
...
...
@@ -17,6 +17,14 @@
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<premain.class>
com.a.eye.skywalking.agent.SkyWalkingAgent
</premain.class>
<shade.package>
com.a.eye.skywalking.dependencies
</shade.package>
<shade.net.bytebuddy.source>
net.bytebuddy
</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>
${shade.package}.${shade.net.bytebuddy.source}
</shade.net.bytebuddy.target>
<shade.com.lmax.disruptor.source>
com.lmax.disruptor
</shade.com.lmax.disruptor.source>
<shade.com.lmax.disruptor.target>
${shade.package}.${shade.com.lmax.disruptor.source}
</shade.com.lmax.disruptor.target>
<shade.com.google.source>
com.google
</shade.com.google.source>
<shade.com.google.target>
${shade.package}.${shade.com.google.source}
</shade.com.google.target>
</properties>
<dependencies>
...
...
@@ -121,42 +129,10 @@
<pattern>
${shade.com.lmax.disruptor.source}
</pattern>
<shadedPattern>
${shade.com.lmax.disruptor.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.akka.source}
</pattern>
<shadedPattern>
${shade.akka.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.com.google.source}
</pattern>
<shadedPattern>
${shade.com.google.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.org.agrona.source}
</pattern>
<shadedPattern>
${shade.org.agrona.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.org.jboss.netty.source}
</pattern>
<shadedPattern>
${shade.org.jboss.netty.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.org.reactivestreams.source}
</pattern>
<shadedPattern>
${shade.org.reactivestreams.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.org.uncommons.maths.source}
</pattern>
<shadedPattern>
${shade.org.uncommons.maths.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.scala.source}
</pattern>
<shadedPattern>
${shade.scala.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.io.aeron.source}
</pattern>
<shadedPattern>
${shade.io.aeron.target}
</shadedPattern>
</relocation>
<relocation>
<pattern>
${shade.com.typesafe.source}
</pattern>
<shadedPattern>
${shade.com.typesafe.target}
</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
...
...
skywalking-sniffer/skywalking-api/pom.xml
浏览文件 @
b6487399
...
...
@@ -30,11 +30,6 @@
<artifactId>
skywalking-logging-api
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
com.a.eye
</groupId>
<artifactId>
skywalking-collector-commons
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
net.bytebuddy
</groupId>
<artifactId>
byte-buddy
</artifactId>
...
...
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java
浏览文件 @
b6487399
...
...
@@ -3,15 +3,9 @@ package com.a.eye.skywalking.api.client;
import
com.a.eye.skywalking.api.boot.ServiceManager
;
import
com.a.eye.skywalking.api.boot.StatusBootService
;
import
com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue
;
import
com.a.eye.skywalking.collector.CollectorSystem
;
import
com.a.eye.skywalking.collector.actor.LookUp
;
import
com.a.eye.skywalking.collector.actor.WorkerNotFoundException
;
import
com.a.eye.skywalking.collector.actor.WorkerRefs
;
import
com.a.eye.skywalking.collector.commons.role.TraceSegmentReceiverRole
;
import
com.a.eye.skywalking.logging.ILog
;
import
com.a.eye.skywalking.logging.LogManager
;
import
com.a.eye.skywalking.trace.TraceSegment
;
import
java.util.List
;
/**
...
...
@@ -20,7 +14,6 @@ import java.util.List;
public
class
CollectorClientService
extends
StatusBootService
implements
Runnable
{
private
static
ILog
logger
=
LogManager
.
getLogger
(
CollectorClientService
.
class
);
private
static
long
SLEEP_TIME_MILLIS
=
500
;
private
LookUp
clusterContext
;
/**
* Start a new {@link Thread} to get finished {@link TraceSegment} by {@link TraceSegmentProcessQueue#getCachedTraceSegments()}
...
...
@@ -29,9 +22,6 @@ public class CollectorClientService extends StatusBootService implements Runnabl
protected
void
bootUpWithStatus
()
throws
Exception
{
Thread
collectorClientThread
=
new
Thread
(
this
,
"collectorClientThread"
);
collectorClientThread
.
start
();
CollectorSystem
collectorSystem
=
new
CollectorSystem
();
collectorSystem
.
boot
();
clusterContext
=
collectorSystem
.
getClusterContext
();
}
@Override
...
...
@@ -43,18 +33,12 @@ public class CollectorClientService extends StatusBootService implements Runnabl
List
<
TraceSegment
>
cachedTraceSegments
=
segmentProcessQueue
.
getCachedTraceSegments
();
if
(
cachedTraceSegments
.
size
()
>
0
)
{
for
(
TraceSegment
segment
:
cachedTraceSegments
)
{
try
{
WorkerRefs
workerRefs
=
clusterContext
.
lookup
(
TraceSegmentReceiverRole
.
INSTANCE
);
workerRefs
.
tell
(
segment
);
}
catch
(
WorkerNotFoundException
t
)
{
logger
.
error
(
t
,
"Role={} not found."
,
TraceSegmentReceiverRole
.
INSTANCE
.
roleName
());
/**
* No receiver found, means collector server is off-line.
*/
sleepTime
=
SLEEP_TIME_MILLIS
*
10
;
break
;
}
}
}
else
{
sleepTime
=
SLEEP_TIME_MILLIS
;
}
...
...
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java
浏览文件 @
b6487399
...
...
@@ -3,8 +3,6 @@ package com.a.eye.skywalking.api.conf;
public
class
Config
{
public
static
class
SkyWalking
{
public
static
String
USERNAME
=
""
;
public
static
String
APPLICATION_CODE
=
""
;
public
static
boolean
IS_PREMAIN_MODE
=
false
;
...
...
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
浏览文件 @
b6487399
...
...
@@ -33,10 +33,6 @@ public class SnifferConfigInitializer {
}
}
String
username
=
System
.
getProperty
(
"username"
);
if
(!
StringUtil
.
isEmpty
(
username
))
{
Config
.
SkyWalking
.
USERNAME
=
username
;
}
String
applicationCode
=
System
.
getProperty
(
"applicationCode"
);
if
(!
StringUtil
.
isEmpty
(
applicationCode
))
{
Config
.
SkyWalking
.
APPLICATION_CODE
=
applicationCode
;
...
...
@@ -46,9 +42,6 @@ public class SnifferConfigInitializer {
Config
.
SkyWalking
.
SERVERS
=
servers
;
}
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
USERNAME
))
{
throw
new
ExceptionInInitializerError
(
"'-Dusername=' is missing."
);
}
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
APPLICATION_CODE
))
{
throw
new
ExceptionInInitializerError
(
"'-DapplicationCode=' is missing."
);
}
...
...
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
浏览文件 @
b6487399
...
...
@@ -14,7 +14,6 @@ public class SnifferConfigInitializerTest {
Config
.
SkyWalking
.
IS_PREMAIN_MODE
=
false
;
SnifferConfigInitializer
.
initialize
();
Assert
.
assertEquals
(
"testUser"
,
Config
.
SkyWalking
.
USERNAME
);
Assert
.
assertEquals
(
"crmApp"
,
Config
.
SkyWalking
.
APPLICATION_CODE
);
Assert
.
assertEquals
(
"127.0.0.1:8080"
,
Config
.
SkyWalking
.
SERVERS
);
...
...
skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
浏览文件 @
b6487399
skywalking
.
username
=
testUser
skywalking
.
application_code
=
crmApp
skywalking
.
servers
=
127
.
0
.
0
.
1
:
8080
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录