Commit Graph

2667 Commits

Author SHA1 Message Date
ascrutae 772b4428d1 fix occur ClassCastException when return generate key 2017-11-01 14:59:05 +08:00
吴晟 Wu Sheng 1cf0658375
Merge pull request #561 from chidaodezhongsheng/master
fix #559
2017-10-30 16:28:18 +08:00
linjiaqi 9084f581bb fix issues #559 2017-10-30 12:00:27 +08:00
吴晟 Wu Sheng 17164f7ef2
Merge pull request #557 from ascrutae/feature/support-spring3-plugin
support spring3 plugin
2017-10-30 10:46:03 +08:00
ascrutae eac522ed81 support spring3 plugin 2017-10-30 09:51:18 +08:00
吴晟 Wu Sheng 4a9626fff4 Merge pull request #553 from ascrutae/fix/spring-plugin
fix the spring mvc plugin occur exception when the application running in spring 3
2017-10-27 16:24:40 +08:00
ascrutae ff5107d136 fix the spring mvc plugin occur exception when the application running with spring 3 2017-10-27 15:10:10 +08:00
吴晟 Wu Sheng a5b5440274 Merge pull request #550 from ascrutae/feature/support-h2-connection-pool-plugin
support h2 connection pool
2017-10-26 15:46:20 +08:00
ascrutae f67be17d4c Remove confuse abstract method 2017-10-26 15:28:00 +08:00
吴晟 Wu Sheng 0d6406226a Merge branch 'master' into feature/support-h2-connection-pool-plugin 2017-10-26 15:16:35 +08:00
吴晟 Wu Sheng ddb698e6f7 Merge pull request #549 from OpenSkywalking/feature/h2-bug
A sql issue of H2 storage
2017-10-26 13:57:40 +08:00
wusheng db24a26d5a A sql issue of H2 storage. 2017-10-26 13:04:02 +08:00
ascrutae 7b05beded8 support h2 connection pool 2017-10-26 09:49:06 +08:00
吴晟 Wu Sheng 6543814fda Merge pull request #544 from OpenSkywalking/fix/sjdbcbug
Plugin test must compile with jdk 1.6, so not allow to use lambda.
2017-10-25 08:39:16 +08:00
peng-yongsheng 12c3c4ef69 Plugin test must compile with jdk 1.6, so not allow to use lambda. 2017-10-24 23:54:08 +08:00
吴晟 Wu Sheng 0e23b0248a Merge pull request #543 from OpenSkywalking/fix/h2bug
Fix/h2bug
2017-10-24 23:10:09 +08:00
吴晟 Wu Sheng 2ba401587a Merge pull request #542 from OpenSkywalking/fix/sjdbcbug
delete the compile plugin in sharing jdbc agent plugin pom file.
2017-10-24 23:09:35 +08:00
peng-yongsheng f141efdda9 delete the compile plugin in sharing jdbc agent plugin pom file. 2017-10-24 23:01:06 +08:00
peng-yongsheng 72c3faa624 Fix unused import error 2017-10-24 22:58:23 +08:00
peng-yongsheng 1331cfb363 Reset the config. 2017-10-24 22:28:47 +08:00
peng-yongsheng a6924e386c A mistake that reset the builder when id exchanged by the to builder method. 2017-10-24 22:27:19 +08:00
peng-yongsheng 56e05528bb move set value outside of else condition. 2017-10-24 17:02:38 +08:00
吴晟 Wu Sheng f675c3dba5 Merge pull request #541 from OpenSkywalking/fix/h2bug
Fix/h2bug
2017-10-24 16:02:12 +08:00
peng-yongsheng 36c13b2bc4 Merge branch 'master' into fix/h2bug 2017-10-24 15:14:11 +08:00
peng-yongsheng 9ac7d9e800 no message 2017-10-24 15:12:28 +08:00
peng-yongsheng 020ce1c33b no message 2017-10-24 15:11:44 +08:00
吴晟 Wu Sheng 43f00c0777 Merge pull request #540 from ascrutae/fix/jdbc-plugin-issue
fix the interceptor class of jdbc plugin is incorrect
2017-10-23 21:50:18 +08:00
ascrutae 4b3e8834e7 fix the interceptor class of jdbc plugin is incorrect 2017-10-23 21:07:33 +08:00
吴晟 Wu Sheng 50faf615a9 Merge pull request #539 from OpenSkywalking/feature/rename
To change the name of the author from pengys5 to Peng-yongsheng.
2017-10-23 19:10:19 +08:00
peng-yongsheng 6930937c32 To change the name of the author from pengys5 to Peng-yongsheng. 2017-10-23 18:18:08 +08:00
吴晟 Wu Sheng 67bdb20192 Merge pull request #538 from OpenSkywalking/feature/537
Feature/537
2017-10-23 17:40:15 +08:00
peng-yongsheng 6dab2c990d Reset the application yml config.
#537
2017-10-23 16:07:36 +08:00
peng-yongsheng 293980ba95 Service Id register by collector
#537
2017-10-23 16:05:08 +08:00
吴晟 Wu Sheng b49027231c Merge pull request #536 from ascrutae/feature/jdbc-plugin-refactory
change the implementation of jdbc plugins
2017-10-21 23:06:44 +08:00
ascrutae a6a7836c95 fix install failure 2017-10-21 21:43:23 +08:00
吴晟 Wu Sheng e998e297f2 Merge branch 'master' into feature/jdbc-plugin-refactory 2017-10-21 21:36:57 +08:00
ascrutae e8f6f38044 change the implementation of jdbc plugins 2017-10-21 20:05:34 +08:00
吴晟 Wu Sheng cb7b4e73d4 Merge pull request #535 from ascrutae/fix/es-cache-dao-config-issue
fix ESDao configuration is incorrect
2017-10-21 19:04:48 +08:00
ascrutae d48518ae41 fix ESDao configuration is incorrect 2017-10-21 18:12:11 +08:00
吴晟 Wu Sheng f5d818e9e7 Merge pull request #533 from OpenSkywalking/feature/423
Feature/423
2017-10-21 10:52:40 +08:00
peng-yongsheng 6208b9cb44 Change the file name. 2017-10-21 10:22:57 +08:00
peng-yongsheng 60f94213df Fixed the suggest of review. 2017-10-21 09:40:43 +08:00
peng-yongsheng 5ae51d2fc3 Fixed check style error. 2017-10-21 09:03:22 +08:00
peng-yongsheng c0c1ac50c4 Merge branch 'master' into feature/423 2017-10-21 00:15:13 +08:00
peng-yongsheng dd59580676 Fixed the bugs from the change of cache module created and segment standardizing. 2017-10-21 00:14:32 +08:00
wusheng 17410e665b Update readme. 2017-10-20 23:33:36 +08:00
吴晟 Wu Sheng f03c36b20c Merge pull request #520 from OpenSkywalking/feature/plugin-feature
New plugin loader core/mechanism for 3.3
2017-10-20 17:25:34 +08:00
吴晟 Wu Sheng de94c3a69e Merge pull request #532 from ascrutae/feature/plugin-feature
fix redis, memcached and resttemplate plugin woks incorrect
2017-10-20 11:23:47 +08:00
ascrutae 079f53e214 fix redis, memcached and resttemplate plugin woks incorrect 2017-10-20 10:44:15 +08:00
wusheng 71e68b3865 Merge branch 'master' into feature/plugin-feature
* master:
  Make partner area are bigger.
  Update new architecture graph.
  fix test failed
  support grpc plugin
  update autcommit and remove rollback to storage data as much as possible
  add postgresql component
  support postgresql plugin
  polish code with sqlbuilder
  add h2 support phase 4
  add h2 support phase 3
  add h2 support phase 2
  add h2 support ga
  add h2 support

# Conflicts:
#	apm-sniffer/apm-agent/pom.xml
2017-10-19 23:18:57 +08:00