Commit Graph

1600 Commits

Author SHA1 Message Date
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 209791c26d Update some things in README. 2017-04-04 19:10:21 +08:00
wusheng 4d7aeeeb9f Update sceenshot of trace query. 2017-04-04 14:01:42 +08:00
吴晟 Wu Sheng b453d7dd63 Merge pull request #120 from ascrutae/feature/3.0
fix start time of span is zero issue
2017-04-04 13:45:09 +08:00
ascrutae 6509e7b758 fix start time of span is zero issue 2017-04-04 10:16:57 +08:00
wusheng 8c54ddd89b Fix the wrong word 2017-04-03 22:29:29 +08:00
wusheng 5a661608bf Update readme file. And remove all images, move those resources to https://github.com/sky-walking/page-resources 2017-04-03 22:16:22 +08:00
wusheng 8af68b1481 Merge branch 'feature/collector' into feature/3.0
* feature/collector:
  modify testcase bug When errors occur in timezone
  mock mock mock
  remove property layer and kind from node index
2017-04-02 13:58:12 +08:00
pengys5 e9abfff154 modify testcase bug When errors occur in timezone 2017-04-01 18:45:41 +08:00
pengys5 be626bdaae mock mock mock 2017-04-01 16:55:54 +08:00
wusheng 08f48eb05d Complement the contributors list. 2017-03-30 10:42:12 +08:00
wusheng 6d67bc2977 Fix typo. 2017-03-30 10:13:14 +08:00
wusheng 42186ca1ac Update readme with new contributors list. 2017-03-30 10:05:31 +08:00
pengys5 88fbc6dfab remove property layer and kind from node index 2017-03-24 19:25:39 +08:00
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