Commit 9946a71d authored by ascrutae's avatar ascrutae
Browse files

change mysql plugin module name

parent 1d1c81f4

apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java

+5 −2
Original line number Diff line number Diff line
@@ -29,8 +29,11 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptR 
import org.skywalking.apm.plugin.jdbc.trace.ConnectionInfo;



/**

 * {@link ConnectionServiceMethodInterceptor} create an exit span when the client call the following methods in the

 * class that extend {@link java.sql.Connection}. 1. close 2. rollback 3. releaseSavepoint 4. commit

 * {@link ConnectionServiceMethodInterceptor} create an exit span when the following methods execute:

 * 1. close

 * 2. rollback

 * 3. releaseSavepoint

 * 4. commit

 *

 * @author zhangxin

 */

apm-sniffer/apm-sdk-plugin/mysql-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/mysql/define/JDBC42PreparedStatementInstrumentation.java

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * Copyright 2017, OpenSkywalking Organization All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.skywalking.apm.plugin.jdbc.mysql.define;



import org.skywalking.apm.agent.core.plugin.match.ClassMatch;



import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;



/**

 * {@link JDBC42PreparedStatementInstrumentation} intercepts {@link com.mysql.jdbc.JDBC42PreparedStatement} class.

 *

 * @author zhangxin

 */

public class JDBC42PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation {

    private static final String ENHANCE_CLASS = "com.mysql.jdbc.JDBC42PreparedStatement";



    @Override protected ClassMatch enhanceClass() {

        return byName(ENHANCE_CLASS);

    }

}

apm-sniffer/apm-sdk-plugin/mysql-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright 2017, OpenSkywalking Organization All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.skywalking.apm.plugin.jdbc.mysql.define;



import org.skywalking.apm.agent.core.plugin.match.ClassMatch;



import static org.skywalking.apm.plugin.jdbc.mysql.define.MultiClassNameMatch.byMultiClassMath;



/**

 * {@link JDBC42PreparedStatementInstrumentation} intercepts {@link com.mysql.jdbc.PreparedStatement} class.

 *

 * @author zhangxin

 */

public class PreparedStatementInstrumentation extends AbstractPreparedStatementInstrumentation {



    private static final String ENHANCE_CLASS = "com.mysql.jdbc.PreparedStatement";



    @Override protected ClassMatch enhanceClass() {

        return byMultiClassMath(ENHANCE_CLASS, "com.mysql.cj.jdbc.PreparedStatement");

    }



}

apm-sniffer/apm-sdk-plugin/mysql-2.x-plugin/src/main/resources/skywalking-plugin.def

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
mysql=org.skywalking.apm.plugin.jdbc.mysql.define.DriverInstrumentation

mysql=org.skywalking.apm.plugin.jdbc.mysql.define.ConnectionInstrumentation

mysql=org.skywalking.apm.plugin.jdbc.mysql.define.CallableInstrumentation

mysql=org.skywalking.apm.plugin.jdbc.mysql.define.PreparedStatementInstrumentation

mysql=org.skywalking.apm.plugin.jdbc.mysql.define.JDBC42PreparedStatementInstrumentation

mysql=org.skywalking.apm.plugin.jdbc.mysql.define.StatementInstrumentation

apm-sniffer/apm-sdk-plugin/mysql-2.x-plugin/pom.xml→apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>apm-mysql-2.x-plugin</artifactId>

    <artifactId>apm-mysql-5.x-plugin</artifactId>

    <packaging>jar</packaging>



    <name>mysql-2.x-plugin</name>

    <name>mysql-5.x-plugin</name>

    <url>http://maven.apache.org</url>



    <properties>
@@ -45,7 +45,7 @@ 
        <dependency>

            <groupId>mysql</groupId>

            <artifactId>mysql-connector-java</artifactId>

            <version>[2.0.14,6.0.6]</version>

            <version>[5.1.22,6.0.6]</version>

            <scope>provided</scope>

        </dependency>

        <dependency>