ef496e0d64
Merge and sync release version
2017-10-25 11:40:31 +08:00
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
12c3c4ef69
Plugin test must compile with jdk 1.6, so not allow to use lambda.
2017-10-24 23:54:08 +08:00
0e23b0248a
Merge pull request #543 from OpenSkywalking/fix/h2bug
...
Fix/h2bug
2017-10-24 23:10:09 +08:00
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
f141efdda9
delete the compile plugin in sharing jdbc agent plugin pom file.
2017-10-24 23:01:06 +08:00
72c3faa624
Fix unused import error
2017-10-24 22:58:23 +08:00
1331cfb363
Reset the config.
2017-10-24 22:28:47 +08:00
a6924e386c
A mistake that reset the builder when id exchanged by the to builder method.
2017-10-24 22:27:19 +08:00
56e05528bb
move set value outside of else condition.
2017-10-24 17:02:38 +08:00
f675c3dba5
Merge pull request #541 from OpenSkywalking/fix/h2bug
...
Fix/h2bug
2017-10-24 16:02:12 +08:00
36c13b2bc4
Merge branch 'master' into fix/h2bug
2017-10-24 15:14:11 +08:00
9ac7d9e800
no message
2017-10-24 15:12:28 +08:00
020ce1c33b
no message
2017-10-24 15:11:44 +08:00
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
4b3e8834e7
fix the interceptor class of jdbc plugin is incorrect
2017-10-23 21:07:33 +08:00
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
6930937c32
To change the name of the author from pengys5 to Peng-yongsheng.
2017-10-23 18:18:08 +08:00
4eb5299ed5
Remove useless files.
2017-10-23 17:50:27 +08:00
324521b805
Merge branch 'master' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization
2017-10-23 17:46:37 +08:00
75595b9a38
Backup the old collector, and init the new modulization codes.
2017-10-23 17:45:10 +08:00
67bdb20192
Merge pull request #538 from OpenSkywalking/feature/537
...
Feature/537
2017-10-23 17:40:15 +08:00
6dab2c990d
Reset the application yml config.
...
#537
2017-10-23 16:07:36 +08:00
293980ba95
Service Id register by collector
...
#537
2017-10-23 16:05:08 +08:00
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
a6a7836c95
fix install failure
2017-10-21 21:43:23 +08:00
e998e297f2
Merge branch 'master' into feature/jdbc-plugin-refactory
2017-10-21 21:36:57 +08:00
e8f6f38044
change the implementation of jdbc plugins
2017-10-21 20:05:34 +08:00
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
d48518ae41
fix ESDao configuration is incorrect
2017-10-21 18:12:11 +08:00
f5d818e9e7
Merge pull request #533 from OpenSkywalking/feature/423
...
Feature/423
2017-10-21 10:52:40 +08:00
6208b9cb44
Change the file name.
2017-10-21 10:22:57 +08:00
60f94213df
Fixed the suggest of review.
2017-10-21 09:40:43 +08:00
5ae51d2fc3
Fixed check style error.
2017-10-21 09:03:22 +08:00
c0c1ac50c4
Merge branch 'master' into feature/423
2017-10-21 00:15:13 +08:00
dd59580676
Fixed the bugs from the change of cache module created and segment standardizing.
2017-10-21 00:14:32 +08:00
17410e665b
Update readme.
2017-10-20 23:33:36 +08:00
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
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
079f53e214
fix redis, memcached and resttemplate plugin woks incorrect
2017-10-20 10:44:15 +08:00
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
3f6adaefed
Merge pull request #530 from ascrutae/feature/plugin-feature
...
fix tavis-ci build failed issue
2017-10-19 22:57:32 +08:00
cdd9e88a8d
Change the method which called by H2 Dao implements.
2017-10-19 22:41:38 +08:00
29d76e0914
fix tavis-ci build failed issue
2017-10-19 22:34:34 +08:00
e7696ef252
Merge branch 'master' into feature/423
...
# Conflicts:
# apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java
# apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java
# apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java
# apm-collector/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2DAO.java
2017-10-19 17:33:39 +08:00
cf2488445a
Segments divided into two types, depending on if ids exchange successful.
...
1. Success: send to analytic worker
2. Failure: write into file.
2017-10-19 17:08:56 +08:00
a21d117fec
Make partner area are bigger.
2017-10-19 09:18:26 +08:00
0236c6d434
Update new architecture graph.
2017-10-18 23:17:16 +08:00
e0d7752f82
Merge pull request #521 from ascrutae/feature/grpc-support
...
support grpc plugin
2017-10-18 21:23:59 +08:00
4497602074
fix test failed
2017-10-18 20:28:44 +08:00
wu-sheng
peng-yongsheng
ascrutae