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
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
吴晟 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
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
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
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
wusheng
6a833baf75
Add agent-client codes.
2017-03-17 17:38:03 +08:00
wusheng
ebb0f9e469
Merge branch 'feature/3.0'
...
* feature/3.0:
compile error
refactor the way how to create worker instance
1. Remove the primary ref. Only use ref to the parent segment. 2. Adjust globalTracerIds
refactor cluster module, modify the way use to tell cluster worker
Add tags test case.
Add new test case for 3 InvokeContextTest.
Fix interceptor instance singleton bug, and add some test cases.
Alter TraceSegement, Add a list of DistributedTraceId as field `relatedGlobalTraces`.
Shade akka.* in collector-worker. Prevent akka se/deserializing failure.
Rename ServiceStarter to ServiceManager. Finish the major codes of TraceSegmentProcessQueue and CollectorClientService.
Sync a result pom
add recevier moudle
fix test case issue
fix tomcat cannot works issue
fix #103
Add a new ability to ServiceStarter, about finding a started service instance.
Fix a test case failure issue.
Recover logging-api/logging-log4j2 modules. Adjust codes for new modules.
2017-03-17 16:36:22 +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
pengys5
934aa6bb6c
compile error
2017-03-17 13:17:50 +08:00
pengys5
7970dce9fb
refactor the way how to create worker instance
2017-03-17 13:04:45 +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
pengys5
c440bdf56c
refactor cluster module, modify the way use to tell cluster worker
2017-03-16 22:28:20 +08:00
wusheng
dfa0eead31
Add tags test case.
2017-03-16 20:22:24 +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
5781437984
Shade akka.* in collector-worker. Prevent akka se/deserializing failure.
2017-03-15 20:22:53 +08:00
吴晟 Wu Sheng
b2822e9b5f
Update README.md
...
Update latest release version to 2.3
2017-03-14 17:40:41 +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
413f207ec7
Sync a result pom
2017-03-14 15:23:20 +08:00
pengys5
50193bee09
add recevier moudle
2017-03-14 15:00:02 +08:00
吴晟 Wu Sheng
9b47b0c328
Merge pull request #105 from ascrutae/feature/3.0
...
fix tomcat cannot works issue
2017-03-14 06:11:06 +08:00
ascrutae
3bbf370d80
fix test case issue
2017-03-13 23:50:25 +08:00