Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
ddfa9221
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ddfa9221
编写于
10月 09, 2017
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix test failures
上级
dd07c6a9
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
51 addition
and
49 deletion
+51
-49
cat-client/src/test/java/com/dianping/cat/servlet/CatFilterTest.java
...src/test/java/com/dianping/cat/servlet/CatFilterTest.java
+0
-13
cat-client/src/test/resources/com/dianping/cat/configuration/config.xml
.../test/resources/com/dianping/cat/configuration/config.xml
+1
-1
cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java
...n/java/com/dianping/cat/consumer/state/StateAnalyzer.java
+8
-2
cat-consumer/src/test/java/com/dianping/cat/consumer/state/StateAnalyzerTest.java
...va/com/dianping/cat/consumer/state/StateAnalyzerTest.java
+1
-1
cat-consumer/src/test/java/com/dianping/cat/consumer/state/StateAnalyzerTestConfigurator.java
...ing/cat/consumer/state/StateAnalyzerTestConfigurator.java
+18
-23
cat-consumer/src/test/resources/com/dianping/cat/consumer/state/StateAnalyzerTest.xml
...ces/com/dianping/cat/consumer/state/StateAnalyzerTest.xml
+17
-7
cat-home/src/test/java/com/dianping/cat/TestServer.java
cat-home/src/test/java/com/dianping/cat/TestServer.java
+6
-2
未找到文件。
cat-client/src/test/java/com/dianping/cat/servlet/CatFilterTest.java
浏览文件 @
ddfa9221
...
@@ -16,8 +16,6 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -16,8 +16,6 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
org.eclipse.jetty.webapp.WebAppContext
;
import
org.eclipse.jetty.webapp.WebAppContext
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.unidal.helper.Files
;
import
org.unidal.helper.Files
;
import
org.unidal.helper.Joiners
;
import
org.unidal.helper.Joiners
;
...
@@ -31,17 +29,6 @@ import com.dianping.cat.message.Transaction;
...
@@ -31,17 +29,6 @@ import com.dianping.cat.message.Transaction;
import
junit.framework.Assert
;
import
junit.framework.Assert
;
public
class
CatFilterTest
extends
JettyServer
{
public
class
CatFilterTest
extends
JettyServer
{
@After
public
void
after
()
throws
Exception
{
super
.
stopServer
();
}
@Before
public
void
before
()
throws
Exception
{
System
.
setProperty
(
"devMode"
,
"true"
);
super
.
startServer
();
}
@Override
@Override
protected
String
getContextPath
()
{
protected
String
getContextPath
()
{
return
"/mock"
;
return
"/mock"
;
...
...
cat-client/src/test/resources/com/dianping/cat/configuration/config.xml
浏览文件 @
ddfa9221
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<config
mode=
"client"
enabled=
"true"
dev-mode=
"false"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema"
xsi:noNamespaceSchemaLocation=
"config.xsd"
>
<config
mode=
"client"
enabled=
"true"
dev-mode=
"false"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema"
xsi:noNamespaceSchemaLocation=
"config.xsd"
>
<base-log-dir>
target/cat
log
</base-log-dir>
<base-log-dir>
target/cat
</base-log-dir>
<servers>
<servers>
<server
ip=
"192.168.8.21"
port=
"2280"
http-port=
"8080"
enabled=
"true"
/>
<server
ip=
"192.168.8.21"
port=
"2280"
http-port=
"8080"
enabled=
"true"
/>
<server
ip=
"192.168.8.22"
port=
"2281"
http-port=
"8080"
enabled=
"false"
/>
<server
ip=
"192.168.8.22"
port=
"2281"
http-port=
"8080"
enabled=
"false"
/>
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java
浏览文件 @
ddfa9221
...
@@ -6,11 +6,13 @@ import java.util.Map.Entry;
...
@@ -6,11 +6,13 @@ import java.util.Map.Entry;
import
java.util.concurrent.atomic.AtomicLong
;
import
java.util.concurrent.atomic.AtomicLong
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.lookup.logging.LogEnabled
;
import
org.unidal.lookup.logging.LogEnabled
;
import
org.unidal.lookup.logging.Logger
;
import
org.unidal.lookup.logging.Logger
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.analysis.AbstractMessageAnalyzer
;
import
com.dianping.cat.analysis.AbstractMessageAnalyzer
;
import
com.dianping.cat.analysis.MessageAnalyzer
;
import
com.dianping.cat.config.server.ServerFilterConfigManager
;
import
com.dianping.cat.config.server.ServerFilterConfigManager
;
import
com.dianping.cat.configuration.NetworkInterfaceManager
;
import
com.dianping.cat.configuration.NetworkInterfaceManager
;
import
com.dianping.cat.consumer.state.model.entity.Detail
;
import
com.dianping.cat.consumer.state.model.entity.Detail
;
...
@@ -19,11 +21,12 @@ import com.dianping.cat.consumer.state.model.entity.Message;
...
@@ -19,11 +21,12 @@ import com.dianping.cat.consumer.state.model.entity.Message;
import
com.dianping.cat.consumer.state.model.entity.ProcessDomain
;
import
com.dianping.cat.consumer.state.model.entity.ProcessDomain
;
import
com.dianping.cat.consumer.state.model.entity.StateReport
;
import
com.dianping.cat.consumer.state.model.entity.StateReport
;
import
com.dianping.cat.message.spi.MessageTree
;
import
com.dianping.cat.message.spi.MessageTree
;
import
com.dianping.cat.report.ReportManager
;
import
com.dianping.cat.report.DefaultReportManager.StoragePolicy
;
import
com.dianping.cat.report.DefaultReportManager.StoragePolicy
;
import
com.dianping.cat.report.ReportManager
;
import
com.dianping.cat.statistic.ServerStatistic.Statistic
;
import
com.dianping.cat.statistic.ServerStatistic.Statistic
;
import
com.dianping.cat.statistic.ServerStatisticManager
;
import
com.dianping.cat.statistic.ServerStatisticManager
;
@Named
(
type
=
MessageAnalyzer
.
class
,
value
=
StateAnalyzer
.
ID
,
instantiationStrategy
=
Named
.
PER_LOOKUP
)
public
class
StateAnalyzer
extends
AbstractMessageAnalyzer
<
StateReport
>
implements
LogEnabled
{
public
class
StateAnalyzer
extends
AbstractMessageAnalyzer
<
StateReport
>
implements
LogEnabled
{
public
static
final
String
ID
=
"state"
;
public
static
final
String
ID
=
"state"
;
...
@@ -36,7 +39,6 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
...
@@ -36,7 +39,6 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
@Inject
@Inject
private
ServerFilterConfigManager
m_serverFilterConfigManager
;
private
ServerFilterConfigManager
m_serverFilterConfigManager
;
@Inject
private
String
m_ip
=
NetworkInterfaceManager
.
INSTANCE
.
getLocalHostAddress
();
private
String
m_ip
=
NetworkInterfaceManager
.
INSTANCE
.
getLocalHostAddress
();
private
Machine
buildStateInfo
(
Machine
machine
)
{
private
Machine
buildStateInfo
(
Machine
machine
)
{
...
@@ -209,4 +211,8 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
...
@@ -209,4 +211,8 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
machine
.
findOrCreateProcessDomain
(
domain
).
addIp
(
ip
);
machine
.
findOrCreateProcessDomain
(
domain
).
addIp
(
ip
);
}
}
}
}
public
void
setIp
(
String
ip
)
{
m_ip
=
ip
;
}
}
}
cat-consumer/src/test/java/com/dianping/cat/consumer/state/StateAnalyzerTest.java
浏览文件 @
ddfa9221
...
@@ -30,7 +30,7 @@ public class StateAnalyzerTest extends ComponentTestCase {
...
@@ -30,7 +30,7 @@ public class StateAnalyzerTest extends ComponentTestCase {
Date
date
=
sdf
.
parse
(
"20120101 00:00:00:00"
);
Date
date
=
sdf
.
parse
(
"20120101 00:00:00:00"
);
m_analyzer
=
(
StateAnalyzer
)
lookup
(
MessageAnalyzer
.
class
,
StateAnalyzer
.
ID
);
m_analyzer
=
(
StateAnalyzer
)
lookup
(
MessageAnalyzer
.
class
,
StateAnalyzer
.
ID
);
m_analyzer
.
setIp
(
"192.168.1.1"
);
m_analyzer
.
initialize
(
date
.
getTime
(),
Constants
.
HOUR
,
Constants
.
MINUTE
*
5
);
m_analyzer
.
initialize
(
date
.
getTime
(),
Constants
.
HOUR
,
Constants
.
MINUTE
*
5
);
}
}
...
...
cat-consumer/src/test/java/com/dianping/cat/consumer/state/Configurator.java
→
cat-consumer/src/test/java/com/dianping/cat/consumer/state/
StateAnalyzerTest
Configurator.java
浏览文件 @
ddfa9221
...
@@ -4,50 +4,50 @@ import java.util.ArrayList;
...
@@ -4,50 +4,50 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.lookup.configuration.AbstractResourceConfigurator
;
import
org.unidal.lookup.configuration.AbstractResourceConfigurator
;
import
org.unidal.lookup.configuration.Component
;
import
org.unidal.lookup.configuration.Component
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.Constants
;
import
com.dianping.cat.analysis.MessageAnalyzer
;
import
com.dianping.cat.config.server.ServerConfigManager
;
import
com.dianping.cat.consumer.MockReportManager
;
import
com.dianping.cat.consumer.MockReportManager
;
import
com.dianping.cat.consumer.state.model.entity.StateReport
;
import
com.dianping.cat.consumer.state.model.entity.StateReport
;
import
com.dianping.cat.report.ReportDelegate
;
import
com.dianping.cat.report.ReportDelegate
;
import
com.dianping.cat.report.ReportManager
;
import
com.dianping.cat.report.ReportManager
;
import
com.dianping.cat.statistic.ServerStatisticManager
;
public
class
Configurator
extends
AbstractResourceConfigurator
{
public
class
StateAnalyzerTestConfigurator
extends
AbstractResourceConfigurator
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
generatePlexusComponentsXmlFile
(
new
Configurator
());
generatePlexusComponentsXmlFile
(
new
StateAnalyzerTestConfigurator
());
}
protected
Class
<?>
getTestClass
()
{
return
StateAnalyzerTest
.
class
;
}
}
@Override
@Override
public
List
<
Component
>
defineComponents
()
{
public
List
<
Component
>
defineComponents
()
{
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
final
String
ID
=
StateAnalyzer
.
ID
;
all
.
add
(
C
(
ReportManager
.
class
,
ID
,
MockStateReportManager
.
class
)
//
all
.
add
(
A
(
MockStateReportManager
.
class
));
.
req
(
ReportDelegate
.
class
,
ID
));
all
.
add
(
A
(
ExtendedStateDelegate
.
class
));
all
.
add
(
C
(
ReportDelegate
.
class
,
ID
,
ExtendedStateDelegate
.
class
));
all
.
add
(
A
(
StateAnalyzer
.
class
));
all
.
add
(
C
(
MessageAnalyzer
.
class
,
ID
,
StateAnalyzer
.
class
).
req
(
ReportManager
.
class
,
ID
)
.
req
(
ServerConfigManager
.
class
,
ServerStatisticManager
.
class
).
config
(
E
(
"m_ip"
).
value
(
"192.168.1.1"
)));
return
all
;
return
all
;
}
}
protected
Class
<?>
getTestClass
()
{
return
StateAnalyzerTest
.
class
;
}
@Named
(
type
=
ReportDelegate
.
class
,
value
=
StateAnalyzer
.
ID
)
public
static
class
ExtendedStateDelegate
extends
StateDelegate
{
public
static
class
ExtendedStateDelegate
extends
StateDelegate
{
}
}
@Named
(
type
=
ReportManager
.
class
,
value
=
StateAnalyzer
.
ID
)
public
static
class
MockStateReportManager
extends
MockReportManager
<
StateReport
>
{
public
static
class
MockStateReportManager
extends
MockReportManager
<
StateReport
>
{
@Inject
(
StateAnalyzer
.
ID
)
private
ReportDelegate
<
StateReport
>
m_delegate
;
private
StateReport
m_report
;
private
StateReport
m_report
;
@Inject
@Override
private
ReportDelegate
<
StateReport
>
m_delegate
;
public
void
destory
()
{
}
@Override
@Override
public
StateReport
getHourlyReport
(
long
startTime
,
String
domain
,
boolean
createIfNotExist
)
{
public
StateReport
getHourlyReport
(
long
startTime
,
String
domain
,
boolean
createIfNotExist
)
{
...
@@ -57,10 +57,5 @@ public class Configurator extends AbstractResourceConfigurator {
...
@@ -57,10 +57,5 @@ public class Configurator extends AbstractResourceConfigurator {
return
m_report
;
return
m_report
;
}
}
@Override
public
void
destory
()
{
}
}
}
}
}
cat-consumer/src/test/resources/com/dianping/cat/consumer/state/StateAnalyzerTest.xml
浏览文件 @
ddfa9221
<?xml version="1.0" encoding="utf-8"?>
<plexus>
<plexus>
<components>
<components>
<component>
<component>
<role>
com.dianping.cat.report.ReportManager
</role>
<role>
com.dianping.cat.report.ReportManager
</role>
<role-hint>
state
</role-hint>
<role-hint>
state
</role-hint>
<implementation>
com.dianping.cat.consumer.state.Configurator$MockStateReportManager
</implementation>
<implementation>
com.dianping.cat.consumer.state.
StateAnalyzerTest
Configurator$MockStateReportManager
</implementation>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.report.ReportDelegate
</role>
<role>
com.dianping.cat.report.ReportDelegate
</role>
...
@@ -14,25 +15,34 @@
...
@@ -14,25 +15,34 @@
<component>
<component>
<role>
com.dianping.cat.report.ReportDelegate
</role>
<role>
com.dianping.cat.report.ReportDelegate
</role>
<role-hint>
state
</role-hint>
<role-hint>
state
</role-hint>
<implementation>
com.dianping.cat.consumer.state.Configurator$ExtendedStateDelegate
</implementation>
<implementation>
com.dianping.cat.consumer.state.StateAnalyzerTestConfigurator$ExtendedStateDelegate
</implementation>
<requirements>
<requirement>
<role>
com.dianping.cat.task.TaskManager
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.report.ReportBucketManager
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.analysis.MessageAnalyzer
</role>
<role>
com.dianping.cat.analysis.MessageAnalyzer
</role>
<role-hint>
state
</role-hint>
<role-hint>
state
</role-hint>
<implementation>
com.dianping.cat.consumer.state.StateAnalyzer
</implementation>
<implementation>
com.dianping.cat.consumer.state.StateAnalyzer
</implementation>
<configuration>
<instantiation-strategy>
per-lookup
</instantiation-strategy>
<m_ip>
192.168.1.1
</m_ip>
</configuration>
<requirements>
<requirements>
<requirement>
<requirement>
<role>
com.dianping.cat.report.ReportManager
</role>
<role>
com.dianping.cat.report.ReportManager
</role>
<role-hint>
state
</role-hint>
<role-hint>
state
</role-hint>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.
config.server.ServerConfig
Manager
</role>
<role>
com.dianping.cat.
statistic.ServerStatistic
Manager
</role>
</requirement>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.statistic.ServerStatisticManager
</role>
<role>
com.dianping.cat.config.server.ServerFilterConfigManager
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.config.server.ServerConfigManager
</role>
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
...
...
cat-home/src/test/java/com/dianping/cat/TestServer.java
浏览文件 @
ddfa9221
package
com.dianping.cat
;
package
com.dianping.cat
;
import
java.util.EnumSet
;
import
javax.servlet.DispatcherType
;
import
org.eclipse.jetty.servlets.GzipFilter
;
import
org.eclipse.jetty.webapp.WebAppContext
;
import
org.eclipse.jetty.webapp.WebAppContext
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
@@ -10,7 +15,6 @@ import org.unidal.test.jetty.JettyServer;
...
@@ -10,7 +15,6 @@ import org.unidal.test.jetty.JettyServer;
public
class
TestServer
extends
JettyServer
{
public
class
TestServer
extends
JettyServer
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
TestServer
server
=
new
TestServer
();
TestServer
server
=
new
TestServer
();
System
.
setProperty
(
"devMode"
,
"true"
);
server
.
startServer
();
server
.
startServer
();
server
.
startWebApp
();
server
.
startWebApp
();
server
.
stopServer
();
server
.
stopServer
();
...
@@ -28,7 +32,7 @@ public class TestServer extends JettyServer {
...
@@ -28,7 +32,7 @@ public class TestServer extends JettyServer {
@Override
@Override
protected
void
postConfigure
(
WebAppContext
context
)
{
protected
void
postConfigure
(
WebAppContext
context
)
{
//
context.addFilter(GzipFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
context
.
addFilter
(
GzipFilter
.
class
,
"/*"
,
EnumSet
.
of
(
DispatcherType
.
REQUEST
));
}
}
@Test
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录