Commit Graph

3086 Commits

Author SHA1 Message Date
Xin,Zhang c45cdcb897
Merge pull request #693 from apache/fix/url
Try to fix a url
2017-12-20 09:59:04 +08:00
吴晟 Wu Sheng c9c5fe583a
Merge branch 'master' into fix/url 2017-12-20 09:38:00 +08:00
吴晟 Wu Sheng e28c33760f
Merge pull request #683 from apache/wusheng/add-notice
Submit related projects in NOTICE.
2017-12-20 06:24:01 +08:00
吴晟 Wu Sheng 62ff02bfa0
Merge branch 'master' into wusheng/add-notice 2017-12-20 06:09:28 +08:00
wusheng 94cd91db73 Fix a class name. 2017-12-19 22:23:19 +08:00
wusheng 16c6b51810 Try to fix a url. 2017-12-19 21:51:28 +08:00
Xin,Zhang 40df96089e
Merge pull request #691 from apache/fix/sampling-service-npe
Fix npe
2017-12-19 16:13:25 +08:00
wu-sheng 09b979c5af Fix npe 2017-12-19 15:27:14 +08:00
彭勇升 pengys 5319d72f3f
Merge pull request #690 from apache/5.0-network-protocol
Change network protocol for 5.0
2017-12-18 23:19:25 +08:00
wusheng 6f1f4cf14f Change network protocol for 5.0 2017-12-18 21:27:24 +08:00
彭勇升 pengys 07ad767be8
Merge pull request #688 from apache/fix/opentracing-zh-link
Update README_ZH.md
2017-12-18 14:54:41 +08:00
吴晟 Wu Sheng e1a7fd5937
Update README_ZH.md 2017-12-18 14:43:12 +08:00
吴晟 Wu Sheng 585e59a12e
Merge branch 'master' into wusheng/add-notice 2017-12-17 09:39:48 +08:00
吴晟 Wu Sheng 435adc684f
Update NOTICE.txt
Add licenses for each dependency.
2017-12-17 09:37:31 +08:00
吴晟 Wu Sheng 8a3c9a0bd1
Merge pull request #686 from peng-yongsheng/feature/checkstyle
Style check header file value change.
2017-12-16 12:11:56 +08:00
peng-yongsheng 5c95e40ccd Do not use the propertie for checkstyle header file path that lead to the checkstyle plugin of IntelliJ idea not work. 2017-12-16 11:48:58 +08:00
彭勇升 pengys 17cb21d642
Merge pull request #684 from apache/document/readme
Add more descriptions about project.
2017-12-16 00:27:46 +08:00
wusheng 4d4f6c301f List some container-based tech. 2017-12-16 00:15:56 +08:00
wusheng d90bd9b19e Add more descriptions about project. 2017-12-15 23:37:26 +08:00
吴晟 Wu Sheng be3658b107
Merge pull request #681 from hanahmily/test/update-version
Update version to 5.0.0-alpha
2017-12-15 13:15:15 +08:00
wu-sheng d4cec534cb Submit related projects in NOTICE. 2017-12-15 12:19:04 +08:00
gaohongtao 318c3db7c9 Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha` 2017-12-15 10:40:23 +08:00
吴晟 Wu Sheng 3a418a41f8
Merge pull request #679 from apache/apache/readme_update
Update readme and remove the annoucement
2017-12-15 10:03:22 +08:00
wu-sheng 14c4734f58 Update more license. 2017-12-15 09:50:53 +08:00
吴晟 Wu Sheng 526c50d4cb
Merge branch 'master' into apache/readme_update 2017-12-15 09:32:01 +08:00
吴晟 Wu Sheng 60a8390fef
Merge pull request #678 from ascrutae/fix/windows-start-script-failed
[Collector] Fix issue that collector start failed in the Windows environment
2017-12-15 09:31:49 +08:00
吴晟 Wu Sheng edf860e213
Merge branch 'master' into fix/windows-start-script-failed 2017-12-15 09:19:08 +08:00
吴晟 Wu Sheng 6796079284
Merge pull request #676 from ascrutae/fix/okhttpclient-issue
[Agent] Fix issue that OkHttpClient plugin doesn't work
2017-12-15 08:22:48 +08:00
ascrutae db75a4a6c0 [Collector] Fix issue that collector start failed in the Windows environment 2017-12-15 06:46:58 +08:00
ascrutae 60eb0d5814 [Agent] Fix issue that OkHttpClient plugin doesn't work 2017-12-14 22:27:14 +08:00
wu-sheng 60f60693c2 update coverall repo token 2017-12-14 17:05:19 +08:00
吴晟 Wu Sheng a99cba7065
Merge pull request #674 from ascrutae/fix/jedis-testcase-failed
[Agent] fix jedis testcase failed
2017-12-14 17:00:03 +08:00
ascrutae 25dda07a84 [Agent] fix jedis testcase failed 2017-12-14 16:47:05 +08:00
吴晟 Wu Sheng 599c852140
Merge pull request #672 from ascrutae/fix/opentracing-plugin-issue
[Agent] Fix the enhance class is incorrect
2017-12-14 12:06:16 +08:00
Xin,Zhang 1dade173ae
Merge branch 'master' into fix/opentracing-plugin-issue 2017-12-14 11:39:19 +08:00
吴晟 Wu Sheng eee5e65798
Merge pull request #671 from ascrutae/feature/trace-context
[Agent] Cannot propagate the context across threads
2017-12-14 11:38:56 +08:00
Xin,Zhang e1da9b5430
Merge branch 'master' into fix/opentracing-plugin-issue 2017-12-14 11:29:07 +08:00
ascrutae 6b14bc861d [Agent] Fix the enhance class is incorrect 2017-12-14 11:24:15 +08:00
ascrutae 9f4532c03b fix miss transform ref data for each span issue 2017-12-14 10:50:14 +08:00
ascrutae ad5fd07343 remove unimport class 2017-12-14 10:10:51 +08:00
Xin,Zhang 7dd91fff96
Merge branch 'master' into feature/trace-context 2017-12-14 10:03:43 +08:00
ascrutae b85ada779c fix the local span cannot ref other trace segment 2017-12-14 10:02:45 +08:00
wu-sheng c1c7838989 update readme. 2017-12-14 09:25:03 +08:00
吴晟 Wu Sheng 419acc16bd
Merge pull request #668 from ascrutae/fix/shade-pacage-incorrect
add relocation config of org.apache.http and org.apache.commons package
2017-12-13 21:22:43 +08:00
吴晟 Wu Sheng 7f98cf902a
Merge branch 'master' into fix/shade-pacage-incorrect 2017-12-13 19:21:59 +08:00
吴晟 Wu Sheng 1a593abd8c
Merge pull request #669 from ascrutae/fix/annotation-activation-plugin-issue
fix issue that the intercept class package name  is incorrect
2017-12-13 19:21:39 +08:00
ascrutae a4b49b28b4 fix issue that the intercept class and the enhance class package name of the trace annotation plugin is incorrect 2017-12-13 18:38:45 +08:00
ascrutae 73d662b1b4 add relocation config of org.apache.http and org.apache.commons 's package 2017-12-13 18:28:03 +08:00
吴晟 Wu Sheng 2fa0a41fbc
Merge pull request #663 from ascrutae/fix/mysql-plugin-issue
fix the sql tag value is null when client using Statement.execute(sql) method
2017-12-13 14:42:02 +08:00
ascrutae 68352251dc fix compile failed issue 2017-12-13 14:06:41 +08:00