[pinpoint-apm#8614] Support Empty database in MYSQL

emeroad · Jan 24, 2022 · d0306af · d0306af
1 parent f823da0
commit d0306af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParser.java b/...mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParser.java
@@ -24,6 +24,7 @@
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,6 +38,7 @@ public class MySqlJdbcUrlParser implements JdbcUrlParserV2 {
     static final String URL_PREFIX = "jdbc:mysql:";
     // jdbc:mysql:loadbalance://10.22.33.44:3306,10.22.33.55:3306/MySQL?characterEncoding=UTF-8
     private static final String LOADBALANCE_URL_PREFIX = URL_PREFIX + "loadbalance:";
+    static final String EMPTY_DATABASE = "EMPTY_DATABASE";
 
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
 
@@ -71,6 +73,9 @@ private DatabaseInfo parse0(String jdbcUrl) {
         List<String> hostList = parseHost(host);
 
         String databaseId = maker.next().after('/').before('?').value();
+        if (StringUtils.isEmpty((databaseId))) {
+            databaseId = EMPTY_DATABASE;
+        }
         String normalizedUrl = maker.clear().before('?').value();
 
         return new DefaultDatabaseInfo(MySqlConstants.MYSQL, MySqlConstants.MYSQL_EXECUTE_QUERY, jdbcUrl, normalizedUrl, hostList, databaseId);

diff --git a/...l-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java b/...l-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java
@@ -128,7 +128,7 @@ public void mysqlParse6() {
     }
 
     @Test
-    public void mysqlParse7() {
+    public void mysqlParse_loadbalance1() {
         final String jdbcUrl = LOADBALANCE_CONNECTION_STRING + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'";
         DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl);
         Assert.assertTrue(dbInfo.isParsingComplete());
@@ -141,7 +141,7 @@ public void mysqlParse7() {
     }
 
     @Test
-    public void mysqlParse8() {
+    public void mysqlParse_loadbalance2() {
         final String jdbcUrl = LOADBALANCE_CONNECTION_STRING2 + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'";
         DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl);
         Assert.assertTrue(dbInfo.isParsingComplete());
@@ -171,4 +171,14 @@ public void parseFailTest2() {
         Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType());
     }
 
+    @Test
+    public void emptyDataBase() {
+        final String jdbcUrl = "jdbc:mysql://1.2.3.4:3306";
+        DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl);
+        Assert.assertTrue(dbInfo.isParsingComplete());
+
+        Assert.assertEquals(SERVICE_TYPE, dbInfo.getType());
+        Assert.assertEquals(MySqlJdbcUrlParser.EMPTY_DATABASE, dbInfo.getDatabaseId());
+    }
+
 }