efbdb7450f
Merge branch 'master' into feature/new-id
...
* master:
fix operation id of exit span incorrect issue
2017-07-20 23:18:06 +08:00
329f224763
New id mechanism, need to be tested.
2017-07-20 23:17:21 +08:00
f3bc9d445d
Merge pull request #306 from ascrutae/zhangxin/fix/opeartionId-incorrect
...
fix operation id of exit span incorrect issue
2017-07-20 23:14:20 +08:00
89427eeaf5
fix operation id of exit span incorrect issue
2017-07-20 23:03:48 +08:00
76ceb36363
Merge pull request #305 from wu-sheng/wu-sheng/easy-app-register
...
Add agentUUID in ApplicationInstance
2017-07-20 10:03:41 +08:00
a9add392a1
Update DiscoveryService.proto
...
Add agentUUID in ApplicationInstance
2017-07-20 09:45:54 +08:00
543b2d4461
Support empty operation name, and add buffer size of dictionary for avoiding out of memory.
2017-07-19 22:54:57 +08:00
57b69fb88c
Support #299 and #301
2017-07-19 22:04:32 +08:00
7a91ef7a02
Merge branch 'master' of https://github.com/wu-sheng/sky-walking
...
* 'master' of https://github.com/wu-sheng/sky-walking :
fix miss transport entryServiceName and entryServiceId value
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
fix issue that open tracing activation set tag failed
Make sure the JVM stop hook works #295
Add jvm shutdown hook
# Conflicts:
# apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
2017-07-19 21:07:11 +08:00
07ae13a650
Remove multi globalTraceIds in context carrier.
2017-07-19 21:04:24 +08:00
bf9887b06b
Merge pull request #303 from ascrutae/zhangxin/fix/miss-entrysericeName
...
fix miss transport entryServiceName and entryServiceId value
2017-07-19 15:34:57 +08:00
b31ea63506
fix miss transport entryServiceName and entryServiceId value
2017-07-19 15:14:12 +08:00
123ff78096
Merge pull request #297 from wu-sheng/feature/jvm-shutdown-hook
...
Add jvm shutdown hook
2017-07-19 14:44:09 +08:00
686a802097
Merge branch 'master' into feature/jvm-shutdown-hook
2017-07-19 14:19:02 +08:00
3fdc018178
Merge pull request #302 from ascrutae/zhangxin/fix/300
...
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
2017-07-19 14:18:50 +08:00
83b2b5f517
Merge branch 'master' into feature/jvm-shutdown-hook
2017-07-19 14:12:57 +08:00
54cc2ae5a2
Merge branch 'master' into zhangxin/fix/300
2017-07-19 14:05:25 +08:00
809158b23b
fix miss entryServiceId and entryServiceName in ContextSnapshot issue
2017-07-19 11:58:34 +08:00
f57aac38dd
Merge pull request #298 from ascrutae/zhangxin/fix/ot-set-tag-failed
...
fix issue that open tracing activation set tag failed
2017-07-19 11:50:06 +08:00
91d08bbcd9
fix issue that open tracing activation set tag failed
2017-07-19 10:01:10 +08:00
cba4dc2883
Make sure the JVM stop hook works #295
2017-07-18 21:47:24 +08:00
79a45823b6
Remove unused imports.
2017-07-18 21:35:01 +08:00
75ada9feaa
Add jvm shutdown hook
2017-07-18 21:34:30 +08:00
6c5636f221
Shorten the cycle of collecting JVM info. #296
2017-07-18 21:26:19 +08:00
9080b28d9e
Update pom.xml
...
Fix an out-of-date package name.
2017-07-18 11:53:53 +08:00
9bb632a165
Update pom.xml
...
Exclude the grpc generated codes for ci coverage.
2017-07-18 11:29:15 +08:00
04fbe180f3
Merge pull request #252 from wu-sheng/feature/high-performance-agent
...
High performance agent, and the skeleton of modulization collector
2017-07-17 10:33:28 -05:00
3ef364d038
Fix CI
2017-07-17 23:21:52 +08:00
b04b2435be
Merge pull request #293 from wu-sheng/feature/266
...
Feature/266
2017-07-17 10:02:02 -05:00
38aeb92e54
collector compile successful
2017-07-17 22:33:15 +08:00
8b22a52db5
Merge branch 'feature/high-performance-agent' of https://github.com/wu-sheng/sky-walking into feature/266
2017-07-17 21:57:46 +08:00
9f10f8e4eb
Add worker module framework
2017-07-17 21:57:12 +08:00
45839a3765
Merge pull request #292 from ascrutae/zhangxin/fix/compile-failed
...
fix compile failed
2017-07-16 22:33:17 -05:00
1e05483fc9
fix compile failed
2017-07-17 11:31:50 +08:00
a6c3d0dea6
Update README.md
2017-07-17 09:47:58 +08:00
efad368d1d
Merge pull request #291 from ascrutae/zhangxin/fix/matcher-failed
...
fix enhance class match failed
2017-07-16 09:46:42 -05:00
5c1fdb066e
fix enhance class match failed
2017-07-16 22:44:24 +08:00
93b0186dd2
Fix a match bug.
2017-07-16 22:20:10 +08:00
3f3d933365
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 configuration about multiple check interval and fix set peerID of exit span failed
independent data carrier project
2017-07-14 20:36:58 +08:00
1b5cd9e253
Merge pull request #290 from ascrutae/zhangxin/fix/peer_id_set_failured
...
add configuration and fix set peerID failed
2017-07-14 01:29:49 -05:00
75e705e097
add configuration about multiple check interval and fix set peerID of exit span failed
2017-07-14 11:46:59 +08:00
a381a6f771
Merge pull request #289 from ascrutae/zhangxin/feature/datacarrier-independence
...
independent data carrier project
2017-07-13 21:33:20 -05:00
8143a5b096
independent data carrier project
2017-07-14 10:07:17 +08:00
ea7db2090a
Provided 4 types match for enhance class:
...
* byName
* byClassAnnotationMatch
* byMethodAnnotationMatch
* byHierarchyMatch
2017-07-13 21:26:44 +08:00
28b6d8faa4
Merge pull request #288 from ascrutae/zhangxin/fix/opentracing-meta-info
...
fix open-tracing meta info is not correct
2017-07-13 04:38:16 -05:00
0f69bab38c
fix open-tracing meta info is not correct
2017-07-13 17:30:12 +08:00
972b66654f
Cluster module with zookeeper, redis, h2.
...
#266
2017-07-12 23:18:58 +08:00
b24a17587f
Remove and move classes.
2017-07-12 22:58:05 +08:00
103469256f
Support plugin match by annotation, can’t by interface yet. #281
2017-07-12 22:41:56 +08:00
64435c3e39
Merge pull request #286 from ascrutae/zhangxin/feature/local-span-transform
...
fix issue that local span transform failured
2017-07-12 03:50:29 -05:00
wusheng
ascrutae
pengys5