Commit Graph

55 Commits

Author SHA1 Message Date
wusheng 58dce9ccba Add some comments. 2017-04-05 17:47:08 +08:00
wusheng 590d93f0ca Adjust an abbreviation 2017-03-21 19:55:00 +08:00
wusheng 2940f762b9 Fix tag bugs. Adjust TraceSegment and ContextCarrier. Add sampling mechanism. #110 2017-03-21 19:03:13 +08:00
ascrutae f90923e886 fix package issue and fix ref segments when call inject one times issue 2017-03-21 10:47:24 +08:00
wusheng 4a2104d25e New TraceSegmentRef.equals/hashCode. 2017-03-20 17:49:57 +08:00
wusheng 4940a3c8df Add coverage on Branch master. 2017-03-20 15:22:33 +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
wusheng f48f82fcf4 Rename logs json key, ls -> lo. 2017-03-18 23:56:18 +08:00
wusheng 4dab082c3c Use gson replace protobuf in serialization. Build as small json as possible.(not finished yet.) 2017-03-18 22:51:51 +08:00
wusheng cd87d0d7cc Add equals methods for DistributedTraceId and TraceSegmentRef. Avoid duplication in TraceSegment, based on LinkedList.contains(). 2017-03-18 09:54:13 +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
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 dfa0eead31 Add tags test case. 2017-03-16 20:22:24 +08:00
wusheng 5c369aefb4 Alter TraceSegement, Add a list of DistributedTraceId as field `relatedGlobalTraces`. 2017-03-16 16:30:11 +08:00
wusheng b29479fe33 fix span serialize bug. 2017-03-09 22:16:55 +08:00
pengys5 1061dd6418 add local analysis async layer 2017-03-09 11:05:26 +08:00
wusheng 52883b8f43 fix serialize/deserialize issue. 2017-03-05 21:10:51 +08:00
pengys5 db1af49366 solve compile error 2017-03-03 21:01:13 +08:00
wusheng 507b6b06f3 Fix tag.get NullPointException 2017-03-03 16:24:31 +08:00
wusheng de6e680615 Fix NullPointException 2017-03-03 16:11:53 +08:00
wusheng f2fb5ca9fa Add new extract method. 2017-03-02 14:46:51 +08:00
zhangxin b3a10fbfe5 fix coveralls issue 2017-02-26 17:40:24 +08:00
wusheng 7bffd0bfb7 Add generated source codes to src/main/java, try to avoid coveralls bug. 2017-02-25 22:39:33 +08:00
zhangxin b543fac778 Fix compile issue. 2017-02-24 15:05:48 +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 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 3c44572d99 Add a log field. 2017-02-22 23:38:32 +08:00
wusheng b00cadb9e6 Fix ‘tags.get’ cause ClassCastException, because after akka-message/serialize, all tags values are type of String.class. 2017-02-22 18:58:03 +08:00
wusheng d6760d35eb Fix serialize bugs. 2017-02-22 17:05:35 +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 554dfc0624 Add the trace proto file. 2017-02-22 14:32:50 +08:00
wusheng eb33354333 Fix some compile issues. Add protobuf dependency, and protoc-grpc-plugin. 2017-02-22 12:02:18 +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 22dba10bde remove blank line. 2017-02-19 21:09:25 +08:00
wusheng 9a9014174d Refactor tags. 2017-02-19 19:13:41 +08:00
wusheng fc19ce8518 Take Adrian Cole ’s advice, remove http prefix of tag. Maybe still need some improvements. 2017-02-19 18:15:43 +08:00
wusheng ebd745c728 Refactor code. 2017-02-19 17:47:25 +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 7e640311ce Alter SPAN_KIND. Add test case to span. 2017-02-19 08:04:30 +08:00
wusheng a31ff52b3e Add severl types of span. 2017-02-19 07:39:58 +08:00
wusheng 51a60cd67f Add log event, and a sample to trace db.preparedStatement. 2017-02-19 00:19:49 +08:00
wusheng b83a56a224 Increase the converage to 86% lines, in skywalking-trace module. 2017-02-18 23:27:23 +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
wusheng 2a660950cf Initialize TraceSegment, TraceSegmentRef, Span, Context, Carrier Class. 2017-02-17 17:14:59 +08:00