移除无用代码

提交jdbc测试工程

skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java

@@ -67,11 +67,11 @@ public class TracingDriver implements Driver {
     }
 
     public int getMajorVersion() {
-        return safeIntParse("1");
+        return 1;
     }
 
     public int getMinorVersion() {
-        return safeIntParse("0");
+        return 0;
     }
 
     public boolean jdbcCompliant() {
@@ -82,14 +82,6 @@ public class TracingDriver implements Driver {
         return null;
     }
 
-    private static int safeIntParse(String intAsString) {
-        try {
-            return Integer.parseInt(intAsString);
-        } catch (NumberFormatException nfe) {
-        }
-        return 0;
-    }
-
     static class DriverChooser {
         private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(DriverChooser.class);
 

test/skywalking-agent-test/jdbc-test/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>skywalking-agent-test</artifactId>
+        <groupId>com.ai.cloud</groupId>
+        <version>1.0-Final</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>jdbc-test</artifactId>
+    <packaging>jar</packaging>
+
+    <name>jdbc-test</name>
+    <url>http://maven.apache.org</url>
+
+    <repositories>
+        <repository>
+            <id>Company</id>
+            <url>http://10.1.228.199:18081/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.36</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc14</artifactId>
+            <version>10.2.0.4.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

test/skywalking-agent-test/jdbc-test/src/test/java/com/ai/cloud/skywalking/agent/test/mysql/JDBCPluginTest.java

+package com.ai.cloud.skywalking.agent.test.mysql;
+
+import com.ai.skywalking.testframework.api.TraceTreeAssert;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * Created by xin on 16-6-15.
+ */
+public class JDBCPluginTest {
+
+    @Test
+    public void testMysqlJDBC() throws ClassNotFoundException, SQLException {
+        Class.forName("com.mysql.jdbc.Driver");
+        String url = "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root";
+        Connection con = DriverManager.getConnection(url);
+        con.setAutoCommit(false);
+
+        PreparedStatement p0 = con.prepareStatement("select 1 from dual where 1=?");
+        p0.setInt(1, 1);
+        p0.execute();
+        con.commit();
+        con.close();
+        TraceTreeAssert.assertEquals(new String[][]{
+                {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"},
+                {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.commit"},
+                {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.close"},
+        }, true);
+
+        TraceTreeAssert.clearTraceData();
+    }
+
+    @Test
+    public void testOracleJDBC() throws ClassNotFoundException, SQLException {
+        Class.forName("oracle.jdbc.driver.OracleDriver");
+        String url = "jdbc:oracle:thin:@10.1.130.239:1521:ora";
+        Connection con = DriverManager.getConnection(url, "edc_export", "edc_export");
+        con.setAutoCommit(false);
+
+        PreparedStatement p0 = con.prepareStatement("select 1 from dual where 1=?");
+        p0.setInt(1, 1);
+        p0.execute();
+        con.commit();
+        con.close();
+        TraceTreeAssert.assertEquals(new String[][]{
+                {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"},
+                {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.commit"},
+                {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.close"},
+        }, true);
+
+        TraceTreeAssert.clearTraceData();
+    }
+}

test/skywalking-agent-test/jdbc-test/src/test/resources/sky-walking.auth

+buriedpoint.businesskey_max_length=300
+sender.retry_get_sender_wait_interval=2000
+buffer.pool_size=5
+senderchecker.check_polling_time=200
+sender.max_send_length=20000
+consumer.max_consumer=0
+consumer.max_wait_time=5
+sender.max_copy_num=2
+skywalking.application_code=jdbc-plugin-test
+consumer.consumer_fail_retry_wait_interval=50
+skywalking.user_id=6
+buriedpoint.printf=true
+buriedpoint.exclusive_exceptions=
+buriedpoint.max_exception_stack_length=4000
+sender.connect_percent=100
+buffer.buffer_max_size=18000
+sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000;
+skywalking.sdk_version=1.0a2
+skywalking.auth_override=true
\ No newline at end of file

test/skywalking-agent-test/pom.xml

@@ -12,6 +12,7 @@
 
 	<modules>
 		<module>redis-test</module>
+		<module>jdbc-test</module>
 	</modules>
 
 	<properties>
@@ -28,7 +29,13 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.4.1</version>
+			<version>2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>com.ai.cloud</groupId>
+			<artifactId>skywalking-test-api</artifactId>
+			<version>1.0-Final</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>