dd268b2eb2
Merge branch 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking into feature/high-performance-agent
...
* 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking :
let the sense of filter more clear
Fix issue that skywalking-agent.jar include the google class and exclude the proto files inside protobuf-java
2017-06-30 20:08:39 +08:00
e2c85d99b6
Merge pull request #255 from ascrutae/zhangxin/feature/high-performance-agent
...
Exclude google class when shading skywalking-agent.jar
2017-06-30 08:37:35 +08:00
268509deb4
let the sense of filter more clear
2017-06-30 08:13:06 +08:00
8c9c3e65b8
Finish some grpc client codes.
2017-06-29 22:57:18 +08:00
76806a2798
Fix issue that skywalking-agent.jar include the google class and exclude the proto files inside protobuf-java
2017-06-29 22:56:27 +08:00
11b4dc7bd9
Support finding grpc-server list. Attempt to acquire the list every 60 seconds. Related to #254
2017-06-29 21:31:27 +08:00
84769692d9
Update TraceSegmentService.proto
2017-06-29 16:37:22 +08:00
5203081561
Support #206 #241 #253
2017-06-28 22:32:02 +08:00
d2f562f1fa
Adjust segment service and span interface.
2017-06-28 20:40:37 +08:00
e09741c832
Adjust some service.
2017-06-28 17:11:32 +08:00
b7c09d56f9
Remove useless gprc service.
2017-06-28 15:30:52 +08:00
1633d1e316
Merge branch 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking into feature/high-performance-agent
...
* 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking :
fixed grpc proto compile error
2017-06-28 15:15:59 +08:00
c699c64c6a
Remove some useless codes in agent-core.
2017-06-28 15:14:29 +08:00
0adf1db3fb
fixed grpc proto compile error
2017-06-28 15:11:55 +08:00
16fe2ba503
Redefine discovery and register service interface protocol
2017-06-28 14:59:39 +08:00
b3c39aea53
Merge branch 'master' into feature/high-performance-agent
...
* master:
add test case and fix logical error
Fix windows script start collector failure.
fix skywalking container start failure
fix lost tags
Add mechanism to set default status(on/off) of plugin
Add layer tag value: mq.
# Conflicts:
# apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/Span.java
2017-06-28 09:07:06 +08:00
1fd449cddc
Finish the refactor of agent-core.
2017-06-28 09:05:39 +08:00
48b2164f33
Finish almost all codes about TracingContext and three new type spans.
2017-06-27 11:48:54 +08:00
75bc0beaf4
Merge pull request #251 from ascrutae/zhangxin/fix/windows-script-start-failure
...
Fix windows script start collector failure.
2017-06-27 10:13:33 +08:00
834468f55b
Merge branch 'master' into zhangxin/fix/windows-script-start-failure
2017-06-27 10:01:52 +08:00
fd6bcb0895
Merge pull request #245 from ascrutae/zhangxin/feature/force-enable-plugin
...
Add mechanism to set default status(on/off) of plugin
2017-06-27 09:08:56 +08:00
22595c9ebe
Implement some methods of TracingContext.
2017-06-27 00:00:20 +08:00
6cd5be9e1c
Merge branch 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking into feature/high-performance-agent
...
* 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking :
add logic of shade grpc
# Conflicts:
# apm-sniffer/apm-agent/pom.xml
2017-06-26 23:44:29 +08:00
947fed4865
Begin to refactor for performance.
2017-06-26 23:43:18 +08:00
6e1d0d602f
add test case and fix logical error
2017-06-26 22:52:27 +08:00
9efff4bc63
Merge branch 'master' into zhangxin/feature/force-enable-plugin
2017-06-26 20:28:29 +08:00
cf2d0c7fff
Merge pull request #244 from ascrutae/zhangxin/fix/lost-int-tags
...
Fix issue that lost some integer tags
2017-06-26 20:25:57 +08:00
8223377cd4
Merge branch 'master' into zhangxin/fix/lost-int-tags
2017-06-26 20:19:23 +08:00
5ad4df2aa6
Merge pull request #243 from ascrutae/zhangxin/fix/container-start-failure
...
Fix skywalking container start failure
2017-06-26 20:18:19 +08:00
37ecd3a2d6
Fix windows script start collector failure.
2017-06-26 18:42:50 +08:00
a556e6ef7c
fix skywalking container start failure
2017-06-26 11:29:27 +08:00
6081f7f7b1
fix lost tags
2017-06-26 11:26:24 +08:00
ace2e63887
Add mechanism to set default status(on/off) of plugin
2017-06-26 11:23:19 +08:00
4403183cfe
Merge pull request #239 from ascrutae/zhangxin/feature/high-performance-agent
...
add logic of shade grpc
2017-06-24 09:43:12 +08:00
19584b6f8f
add logic of shade grpc
2017-06-24 07:54:45 +08:00
0b4b4b1759
Add layer tag value: mq.
2017-06-24 07:38:02 +08:00
d397151e1f
Add new layer: mq.
2017-06-24 07:36:34 +08:00
9da7968a4d
Added instanceId for services.
2017-06-23 23:24:29 +08:00
fb5585e5c4
Add 4 services definition.
2017-06-23 23:14:22 +08:00
b29881c6fb
Provide the TraceSegmentService prototype.
2017-06-23 21:04:39 +08:00
a7279a8352
Set TraceSegmentService as streaming mode.
2017-06-23 20:22:01 +08:00
a139862c79
Revert "Add logic of shade grpc package"
...
This reverts commit c52686f894
2017-06-23 17:08:53 +08:00
c52686f894
Add logic of shade grpc package
2017-06-23 16:54:14 +08:00
e780e4b680
Add some basic proto classes.
2017-06-22 22:05:30 +08:00
6f2d496ea8
no message
2017-06-22 21:33:50 +08:00
17520e5285
Adjust for style check.
2017-06-22 21:33:02 +08:00
c31fa270d1
Initialize some config for grpc.
2017-06-22 20:55:16 +08:00
86c3646a5c
Merge pull request #231 from ascrutae/zhangxin/fix/start-image-failed
...
Fix start collector image failed
2017-06-18 19:33:08 +08:00
47a084b6ed
Merge pull request #230 from wu-sheng/pengys5-patch-2
...
fixed docker compose image path error
2017-06-18 19:32:32 +08:00
19be41675a
Fix start collector image failed
2017-06-18 17:32:13 +08:00
wusheng
ascrutae
pengys5