Commit Graph

168 Commits

Author SHA1 Message Date
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 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
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
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
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
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
ascrutae 3bbf370d80 fix test case issue 2017-03-13 23:50:25 +08:00
ascrutae 894cc4fd16 fix tomcat cannot works issue 2017-03-13 23:45:25 +08:00
ascrutae 7d463fbdf7 Merge commit '533be469201216d303532203a6da26b02b6ec833' into feature/3.0
# Conflicts:
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java
2017-03-13 22:35:10 +08:00
ascrutae 533be46920 fix #103 2017-03-13 22:31:33 +08:00
wusheng fa187ca945 Add a new ability to ServiceStarter, about finding a started service instance. 2017-03-13 17:13:59 +08:00
wusheng f1d2aea35e Fix a test case failure issue. 2017-03-13 16:01:06 +08:00
wusheng 738d156495 Recover logging-api/logging-log4j2 modules. Adjust codes for new modules. 2017-03-13 15:57:51 +08:00
ascrutae d8d916a29b fix test failure issue 2017-03-11 16:34:15 +08:00
ascrutae e3e2591d33 fix operation name of jdbc plugin issue 2017-03-11 16:26:24 +08:00
ascrutae 765b15e026 fix tomcat span without peer host and peer port issue 2017-03-11 16:14:13 +08:00
吴晟 Wu Sheng 2fb18ebc4e Merge pull request #97 from wu-sheng/feature/collector
Add collector modules to 3.0
2017-03-10 23:10:52 +08:00
ascrutae 21696f132f fix http client plugin test failure issue 2017-03-08 21:31:29 +08:00
ascrutae c4b610982e fix java doc issue 2017-03-08 06:25:52 +08:00
wusheng 082bcbc21b Add two trace segment mock API. 1.Tomcat-> Dubbo 2.Dubbo -> MySQL 2017-03-05 23:43:25 +08:00
ascrutae 8c5b1e8cb8 fix issue 2017-03-04 23:12:55 +08:00
pengys5 db1af49366 solve compile error 2017-03-03 21:01:13 +08:00
ascrutae d1f320a0e8 fix jedis cannot finish span issue 2017-03-02 18:54:54 +08:00
ascrutae 7e701394fc fix test issue 2017-03-02 15:19:32 +08:00
ascrutae 223b4de2a4 fix context data cannot transport to provider side issue 2017-03-02 15:09:30 +08:00
wusheng bbdede77c9 no message 2017-03-02 14:48:24 +08:00
wusheng f2fb5ca9fa Add new extract method. 2017-03-02 14:46:51 +08:00
wusheng 6dd4f47524 Merge branch 'feature/3.0' of https://github.com/wu-sheng/sky-walking into feature/3.0
* 'feature/3.0' of https://github.com/wu-sheng/sky-walking:
  fix compile issue
  fix operation name of redis span issue
  add test case and fix some issue
  add test case and fix some issue
2017-03-02 11:51:56 +08:00
wusheng 786f89f28e Create a new method about getTraceSegmentId 2017-03-02 11:51:43 +08:00
ascrutae 6ee093b196 fix compile issue 2017-03-02 07:59:23 +08:00
ascrutae e3aae0253d fix operation name of redis span issue 2017-03-02 07:31:22 +08:00
ascrutae 1f876948d2 add test case and fix some issue 2017-03-01 23:03:01 +08:00
ascrutae 20193495b4 add test case and fix some issue 2017-03-01 15:41:12 +08:00
ascrutae dfee12c565 Merge commit 'ee7cf9da2bd3e6beaf6c53c75092a8fac4de391a' into feature/3.0 2017-02-28 18:08:33 +08:00
ascrutae bc848be560 add test case and fix some issue 2017-02-28 18:01:09 +08:00
wusheng ee7cf9da2b Add easylog test cases. Need refactor these classes later. 2017-02-28 16:37:09 +08:00
wusheng 99024b3d0f Add api/conf test case. 2017-02-28 15:58:27 +08:00
wusheng 6deb4bb837 Alter the TraceSegement build mechanism in sniffer-mock module. 2017-02-28 15:30:19 +08:00
wusheng 6e2ccfabcd Add a test case about System.out/err. 2017-02-28 15:07:54 +08:00
wusheng a5f2aa1f47 Add test case for ArgumentTypeNameMatch.java 2017-02-28 11:43:12 +08:00
吴晟 Wu Sheng 7df2104294 Merge pull request #92 from ascrutae/feature/3.0
Fix HttpClient plugin issue and add test case
2017-02-28 11:08:08 +08:00
ascrutae de74af602b remove code 2017-02-28 11:00:20 +08:00