Commit Graph

153 Commits

Author SHA1 Message Date
pengys5 73417f926c add dag node search service use jetty servlet 2017-03-20 10:33:54 +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 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 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
pengys5 c440bdf56c refactor cluster module, modify the way use to tell cluster worker 2017-03-16 22:28:20 +08:00
wusheng 5781437984 Shade akka.* in collector-worker. Prevent akka se/deserializing failure. 2017-03-15 20:22:53 +08:00
pengys5 50193bee09 add recevier moudle 2017-03-14 15:00:02 +08:00
wusheng 738d156495 Recover logging-api/logging-log4j2 modules. Adjust codes for new modules. 2017-03-13 15:57:51 +08:00
pengys5 bb4683f864 a test case compile error 2017-03-10 22:53:14 +08:00
pengys5 c2a1ef4d6d add ClusterEvent.UnreachableMember in WorkersListener to unregister from WorkersRefCenter 2017-03-10 22:35:52 +08:00
pengys5 813aef07c0 add timeslice abstract class 2017-03-10 11:52:47 +08:00
pengys5 1061dd6418 add local analysis async layer 2017-03-09 11:05:26 +08:00
pengys5 a941b0233d compile error 2017-03-07 15:47:13 +08:00
pengys5 c5b6b57f42 no message 2017-03-07 15:41:29 +08:00
pengys5 3ec54e3f91 add async member use Disruptor queue 2017-03-06 22:35:09 +08:00
pengys5 39651af917 no message 2017-03-03 21:22:20 +08:00
pengys5 e3c98ed9a6 no message 2017-03-03 21:11:01 +08:00
pengys5 db1af49366 solve compile error 2017-03-03 21:01:13 +08:00
pengys5 a6ca67f6bf main test 2017-03-03 20:14:29 +08:00
pengys5 29fcbc04be collector worker finish, but not test 2017-03-02 23:09:05 +08:00
pengys5 c19158142e modify worker member 2017-03-02 12:37:53 +08:00
pengys5 34a8925430 support local worker and cluster worker 2017-03-02 10:26:09 +08:00
pengys5 43812c1f67 solve test case compile error 2017-02-27 00:08:31 +08:00
pengys5 3b4fd3435b solve complile error 2017-02-26 23:01:58 +08:00
pengys5 cf5c0a2091 add comment for the module of skywalking-collector-cluster 2017-02-26 22:09:41 +08:00
pengys5 b6388251af Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector
# Conflicts:
#	skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
2017-02-25 22:34:31 +08:00
pengys5 3b8109b393 1. cluster and actor module amalgamated into single one
2. created workerref class use for cover akka actorref class
2017-02-25 22:22:17 +08:00
wusheng c87cc00787 Rename local variable name. 2017-02-25 20:12:07 +08:00
wusheng fda13399d8 Rename package name. 2017-02-25 20:10:46 +08:00
wusheng 83b8a173ac Manual merge. 2017-02-25 20:07:49 +08:00
pengys5 2e0f56f511 Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector
# Conflicts:
#	skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
2017-02-25 20:06:24 +08:00
wusheng e93c6a65c4 Rename. 2017-02-25 20:02:25 +08:00
pengys5 65ceb3f47a no message 2017-02-25 19:52:50 +08:00
wusheng fb91b6f277 Fix a compile issue. 2017-02-25 19:34:12 +08:00
wusheng f9bee8c4e6 Refactor codes to a new style. All the refactors are based on the new WorkerSelector. 2017-02-25 19:33:11 +08:00
pengys5 e8fb8e34e9 actor 2017-02-25 17:54:48 +08:00
wusheng bbc29d8bae Merge branch 'feature/3.0' into feature/collector
* feature/3.0:
  Alter ContextCarrier, add applicationCode and peerHost
  remove a test main.
  Fix compile issue.
  Add a new field, applicationCode,  in TraceSegment.
  Add a log field.
  Fix ‘tags.get’ cause ClassCastException, because after akka-message/serialize, all tags values are type of String.class.
  Fix serialize bugs.
  Add ISerializable interface, and implement this interface in ‘TraceSegment’, ‘TraceSegmentRef’, ‘Span’, ‘LogData’
  Add the trace proto file.
  Fix some compile issues. Add protobuf dependency, and protoc-grpc-plugin.
  Fix log-toolkits(log4j, log4j2, logback) compile issue.
  Fix opentracing-toolkit activation compile issue, and useless codes.

# Conflicts:
#	pom.xml

Give a new demo AbstractWorkerProviderTestCase.
2017-02-24 18:04:05 +08:00
pengys5 a6b6899b19 SpiTest 2017-02-24 17:53:45 +08:00
pengys5 1a4a137f45 collector cluster 2017-02-24 17:04:15 +08:00
pengys5 dd5ce74328 actor provider 2017-02-23 22:15:15 +08:00
pengys5 c82ad2865c config of system start 2017-02-22 22:12:31 +08:00
wusheng 4960fa801e fix dependency version. 2017-02-21 23:41:57 +08:00