kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,585 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

1585 Commits

Author SHA1 Message Date
pengys5 2e396b2176 Merge remote-tracking branch 'origin/feature/3.0' into feature/collector 2017-03-24 17:57:54 +08:00
pengys5 54ae4b938d repair bug id split and node finder 2017-03-24 17:57:29 +08:00
wusheng 53f3670f9f Adjust collector restful service name. 2017-03-24 17:01:52 +08:00
wusheng 26841dfc75 Fix startup issue. 2017-03-24 17:00:52 +08:00
pengys5 dac1a24110 Merge remote-tracking branch 'origin/feature/3.0' into feature/collector 2017-03-24 15:14:17 +08:00
wusheng c16d7b8bde Merge branch 'feature/collector' into feature/3.0 
* feature/collector:
  dag graph finish
  dag graph reached a crossroads
  no message
  add dag node search service use jetty servlet
  no message
 2017-03-24 15:01:58 +08:00
pengys5 17ba2edbfa dag graph finish 2017-03-24 13:41:59 +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
pengys5 c0650800f0 Merge remote-tracking branch 'origin/feature/3.0' into feature/collector 2017-03-22 09:28:38 +08:00
pengys5 419b40a3d3 dag graph reached a crossroads 2017-03-21 23:52:03 +08:00
wusheng 590d93f0ca Adjust an abbreviation 2017-03-21 19:55:00 +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
pengys5 1fd5873ab7 Merge remote-tracking branch 'origin/feature/3.0' into feature/collector 2017-03-21 17:34:08 +08:00
pengys5 55a50963ab no message 2017-03-21 17:33:52 +08:00
吴晟 Wu Sheng f2434067b9 Merge pull request #109 from ascrutae/feature/3.0 
fix issue
 2017-03-21 11:02:26 +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
ascrutae dac6aad05f fix issue 2017-03-21 00:09:15 +08:00
wusheng b8051d3ec3 Recover server.start() 2017-03-20 23:11:20 +08:00
pengys5 54488d649a Merge remote-tracking branch 'origin/feature/3.0' into feature/collector 
# Conflicts:
#	skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java
 2017-03-20 19:29:33 +08:00
wusheng 4a2104d25e New TraceSegmentRef.equals/hashCode. 2017-03-20 17:49:57 +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
wusheng 4940a3c8df Add coverage on Branch master. 2017-03-20 15:22:33 +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
pengys5 b64873998d Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector 2017-03-20 10:34:29 +08:00
pengys5 73417f926c add dag node search service use jetty servlet 2017-03-20 10:33:54 +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 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 f71ccb812a Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector 2017-03-18 19:14:23 +08:00
pengys5 40fe4e5d94 no message 2017-03-18 19:13:45 +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 bca88fb1a1 1.Remove two useless ClusterConfig. 2.Adjust ClusterConfig.class and its mapping properties file, rename to ’seed_nodes’ . 2017-03-18 00:08:55 +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
pengys5 baf542a7a3 refactor ClusterContext and LocalContext implements Lookup interface that let the user of context just use lookup or findprovider method. 2017-03-17 18:40:22 +08:00