Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
99024b3d
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,体验更适合开发者的 AI 搜索 >>
提交
99024b3d
编写于
2月 28, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add api/conf test case.
上级
6deb4bb8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
76 addition
and
11 deletion
+76
-11
skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java
...main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java
+2
-2
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java
...rc/main/java/com/a/eye/skywalking/api/conf/Constants.java
+1
-1
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
...m/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
+18
-8
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/ConstantsTest.java
...est/java/com/a/eye/skywalking/api/conf/ConstantsTest.java
+14
-0
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
...eye/skywalking/api/conf/SnifferConfigInitializerTest.java
+38
-0
skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
...ffer/skywalking-api/src/test/resources/sky-walking.config
+3
-0
未找到文件。
skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java
浏览文件 @
99024b3d
...
...
@@ -26,8 +26,8 @@ import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
not
;
/**
* The main entrance of sky-waking agent
.
*
It bases
on javaagent mechanism.
* The main entrance of sky-waking agent
,
*
based
on javaagent mechanism.
*
* @author wusheng
*/
...
...
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Constants.java
浏览文件 @
99024b3d
...
...
@@ -7,5 +7,5 @@ public class Constants {
* This is the version, which will be the first segment of traceid.
* Ref {@link TraceIdGenerator#generate()}
*/
public
static
String
SDK_VERSION
=
"302017"
;
public
final
static
String
SDK_VERSION
=
"302017"
;
}
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java
浏览文件 @
99024b3d
...
...
@@ -11,7 +11,7 @@ import java.io.InputStream;
import
java.util.Properties
;
public
class
SnifferConfigInitializer
{
private
static
ILog
logger
=
LogManager
.
getLogger
(
SnifferConfigInitializer
.
class
);
private
static
ILog
logger
=
LogManager
.
getLogger
(
SnifferConfigInitializer
.
class
);
public
static
void
initialize
()
{
InputStream
configFileStream
;
...
...
@@ -32,24 +32,34 @@ public class SnifferConfigInitializer {
logger
.
error
(
"Failed to read the config file, sky-walking api run in default config."
,
e
);
}
}
Config
.
SkyWalking
.
USERNAME
=
System
.
getProperty
(
"username"
);
Config
.
SkyWalking
.
APPLICATION_CODE
=
System
.
getProperty
(
"applicationCode"
);
Config
.
SkyWalking
.
SERVERS
=
System
.
getProperty
(
"servers"
);
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
USERNAME
)){
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
;
}
String
servers
=
System
.
getProperty
(
"servers"
);
if
(!
StringUtil
.
isEmpty
(
servers
))
{
Config
.
SkyWalking
.
SERVERS
=
servers
;
}
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
USERNAME
))
{
throw
new
ExceptionInInitializerError
(
"'-Dusername=' is missing."
);
}
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
APPLICATION_CODE
))
{
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
APPLICATION_CODE
))
{
throw
new
ExceptionInInitializerError
(
"'-DapplicationCode=' is missing."
);
}
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
SERVERS
))
{
if
(
StringUtil
.
isEmpty
(
Config
.
SkyWalking
.
SERVERS
))
{
throw
new
ExceptionInInitializerError
(
"'-Dservers=' is missing."
);
}
}
private
static
InputStream
fetchAuthFileInputStream
()
{
try
{
return
new
FileInputStream
(
Config
.
SkyWalking
.
AGENT_BASE_PATH
+
File
.
separator
+
"
/
sky-walking.config"
);
return
new
FileInputStream
(
Config
.
SkyWalking
.
AGENT_BASE_PATH
+
File
.
separator
+
"sky-walking.config"
);
}
catch
(
Exception
e
)
{
logger
.
warn
(
"sky-walking.config is missing, use default config."
);
return
null
;
...
...
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/ConstantsTest.java
0 → 100644
浏览文件 @
99024b3d
package
com.a.eye.skywalking.api.conf
;
import
org.junit.Assert
;
import
org.junit.Test
;
/**
* Created by wusheng on 2017/2/28.
*/
public
class
ConstantsTest
{
@Test
public
void
testSDKVersion
(){
Assert
.
assertEquals
(
"302017"
,
Constants
.
SDK_VERSION
);
}
}
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
0 → 100644
浏览文件 @
99024b3d
package
com.a.eye.skywalking.api.conf
;
import
org.junit.AfterClass
;
import
org.junit.Assert
;
import
org.junit.Test
;
/**
* @author wusheng
*/
public
class
SnifferConfigInitializerTest
{
@Test
public
void
testInitialize
(){
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
);
Assert
.
assertNotNull
(
Config
.
Disruptor
.
BUFFER_SIZE
);
Assert
.
assertNotNull
(
Config
.
Logging
.
LOG_DIR_NAME
);
Assert
.
assertNotNull
(
Config
.
Logging
.
LOG_FILE_NAME
);
Assert
.
assertNotNull
(
Config
.
Logging
.
MAX_LOG_FILE_LENGTH
);
Assert
.
assertNotNull
(
Config
.
Logging
.
SYSTEM_ERROR_LOG_FILE_NAME
);
}
@Test
(
expected
=
ExceptionInInitializerError
.
class
)
public
void
testErrorInitialize
(){
Config
.
SkyWalking
.
IS_PREMAIN_MODE
=
true
;
SnifferConfigInitializer
.
initialize
();
}
@AfterClass
public
static
void
reset
(){
Config
.
SkyWalking
.
IS_PREMAIN_MODE
=
false
;
}
}
skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
0 → 100644
浏览文件 @
99024b3d
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录