Commit Graph

123 Commits

Author SHA1 Message Date
wusheng e50dc3da2d Print gloablTraceId insteadof segementTraceId, in log and context toolkits. 2017-04-07 12:05:28 +08:00
wusheng d1ebaf939d 1. Update readme. 2. As httpclient being created everytime, remove the “keepAliveStrategy”. 2017-04-04 23:03:42 +08:00
Xin,Zhang e8a427233c fix httpclient not close (#122)
* fix httpclient issue
* @ascrutae As you pr too many commits, I will use `confirm squash and merge`.
2017-04-04 23:01:52 +08:00
wusheng 26841dfc75 Fix startup issue. 2017-03-24 17:00:52 +08:00
wusheng c15706b46c Add comments for sniffer Config. 2017-03-23 19:44:35 +08:00
wusheng dab1de8d22 Fix ci fail. 2017-03-23 16:57:22 +08:00
wusheng f8b624c3ce Add test case about enum config init. 2017-03-23 16:39:01 +08:00
wusheng 388d2481a0 Fix typo, and remove unnecessary lock in NoConcurrencyAceessObject. Refact FileWriter and SnifferConfigInitializer. 2017-03-23 16:29:48 +08:00
wusheng fa81a0f6ba Check sampling mechanism. 2017-03-22 16:51:56 +08:00
wusheng 680c2c2337 Add host:port/peers to ContextCarrier. 2017-03-22 14:19:21 +08:00
wusheng d6696ad285 Fix database plugin missing tag span.kind. 2017-03-22 11:22:46 +08:00
wusheng 5f6dd33ce1 Fix jedis missing tag: span.kind. 2017-03-22 10:46:33 +08:00
wusheng 572cfc5875 Fix CI issue. 2017-03-21 19:16:16 +08:00
wusheng 2940f762b9 Fix tag bugs. Adjust TraceSegment and ContextCarrier. Add sampling mechanism. #110 2017-03-21 19:03:13 +08:00
wusheng b8051d3ec3 Recover server.start() 2017-03-20 23:11:20 +08:00
wusheng baf9bf6942 Finish CollectorClient code. It is almost ready to send TraceSegement (s) to collector in batch/fail-switch mode. 2017-03-20 17:32:15 +08:00
吴晟 Wu Sheng e71bebaf6a Merge pull request #108 from ascrutae/feature/3.0
Add test cases
2017-03-20 15:03:19 +08:00
wusheng dcafdaa348 Fix compile issue. Add new rest-service Object: SegmentsMessage.java. It uses Gson(JsonAdapter) as serialize/deserialize tool. 2017-03-20 14:45:08 +08:00
ascrutae 7f60dda104 Rename code 2017-03-20 11:18:59 +08:00
ascrutae 9fc591c3b3 remove unused import 2017-03-20 11:02:30 +08:00
ascrutae e35b011af0 Merge commit 'f48f82fcf433bc319908a19eb15cd10e930c429f' into feature/3.0 2017-03-20 10:53:08 +08:00
ascrutae 240cacb447 add plugin test cases 2017-03-20 10:41:19 +08:00
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
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
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