Commit Graph

110 Commits

Author SHA1 Message Date
wusheng a461931823 Remove collector dependency from agent-module. We will use HTTP-restful-service. Remove unnecessary dependencies/shades on collector and agent sides. Fix CI issue. 2017-03-18 21:48:35 +08:00
wusheng c4340859a7 Remove unused config. 2017-03-18 19:57:36 +08:00
wusheng 7d6dc495d4 1.Move ‘application.conf’ to collector-commons module. 2.Remove the unnecessary contents in‘application.conf’. 3.Remove ISerializable interface(useless) 2017-03-17 23:44:50 +08:00
pengys5 a50171e923 add commons moudle contains roles and serializer 2017-03-17 21:02:07 +08:00
pengys5 f26e64ad6e Merge remote-tracking branch 'origin/master' into feature/collector
# Conflicts:
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/Context.java
#	skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/applicationref/ApplicationRefMain.java
2017-03-17 18:58:41 +08:00
wusheng 6a833baf75 Add agent-client codes. 2017-03-17 17:38:03 +08:00
wusheng 01a08caea3 Merge branch 'feature/collector' into feature/3.0
* feature/collector:
  compile error
  refactor the way how to create worker instance
  refactor cluster module, modify the way use to tell cluster worker
  add recevier moudle

# Conflicts:
#	skywalking-collector/pom.xml
#	skywalking-collector/skywalking-collector-cluster/pom.xml
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractMember.java
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRef.java
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkersCreator.java
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java
#	skywalking-collector/skywalking-collector-worker/pom.xml
#	skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java
2017-03-17 16:16:04 +08:00
wusheng 0d0d984034 1. Remove the primary ref. Only use ref to the parent segment.
2. Adjust globalTracerIds
2017-03-17 11:25:51 +08:00
wusheng 76fd789d74 Add new test case for 3 InvokeContextTest. 2017-03-16 18:56:42 +08:00
wusheng 14fc924cc4 Fix interceptor instance singleton bug, and add some test cases. 2017-03-16 18:45:33 +08:00
wusheng 5c369aefb4 Alter TraceSegement, Add a list of DistributedTraceId as field `relatedGlobalTraces`. 2017-03-16 16:30:11 +08:00
wusheng 82ccb8dc23 Rename ServiceStarter to ServiceManager.
Finish the major codes of TraceSegmentProcessQueue and CollectorClientService.
2017-03-14 16:55:14 +08:00
wusheng fa187ca945 Add a new ability to ServiceStarter, about finding a started service instance. 2017-03-13 17:13:59 +08:00
wusheng 738d156495 Recover logging-api/logging-log4j2 modules. Adjust codes for new modules. 2017-03-13 15:57:51 +08:00
吴晟 Wu Sheng 2fb18ebc4e Merge pull request #97 from wu-sheng/feature/collector
Add collector modules to 3.0
2017-03-10 23:10:52 +08:00
pengys5 db1af49366 solve compile error 2017-03-03 21:01:13 +08:00
ascrutae d1f320a0e8 fix jedis cannot finish span issue 2017-03-02 18:54:54 +08:00
wusheng bbdede77c9 no message 2017-03-02 14:48:24 +08:00
wusheng f2fb5ca9fa Add new extract method. 2017-03-02 14:46:51 +08:00
wusheng 786f89f28e Create a new method about getTraceSegmentId 2017-03-02 11:51:43 +08:00
wusheng ee7cf9da2b Add easylog test cases. Need refactor these classes later. 2017-02-28 16:37:09 +08:00
wusheng 99024b3d0f Add api/conf test case. 2017-02-28 15:58:27 +08:00
wusheng 6e2ccfabcd Add a test case about System.out/err. 2017-02-28 15:07:54 +08:00
wusheng a5f2aa1f47 Add test case for ArgumentTypeNameMatch.java 2017-02-28 11:43:12 +08:00
wusheng acdbc5e11b Remove all common-log modules(useless). 2017-02-28 10:50:28 +08:00
wusheng da1427bf2d Add 5 new test cases. 2017-02-27 18:04:25 +08:00
wusheng eb52c386c7 Remoe health-report module. Because the HealthCollector is based on ConcurrentHashMap. This triggers a performance issue, when the TPS is very high.( > 500) 2017-02-27 15:37:13 +08:00
吴晟 Wu Sheng 438359d833 Merge branch 'feature/3.0' into feature/3.0 2017-02-25 21:41:56 +08:00
wusheng b66c14d02b Alter dependency.version 2017-02-25 10:59:33 +08:00
zhangxin cea88f981d Rewrite plugins by using new API 2017-02-24 15:01:38 +08:00
wusheng 37cc5a333e Alter ContextCarrier, add applicationCode and peerHost 2017-02-23 17:34:14 +08:00
wusheng 5902154ae6 remove a test main. 2017-02-23 14:53:45 +08:00
wusheng a656eefcb8 Fix compile issue. 2017-02-23 14:53:08 +08:00
wusheng a23538df38 Add a new field, applicationCode, in TraceSegment. 2017-02-23 14:13:32 +08:00
wusheng 886d6ea30e Add ISerializable interface, and implement this interface in ‘TraceSegment’, ‘TraceSegmentRef’, ‘Span’, ‘LogData’ 2017-02-22 16:12:28 +08:00
wusheng bfa53127fb Fix opentracing-toolkit activation compile issue, and useless codes. 2017-02-21 16:00:28 +08:00
wusheng b69cd85149 fix compile issues 2017-02-21 09:38:02 +08:00
wusheng 96f6c5fad9 Add Tomcat span, and singleTrace mock. 2017-02-20 23:34:34 +08:00
wusheng a4d2f23791 Add skywalking-sniffer-mock module. For testing sdk-plugin and collector(not merged yet) modules. 2017-02-20 22:34:47 +08:00
wusheng 75d8aba0f4 Big refactor. Rename the api-module root package name . 2017-02-20 21:54:08 +08:00
wusheng ebd745c728 Refactor code. 2017-02-19 17:47:25 +08:00
zhangxin 8a8d6e6bc7 add delegate method 2017-02-19 14:50:05 +08:00
wusheng cfbf6889e8 Increase `context` package test line coverage to 97% 2017-02-19 13:03:59 +08:00
wusheng 431dd9b5fa increase test converage. 2017-02-19 10:56:15 +08:00
wusheng 47df503bad Refactor TracerContext.finish() 2017-02-19 08:50:38 +08:00
wusheng 04638c5177 Rename and refactor SimapleObjectFirstInvokeInterceptor to NoCocurrencyAceessObject 2017-02-19 08:24:58 +08:00
wusheng 51a60cd67f Add log event, and a sample to trace db.preparedStatement. 2017-02-19 00:19:49 +08:00
wusheng 106dc93fe8 fix api compile issue. remove rmi-oracle plugin. 2017-02-18 23:33:43 +08:00
wusheng fde3c60a1a Add get method to all ‘Tag’ classes. Begin to add test case. 2017-02-18 21:47:49 +08:00
wusheng a395340532 Add new TraceProcessQueue, and refactor more codes. 2017-02-18 00:05:19 +08:00