Commit Graph

166 Commits

Author SHA1 Message Date
wusheng 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
wusheng 329f224763 New id mechanism, need to be tested. 2017-07-20 23:17:21 +08:00
ascrutae 89427eeaf5 fix operation id of exit span incorrect issue 2017-07-20 23:03:48 +08:00
wusheng 543b2d4461 Support empty operation name, and add buffer size of dictionary for avoiding out of memory. 2017-07-19 22:54:57 +08:00
wusheng 57b69fb88c Support #299 and #301 2017-07-19 22:04:32 +08:00
wusheng 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
wusheng 07ae13a650 Remove multi globalTraceIds in context carrier. 2017-07-19 21:04:24 +08:00
ascrutae b31ea63506 fix miss transport entryServiceName and entryServiceId value 2017-07-19 15:14:12 +08:00
吴晟 Wu Sheng 686a802097 Merge branch 'master' into feature/jvm-shutdown-hook 2017-07-19 14:19:02 +08:00
吴晟 Wu Sheng 83b2b5f517 Merge branch 'master' into feature/jvm-shutdown-hook 2017-07-19 14:12:57 +08:00
吴晟 Wu Sheng 54cc2ae5a2 Merge branch 'master' into zhangxin/fix/300 2017-07-19 14:05:25 +08:00
ascrutae 809158b23b fix miss entryServiceId and entryServiceName in ContextSnapshot issue 2017-07-19 11:58:34 +08:00
ascrutae 91d08bbcd9 fix issue that open tracing activation set tag failed 2017-07-19 10:01:10 +08:00
wusheng cba4dc2883 Make sure the JVM stop hook works #295 2017-07-18 21:47:24 +08:00
wusheng 79a45823b6 Remove unused imports. 2017-07-18 21:35:01 +08:00
wusheng 75ada9feaa Add jvm shutdown hook 2017-07-18 21:34:30 +08:00
wusheng 6c5636f221 Shorten the cycle of collecting JVM info. #296 2017-07-18 21:26:19 +08:00
wusheng 3ef364d038 Fix CI 2017-07-17 23:21:52 +08:00
ascrutae 1e05483fc9 fix compile failed 2017-07-17 11:31:50 +08:00
ascrutae 5c1fdb066e fix enhance class match failed 2017-07-16 22:44:24 +08:00
wusheng 93b0186dd2 Fix a match bug. 2017-07-16 22:20:10 +08:00
wusheng 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
ascrutae 75e705e097 add configuration about multiple check interval and fix set peerID of exit span failed 2017-07-14 11:46:59 +08:00
ascrutae 8143a5b096 independent data carrier project 2017-07-14 10:07:17 +08:00
wusheng ea7db2090a Provided 4 types match for enhance class:
* byName
* byClassAnnotationMatch
* byMethodAnnotationMatch
* byHierarchyMatch
2017-07-13 21:26:44 +08:00
wusheng b24a17587f Remove and move classes. 2017-07-12 22:58:05 +08:00
wusheng 103469256f Support plugin match by annotation, can’t by interface yet. #281 2017-07-12 22:41:56 +08:00
ascrutae 9f8622b8a1 fix issue that local span transform failured 2017-07-12 16:33:51 +08:00
ascrutae ceca5e70ac operation name or operation id need to reset when create multiple entry spans 2017-07-12 15:15:34 +08:00
吴晟 Wu Sheng 6e6e9c2687 Merge pull request #284 from ascrutae/zhangxin/fix/283
fix issue that operation name and operation id are not correct
2017-07-11 22:35:32 -05:00
ascrutae c08c95782b fix issue that operation name and operation id is not correct when create multi exit span or entry span 2017-07-12 11:27:36 +08:00
ascrutae ca56552215 fix compile failed and the url tag of motan plugin is not correct 2017-07-11 18:03:15 +08:00
ascrutae 1bbf84dce9 suport ot activation 2017-07-11 14:32:47 +08:00
吴晟 Wu Sheng 62981fb0a1 Update ContextManager.java 2017-07-10 15:28:06 +08:00
ascrutae 4c1963cb45 support plugin testcase 2017-07-09 17:46:43 +08:00
wusheng f64d414260 Fix the span type missing. 2017-07-08 19:48:09 +08:00
ascrutae d9b3321d8b add clear agent service rule 2017-07-08 19:16:32 +08:00
ascrutae a382f3f782 support agent core testcase 2017-07-08 16:05:01 +08:00
wusheng 1135d25762 Add comments about component, abstractSpan 2017-07-08 14:22:19 +08:00
wusheng 95f65beb93 Add comments for major class in agent-core. 2017-07-08 13:52:52 +08:00
wusheng 1b1f8d49c1 Add checker for extract and inject. 2017-07-08 10:53:13 +08:00
wusheng b88b3559b5 Optimize codes and add more comments. 2017-07-08 10:50:04 +08:00
wusheng b32ee4cec7 JVMService didn’t add itselft as a channel listener. 2017-07-08 10:07:57 +08:00
wusheng 3df884fd80 Finish codes for supporting opentracing-java 0.30.0 2017-07-07 23:26:14 +08:00
吴晟 Wu Sheng 25858600f3 Merge pull request #275 from ascrutae/zhangxin/feature/server-issue
fix issue that server list never updated
2017-07-07 21:49:58 +08:00
ascrutae a24f4fdce2 fix issue that server list never updated 2017-07-07 21:35:58 +08:00
ascrutae f81a66bfd3 fix issue that project cycle dependency 2017-07-07 19:53:33 +08:00
吴晟 Wu Sheng ebc30a0620 Merge pull request #273 from trey03/fix_plug-in_logger_info
Optimize the plug-in load hints
2017-07-07 15:41:02 +08:00
吴晟 Wu Sheng ba108d9282 Merge pull request #271 from ascrutae/zhangxin/feature/support-test-case
support test case
2017-07-07 15:36:10 +08:00
c feng 137906b6f7 Optimize the plug-in load hints 2017-07-07 15:14:12 +08:00