Commit Graph

1734 Commits

Author SHA1 Message Date
wusheng a196fa069a Merge branch 'feature/159' into feature/3.0.1
* feature/159:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  Add log4j.xml into test package
2017-04-27 09:46:40 +08:00
吴晟 Wu Sheng 7beda22aca Merge pull request #177 from ascrutae/zhangxin/fix/176
modify the expose port of collector image
2017-04-27 09:37:51 +08:00
ascrutae 150dd71333 modify the expose port of collector image 2017-04-27 09:18:20 +08:00
pengys5 717bc584d2 no message 2017-04-27 02:18:09 +08:00
pengys5 c72e1c4f33 no message 2017-04-27 02:14:12 +08:00
pengys5 1c3423a4c0 no message 2017-04-26 23:51:43 +08:00
pengys5 7ee7d8e0d6 no message 2017-04-26 23:45:56 +08:00
pengys5 1f960e4503 no message 2017-04-26 23:09:59 +08:00
pengys5 91a0c2d337 no message 2017-04-26 22:47:28 +08:00
pengys5 3f1766373f no message 2017-04-26 22:36:58 +08:00
pengys5 662c8e6184 Add log4j.xml into test package 2017-04-26 22:28:20 +08:00
吴晟 Wu Sheng 3abbc671fc Merge pull request #172 from ascrutae/zhangxin/fix/169
The opentracing-toolkit context can not propagation across process
2017-04-26 17:32:35 +08:00
zhangxin 3dfbb6abef modify Java doc 2017-04-26 17:22:32 +08:00
zhangxin 784bda40f0 modify Java doc to improve readable 2017-04-26 17:18:24 +08:00
zhangxin 11a4d14d6d fix style check failed issue 2017-04-26 15:54:11 +08:00
zhangxin 42c9ebd046 Merge branch 'feature/3.0.1' into zhangxin/fix/169 2017-04-26 15:39:15 +08:00
吴晟 Wu Sheng e577b791ef Merge pull request #165 from wu-sheng/feature/159
Fix a bug and improve performance
2017-04-26 15:31:20 +08:00
zhangxin a16f6f657e refactory method name 2017-04-26 15:26:47 +08:00
pengys5 d4eed42ab8 no message 2017-04-26 15:13:46 +08:00
pengys5 70fedb10fc Rename data entity 2017-04-26 15:13:21 +08:00
zhangxin 0544edabf7 fix issue that skywalking extract binary data failed and refectory code 2017-04-26 14:08:19 +08:00
pengys5 c43d375d81 no message 2017-04-26 13:50:01 +08:00
pengys5 e77abe23a6 no message 2017-04-26 12:08:49 +08:00
pengys5 6233b69e57 no message 2017-04-26 11:49:47 +08:00
wusheng 7e80c6af37 Update docker-compose for next release. 2017-04-26 11:43:17 +08:00
pengys5 c5eb330c1c testcase 2017-04-26 11:40:26 +08:00
pengys5 15684ea934 segment entity testcase 2017-04-26 10:28:36 +08:00
pengys5 d772b95ce5 Unrest 2017-04-26 01:10:53 +08:00
pengys5 9394c9f319 style check error 2017-04-26 01:04:43 +08:00
pengys5 83a5896d3b Unrest 2017-04-26 00:59:54 +08:00
pengys5 700c772298 mock 2017-04-26 00:54:01 +08:00
wusheng 737e6a57a9 no message 2017-04-25 16:08:09 +08:00
wusheng 2f0a947169 If the tag value is short, process it as an integer. It is a bug for ot+agent. 2017-04-25 16:07:11 +08:00
pengys5 91ab61b9fe Remove system out in test case 2017-04-25 12:22:34 +08:00
pengys5 67cb71e09e fixed pull request suggestion 2017-04-25 11:11:06 +08:00
pengys5 eea42183a6 style check 2017-04-24 22:27:38 +08:00
pengys5 72ed8b22e4 Fix 159 2017-04-24 21:44:15 +08:00
吴晟 Wu Sheng c172f34c0b Merge pull request #158 from wu-sheng/fix/140
fix #140 ,add log bridge from slf4j to log4j that could see logs from http sever start.
2017-04-21 17:18:21 +08:00
wusheng 0a4ac940e4 As collector is using jdk8, no need of long list “if…else”. Remove some “e.printstaktrace”. 2017-04-21 14:21:25 +08:00
吴晟 Wu Sheng 2e6d258948 Merge pull request #157 from wu-sheng/feature/141
fix issues #141, use gson stream to deserialize http posed segments json array
2017-04-21 14:02:18 +08:00
pengys5 3172b043d2 delete a unused import 2017-04-21 13:47:08 +08:00
pengys5 f52ca8f5a3 no message 2017-04-21 13:38:01 +08:00
pengys5 ce1add2628 fix issues #141, use gson stream to deserialize http posed segments json array 2017-04-21 13:37:26 +08:00
pengys5 4bcfc39cdd fix 2017-04-21 10:02:46 +08:00
wusheng be336477a3 Merge branch 'master' into feature/3.0.1
* master:
  Update README.md
  modify code style
  modify code style
  modify test case
  modify mongodb
  modify MongoDBMethodInterceptorTest
  Add a flag to determine whether to bind data
  fix bugs
  Support plugin for MongoDB
2017-04-21 09:54:18 +08:00
吴晟 Wu Sheng fd02bbe754 Merge pull request #154 from bai-yang/patch-1
Update README.md
2017-04-20 21:23:35 +08:00
柏杨 Bai Yang 7db8ac7803 Update README.md 2017-04-20 20:36:46 +08:00
吴晟 Wu Sheng 3b30935eb2 Merge pull request #148 from bai-yang/master
Support plugin for MongoDB
2017-04-20 20:23:10 +08:00
baiyang 78c330a804 modify code style 2017-04-20 18:04:44 +08:00
baiyang dd6e47552b modify code style 2017-04-20 17:52:39 +08:00