feat: support dbcp2

sofastack · Oct 25, 2024 · 4a76797 · 4a76797
1 parent d8053ce
commit 4a76797
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/...plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/utils/DataSourceUtils.java b/...plugin/src/main/java/com/alipay/sofa/tracer/plugins/datasource/utils/DataSourceUtils.java
@@ -41,6 +41,7 @@ public class DataSourceUtils {
     public static final String DS_DRUID_CLASS      = "com.alibaba.druid.pool.DruidDataSource";
 
     public static final String DS_DBCP_CLASS       = "org.apache.commons.dbcp.BasicDataSource";
+    public static final String DS_DBCP2_CLASS       = "org.apache.commons.dbcp2.BasicDataSource";
 
     public static final String DS_C3P0_CLASS       = "com.mchange.v2.c3p0.ComboPooledDataSource";
 
@@ -69,11 +70,11 @@ public static boolean isDruidDataSource(String clazzType) {
     }
 
     public static boolean isDbcpDataSource(Object dataSource) {
-        return isTargetDataSource(DS_DBCP_CLASS, dataSource);
+        return isTargetDataSource(DS_DBCP_CLASS, dataSource) || isTargetDataSource(DS_DBCP2_CLASS, dataSource);
     }
 
     public static boolean isDbcpDataSource(String clazzType) {
-        return !StringUtils.isBlank(clazzType) && DS_DBCP_CLASS.equals(clazzType);
+        return !StringUtils.isBlank(clazzType) && (DS_DBCP_CLASS.equals(clazzType) || DS_DBCP2_CLASS.equals(clazzType));
     }
 
     public static boolean isC3p0DataSource(Object dataSource) {

diff --git a/tracer-sofa-boot-starter/pom.xml b/tracer-sofa-boot-starter/pom.xml
@@ -236,6 +236,11 @@
             <version>1.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.kstyrc</groupId>
             <artifactId>embedded-redis</artifactId>

diff --git a/...-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/datasource/DataSourceUrlTest.java b/...-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/datasource/DataSourceUrlTest.java
@@ -51,6 +51,14 @@ public void testGetDataSourceUrl() throws Throwable {
         Assert.assertNotNull(method);
         Assert.assertEquals("test-url", method.invoke(basicDataSource));
 
+        // dbcp2
+        org.apache.commons.dbcp2.BasicDataSource basicDataSource2 = new org.apache.commons.dbcp2.BasicDataSource();
+        basicDataSource2.setUrl("test-url");
+        method = ReflectionUtils.findMethod(basicDataSource2.getClass(),
+                DataSourceUtils.METHOD_GET_URL);
+        Assert.assertNotNull(method);
+        Assert.assertEquals("test-url", method.invoke(basicDataSource2));
+
         // tomcat datasource
         DataSource dataSource = new DataSource();
         dataSource.setUrl("test-url");