Unverified Commit a9489b70 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

H2 storage (#1712) 

* H2 storage code skeleton.

* Add batch dao for H2.

* Fix wrong refactor.

* Add codes of other dao. No metric dao, wait for @peng-yongsheng new PR.

* Change license of distribution

* Add topology query in H2.

* Add more daos.

* Add some daos.

* Commit all H2 daos. Wait @peng-yongsheng to submit new IAggregationQueryDAO interface.

* Fix some CIs

* Fix wrong refactor, which causes h2 plugin failure.

* Fix all codes of H2 storage. :) and CI should pass. No test.

* Fix CI and typo

* Fix connection closed.

* Fix register bug

* no message

* Fixed service inventory register bug.

* Fix a compile issue.

* Sync change

* Reset es as default storage.

* Fix rat

* Fix H2 compile issue.

* Fix bugs for H2 storage.

* Fix bug in mesh.

* 1. Fix Thermodynamic query bug
2. Fix service inventory query bug
3. Fix missing traceid in trace query bug

* Fix query bug.

* Submit reverse caused by prev PR.

* Fix duplicate spans.

* Use H2 as default storage implementor.

* Fix bug in topology query.

* Fix CI

* Fix rat

* Fix two query in H2 storage.

* Fix H2 query

* Make release running in H2 mode and develop mode running is ES mode in default
parent b11d4793

apm-dist/release-docs/LICENSE

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ The text of each license is the standard Apache 2.0 license. 
    servo 0.10.1: https://github.com/Netflix/servo, Apache 2.0

    validation-api 1.1.0.Final: http://beanvalidation.org/licensing/, Apache 2.0

    zuul-core 1.3.0: https://github.com/Netflix/zuul, Apache 2.0

    ben-manes caffeine 2.6.2: https://github.com/ben-manes/caffeine, Apache 2.0

    HikariCP 3.1.0: https://github.com/brettwooldridge/HikariCP, Apache 2.0

    zipkin 2.9.1: https://github.com/openzipkin/zipkin, Apache 2.0

    sharding-jdbc-core 2.0.3: https://github.com/sharding-sphere/sharding-sphere, Apache 2.0

    kubernetes-client 2.0.0: https://github.com/kubernetes-client/java, Apache 2.0

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class ComponentsDefine { 


    public static final OfficialComponent JEDIS =  new OfficialComponent(30, "Jedis");



    public static final OfficialComponent H2_JDBC_DRIVER =  new OfficialComponent(32, "h2-jdbc-driver");

    public static final OfficialComponent H2_JDBC_DRIVER =  new OfficialComponent(32, "jdbc-jdbc-driver");



    public static final OfficialComponent MYSQL_JDBC_DRIVER = new OfficialComponent(33, "mysql-connector-java");

apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName 
 * @author zhangxin

 */

public class DriverInstrumentation extends AbstractDriverInstrumentation {

    private static final String CLASS_OF_INTERCEPT_H2_DRIVER = "org.h2.Driver";

    private static final String CLASS_OF_INTERCEPT_H2_DRIVER = "org.jdbc.Driver";



    @Override

    protected ClassMatch enhanceClass() {

apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName 
 * @author zhangxin

 */

public class JdbcConnectionInstrumentation extends AbstractConnectionInstrumentation {

    public static final String ENHANCE_CLASS = "org.h2.jdbc.JdbcConnection";

    public static final String ENHANCE_CLASS = "org.jdbc.jdbc.JdbcConnection";



    @Override protected ClassMatch enhanceClass() {

        return byName(ENHANCE_CLASS);

apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName 
 */

public class JdbcXAConnectionInstrumentation extends AbstractConnectionInstrumentation {



    public static final String ENHANCE_CLASS = "org.h2.jdbcx.JdbcXAConnection";

    public static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.h2.JdbcXAConnectionConstructorInterceptor";

    public static final String ENHANCE_CLASS = "org.jdbc.jdbcx.JdbcXAConnection";

    public static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.jdbc.JdbcXAConnectionConstructorInterceptor";



    @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

        return new ConstructorInterceptPoint[] {