Commit Graph

1442 Commits

Author SHA1 Message Date
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
wusheng 13d2b48db2 Fix pom. 2017-02-26 22:55:55 +08:00
pengys5 57251852a6 Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector 2017-02-26 22:10:10 +08:00
pengys5 cf5c0a2091 add comment for the module of skywalking-collector-cluster 2017-02-26 22:09:41 +08:00
wusheng 7ee0243b09 Merge branch 'feature/3.0' into feature/collector
* feature/3.0:
  fix coverall maven plugin issue
  fix coveralls issue

# Conflicts:
#	pom.xml

Support ci and coverage.
2017-02-26 20:52:13 +08:00
吴晟 Wu Sheng 5c2ff31085 Merge pull request #91 from ascrutae/fix/coveralls-issure
Fix confirm.
2017-02-26 20:45:35 +08:00
吴晟 Wu Sheng 9650c2ebbd Merge branch 'feature/3.0' into fix/coveralls-issure 2017-02-26 20:41:03 +08:00
zhangxin a662cd3827 fix coverall maven plugin issue 2017-02-26 20:14:09 +08:00
吴晟 Wu Sheng 12263d85c8 Merge pull request #90 from ascrutae/fix/coveralls-issure
Try to fix coveralls issue. Give it a try.
2017-02-26 17:59:22 +08:00
zhangxin b3a10fbfe5 fix coveralls issue 2017-02-26 17:40:24 +08:00
Xin,Zhang 04a232dd72 Merge pull request #2 from wu-sheng/feature/3.0
merge Feature/3.0
2017-02-26 16:51:40 +08:00
wusheng 23919f3f36 Merge branch 'feature/3.0' into feature/collector
* feature/3.0:
  no message
  Add generated source codes to src/main/java, try to avoid coveralls bug.
2017-02-25 22:47:05 +08:00
wusheng cbe370b88f no message 2017-02-25 22:41:31 +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
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
wusheng 806959138b Merge branch 'feature/3.0' into feature/collector
* feature/3.0:
  Test ci of protobuf
  update the comment to improve the comment readable
  update the comment to improve the comment readable
  Alter dependency.version
  Fix compile issue.
  Fix compile issue.
  Rewrite  plugins by using  new API
  Modify the redis plugin using the new API
  Modify the motan plugin using the new API
  Modify the Tomcat plugin using the new API
  Modify the Dubbo plugin using the new API
2017-02-25 22:24:13 +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 20eeac9504 Test ci of protobuf 2017-02-25 22:14:12 +08:00
吴晟 Wu Sheng 09f4081bbd Merge pull request #87 from ascrutae/feature/3.0
Rewrite plugin using new API
2017-02-25 21:42:16 +08:00
吴晟 Wu Sheng 438359d833 Merge branch 'feature/3.0' into feature/3.0 2017-02-25 21:41:56 +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
zhangxin eacc014eec update the comment to improve the comment readable 2017-02-25 17:58:57 +08:00
pengys5 aca66aecb0 Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector 2017-02-25 17:55:58 +08:00
pengys5 e8fb8e34e9 actor 2017-02-25 17:54:48 +08:00
zhangxin ec85719019 update the comment to improve the comment readable 2017-02-25 17:37:50 +08:00
wusheng b66c14d02b Alter dependency.version 2017-02-25 10:59:33 +08:00
wusheng 03ad97fac0 Merge branch 'feature/3.0' into feature/collector
* feature/3.0:
  Update grpc to 1.1.2
2017-02-25 10:36:34 +08:00
wusheng 209cc191bb Update grpc to 1.1.2 2017-02-24 18:23:05 +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
zhangxin 9654b01c30 Fix compile issue. 2017-02-24 16:30:53 +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
pengys5 dd5ce74328 actor provider 2017-02-23 22:15:15 +08:00
zhangxin efe11cade6 Merge remote-tracking branch 'upstream/feature/3.0' into feature/3.0 2017-02-23 18:54:10 +08:00
wusheng 37cc5a333e Alter ContextCarrier, add applicationCode and peerHost 2017-02-23 17:34:14 +08:00
wusheng 5902154ae6 remove a test main. 2017-02-23 14:53:45 +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