Commit Graph

2013 Commits

Author SHA1 Message Date
wusheng d26d925c10 Fix witness class fail, because of different class loaders. 2017-06-07 20:38:08 +08:00
wusheng 5ff0e98746 Merge branch 'master' of https://github.com/wu-sheng/sky-walking
* 'master' of https://github.com/wu-sheng/sky-walking:
  update docker image version
  Update the http port of collector server
  Provide new data protocol for segment messages.
  chore(collector): add a check for process id in startup script
2017-06-07 20:01:39 +08:00
pengys5 7e17692d14 add comment 2017-06-07 16:31:27 +08:00
pengys5 753cb28413 temporary storage 2017-06-07 11:55:35 +08:00
pengys5 646482de8e Merge branch 'master' into feature/208-collectorside 2017-06-07 10:13:19 +08:00
pengys5 6284fcbf51 temporary storage 2017-06-06 22:50:17 +08:00
wusheng 8c5bac9bce Fix class name. 2017-06-06 21:35:32 +08:00
吴晟 Wu Sheng d39cff6ddc Merge pull request #188 from xcaspar/feature/180
chore(collector): add a check for process id in startup script
2017-06-06 11:08:48 +08:00
吴晟 Wu Sheng 8ba8e9458d Merge pull request #212 from ascrutae/zhangxin/fix/docker-compose
update docker image version
2017-06-06 09:56:09 +08:00
ascrutae 31785b3659 update docker image version 2017-06-06 09:51:37 +08:00
吴晟 Wu Sheng 5d8955d7c4 Merge pull request #211 from ascrutae/zhangxin/fix/docker-compose
Update the http port of collector server
2017-06-06 09:37:12 +08:00
ascrutae ac357e9742 Update the http port of collector server 2017-06-06 09:33:27 +08:00
吴晟 Wu Sheng ff2a161ef6 Merge pull request #209 from wu-sheng/feature/208-agentside
Provide new data protocol for segment messages.
2017-06-06 08:42:35 +08:00
wusheng c7f1f6eb6d Fix startup fail. 2017-06-05 22:19:46 +08:00
wusheng 951192d0b6 Provide new data protocol for segment messages. 2017-06-05 21:21:03 +08:00
wusheng 7885b4b9aa Fix format. 2017-06-04 20:42:26 +08:00
wusheng 4a7648dd9d Fix sampling bug. 2017-06-04 20:23:14 +08:00
wusheng 8928716f70 Revert "Add new trace segment for improving sampling performance."
This reverts commit 323468f056.
2017-06-04 20:11:13 +08:00
wusheng d2fe1b77ae Revert "Revert "Add new trace segment for improving sampling performance.""
This reverts commit 5b853ec38b.
2017-06-04 20:11:02 +08:00
wusheng aaee8617f1 Revert "Prepare for improving sampling performance."
This reverts commit 19f2a561c9.
2017-06-04 20:10:48 +08:00
wusheng 19f2a561c9 Prepare for improving sampling performance. 2017-06-04 19:37:59 +08:00
wusheng 5b853ec38b Revert "Add new trace segment for improving sampling performance."
This reverts commit 323468f056.
2017-06-04 18:48:58 +08:00
wusheng 323468f056 Add new trace segment for improving sampling performance. 2017-06-04 18:46:36 +08:00
wusheng a7f0f0d5a9 Reset some codes. 2017-06-04 18:05:12 +08:00
wusheng d69500a40a Revert "Remove the “get” method of String/Boolean/Integer Tags."
This reverts commit 04041ebd7e.
2017-06-04 18:03:00 +08:00
wusheng 04041ebd7e Remove the “get” method of String/Boolean/Integer Tags. 2017-06-04 17:52:31 +08:00
wusheng c2319bcceb Add three test utils, prepare for removing the “get” method from the Tag classes. 2017-06-04 17:48:54 +08:00
彭勇升 Buddha 77d43ca1b3 add feign default http plugin (#205)
* add feign default http plugin
add test case for feign default http interceptor

* move feign and okhttp plugins to the parent moudle
2017-06-03 17:39:49 +08:00
吴晟 Wu Sheng f2e3359573 Delete README.md
Remove out-of-date readme file.
2017-05-31 21:18:27 +08:00
吴晟 Wu Sheng 63f0213a8c Merge pull request #197 from wu-sheng/feature/160
add okhttp plugin(provide synchronous http calls )
2017-05-31 09:45:11 +08:00
吴晟 Wu Sheng 0696263681 Merge pull request #199 from wu-sheng/feature/198
Support leaf span
2017-05-19 16:20:10 +08:00
吴晟 Wu Sheng e66be24929 Update README.md
Remove "financial support", as I had already left OneAPM, and no financial relationship with OneAPM.
2017-05-19 11:52:56 +08:00
wusheng ee0a569eac Add test case for leaf span. 2017-05-17 22:44:26 +08:00
wusheng 9e4026e9b5 Prototype codes of supporting leaf span 2017-05-17 18:02:11 +08:00
pengys5 7ac504b19c Merge commit 'c3259afae0e4a267397d91c6117737aa4b7a2e54' into feature/160
# Conflicts:
#	apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
#	apm-sniffer/apm-agent/pom.xml
#	apm-sniffer/apm-sdk-plugin/pom.xml
2017-05-16 16:17:57 +08:00
pengys5 39708a9ab1 add okhttp plugin(provide synchronous http calls )
add test case for okhttp interceptor
2017-05-16 10:14:53 +08:00
wusheng c3259afae0 Update pengys5’s profile. 2017-05-14 21:28:08 +08:00
wusheng 5e424e1d47 Update contributors’s profiles 2017-05-14 21:07:11 +08:00
Xin,Zhang a254b2de3e fix issue that operation name of resin plugin is error (#196) 2017-05-14 08:43:59 +08:00
柏杨 Bai Yang 1c4905ef58 add resin plugin (#187)
* add plugins for resin-3.x and resin-4.x
2017-05-10 19:33:30 +08:00
Xin,Zhang 4a560433be Add mechanism to disable any or all plugins (#191)
* Add mechanism to disable any or all plugins, Relate: #186
2017-05-09 23:29:21 +08:00
吴晟 Wu Sheng 5f4fe4948c Merge pull request #193 from wu-sheng/feature/192
Support multi plugins for one target class
2017-05-09 22:06:53 +08:00
wusheng e3a42f7cea Fix a typo. 2017-05-08 09:13:35 +08:00
wusheng 8b074a0a97 Support multi plugins for one target class. 2017-05-08 08:53:00 +08:00
xcaspar 39e414b680 chore(collector): add a check for process id in startup script 2017-05-01 21:46:22 +08:00
wusheng ecf7a2bf2a Fix doc link. 2017-04-30 22:14:08 +08:00
吴晟 Wu Sheng e6ea5e11d0 Merge pull request #182 from wu-sheng/feature/181
Rename the "apm-api" module to "apm-agent-core”.
2017-04-30 13:31:09 +08:00
吴晟 Wu Sheng 18109e1e64 Update ISSUE_TEMPLATE 2017-04-30 13:20:48 +08:00
wusheng d4c4b0bd40 Prove an issue template. 2017-04-29 23:20:32 +08:00
吴晟 Wu Sheng 53f66648b2 Update CONTRIBUTING.md
Update contributing guide.
2017-04-29 23:12:44 +08:00