[#2496] Add datasource metric collection

rename some class, and some method
pinpoint-apm · Feb 28, 2017 · baadce2 · baadce2
1 parent 7e695ea
commit baadce2
Show file tree

Hide file tree

Showing 37 changed files with 128 additions and 128 deletions.
diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/context/TraceContext.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/context/TraceContext.java
@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.bootstrap.context;
 
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParserContext;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcContext;
 import com.navercorp.pinpoint.common.annotations.InterfaceAudience;
 
 /**
@@ -89,6 +89,6 @@ public interface TraceContext {
 
     int getAsyncId();
 
-    JdbcConnectionStringParserContext getJdbcUrlParserContext();
+    JdbcContext getJdbcContext();
 
 }
diff --git a/...ore/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPluginSetupContext.java b/...ore/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/ProfilerPluginSetupContext.java
@@ -15,7 +15,7 @@
 package com.navercorp.pinpoint.bootstrap.plugin;
 
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 
 /**
  *  Provides attributes and objects to interceptors.
@@ -40,6 +40,6 @@ public interface ProfilerPluginSetupContext {
      */
     void addApplicationTypeDetector(ApplicationTypeDetector... detectors);
 
-    void addJdbcConnectionStringParser(JdbcConnectionStringParser jdbcConnectionStringParser);
+    void addJdbcUrlParser(JdbcUrlParserV2 jdbcUrlParserV2);
 
 }
diff --git a/...bc/JdbcConnectionStringParserContext.java → ...nt/bootstrap/plugin/jdbc/JdbcContext.java b/...bc/JdbcConnectionStringParserContext.java → ...nt/bootstrap/plugin/jdbc/JdbcContext.java
@@ -22,8 +22,8 @@
 /**
  * @author Taejin Koo
  */
-public interface JdbcConnectionStringParserContext {
+public interface JdbcContext {
 
-    DatabaseInfo parse(ServiceType serviceType, String jdbcUrl);
+    DatabaseInfo parseJdbcUrl(ServiceType serviceType, String jdbcUrl);
 
 }
diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/JdbcUrlParser.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/JdbcUrlParser.java
@@ -26,7 +26,7 @@
  *
  */
 /**
- * @deprecated Since 1.6.1. Use {@link JdbcConnectionStringParser )}
+ * @deprecated Since 1.6.1. Use {@link JdbcUrlParserV2 )}
  */
 @Deprecated
 public abstract class JdbcUrlParser {

diff --git a/...ugin/jdbc/JdbcConnectionStringParser.java → ...ootstrap/plugin/jdbc/JdbcUrlParserV2.java b/...ugin/jdbc/JdbcConnectionStringParser.java → ...ootstrap/plugin/jdbc/JdbcUrlParserV2.java
@@ -22,7 +22,7 @@
 /**
  * @author Taejin Koo
  */
-public interface JdbcConnectionStringParser {
+public interface JdbcUrlParserV2 {
 
     DatabaseInfo parse(String url);
 

diff --git a/...va/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptor.java b/...va/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptor.java
@@ -34,7 +34,7 @@
  * @author emeroad
  */
 /**
- * @deprecated Since 1.6.1. Use {@link DriverConnectInterceptor2 )}
+ * @deprecated Since 1.6.1. Use {@link DriverConnectInterceptorV2 )}
  */
 @Deprecated
 @TargetMethod(name="connect", paramTypes={ "java.lang.String", "java.util.Properties" })

diff --git a/...nterceptor/DriverConnectInterceptor2.java → ...terceptor/DriverConnectInterceptorV2.java b/...nterceptor/DriverConnectInterceptor2.java → ...terceptor/DriverConnectInterceptorV2.java
@@ -34,16 +34,16 @@
  * @author emeroad
  */
 @TargetMethod(name="connect", paramTypes={ "java.lang.String", "java.util.Properties" })
-public class DriverConnectInterceptor2 extends SpanEventSimpleAroundInterceptorForPlugin {
+public class DriverConnectInterceptorV2 extends SpanEventSimpleAroundInterceptorForPlugin {
 
     private final ServiceType serviceType;
     private final boolean recordConnection;
 
-    public DriverConnectInterceptor2(TraceContext context, MethodDescriptor descriptor, ServiceType serviceType) {
+    public DriverConnectInterceptorV2(TraceContext context, MethodDescriptor descriptor, ServiceType serviceType) {
         this(context, descriptor, serviceType, true);
     }
 
-    public DriverConnectInterceptor2(TraceContext context, MethodDescriptor descriptor, ServiceType serviceType, boolean recordConnection) {
+    public DriverConnectInterceptorV2(TraceContext context, MethodDescriptor descriptor, ServiceType serviceType, boolean recordConnection) {
         super(context, descriptor);
 
         this.serviceType = serviceType;
@@ -72,7 +72,7 @@ protected void prepareAfterTrace(Object target, Object[] args, Object result, Th
         final boolean success = InterceptorUtils.isSuccess(throwable);
         // Must not check if current transaction is trace target or not. Connection can be made by other thread.
         final String driverUrl = (String) args[0];
-        DatabaseInfo databaseInfo = traceContext.getJdbcUrlParserContext().parse(serviceType, driverUrl);
+        DatabaseInfo databaseInfo = traceContext.getJdbcContext().parseJdbcUrl(serviceType, driverUrl);
         if (success) {
             if (recordConnection) {
                 if (result instanceof DatabaseInfoAccessor) {

diff --git a/...rap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/MockTraceContext.java b/...rap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/MockTraceContext.java
@@ -24,7 +24,7 @@
 import com.navercorp.pinpoint.bootstrap.context.Trace;
 import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.context.TraceId;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParserContext;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcContext;
 
 /**
  * @author emeroad
@@ -163,7 +163,7 @@ public Trace removeTraceObject() {
     }
 
     @Override
-    public JdbcConnectionStringParserContext getJdbcUrlParserContext() {
+    public JdbcContext getJdbcContext() {
         return null;
     }
 

diff --git a/...rid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridJdbcUrlParser.java b/...rid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridJdbcUrlParser.java
@@ -20,7 +20,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -33,7 +33,7 @@
 /**
  * @author emeroad
  */
-public class CubridJdbcUrlParser implements JdbcConnectionStringParser {
+public class CubridJdbcUrlParser implements JdbcUrlParserV2 {
 
     public static final String DEFAULT_HOSTNAME = "localhost";
     public static final int DEFAULT_PORT = 30000;

diff --git a/...ins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java b/...ins/cubrid-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridPlugin.java
@@ -25,7 +25,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 
 import java.security.ProtectionDomain;
 
@@ -38,7 +38,7 @@
 public class CubridPlugin implements ProfilerPlugin, TransformTemplateAware {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
     private TransformTemplate transformTemplate;
-    private final JdbcConnectionStringParser jdbcUrlParser = new CubridJdbcUrlParser();
+    private final JdbcUrlParserV2 jdbcUrlParser = new CubridJdbcUrlParser();
 
     @Override
     public void setup(ProfilerPluginSetupContext context) {
@@ -48,7 +48,7 @@ public void setup(ProfilerPluginSetupContext context) {
             logger.info("Cubrid plugin is not executed because plugin enable value is false.");
             return;
         }
-        context.addJdbcConnectionStringParser(jdbcUrlParser);
+        context.addJdbcUrlParser(jdbcUrlParser);
 
         addCUBRIDConnectionTransformer(config);
         addCUBRIDDriverTransformer();
@@ -94,7 +94,7 @@ private void addCUBRIDDriverTransformer() {
             public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
                 InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);
 
-                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptor2", va(CubridConstants.CUBRID), CubridConstants.CUBRID_SCOPE, ExecutionPolicy.ALWAYS);
+                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptorV2", va(CubridConstants.CUBRID), CubridConstants.CUBRID_SCOPE, ExecutionPolicy.ALWAYS);
 
                 return target.toBytecode();
             }

diff --git a/...test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java b/...test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java
@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.plugin.jdbc.cubrid;
 
 import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import org.junit.Assert;
 import org.junit.Test;
@@ -27,7 +27,7 @@
  */
 public class CubridConnectionStringParserTest {
 
-    private final JdbcConnectionStringParser parser = new CubridJdbcUrlParser();
+    private final JdbcUrlParserV2 parser = new CubridJdbcUrlParser();
 
     @Test
     public void testParse1() {

diff --git a/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParser.java b/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParser.java
@@ -20,7 +20,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -31,7 +31,7 @@
 /**
  * @author emeroad
  */
-public class JtdsJdbcUrlParser implements JdbcConnectionStringParser {
+public class JtdsJdbcUrlParser implements JdbcUrlParserV2 {
 
     public static final int DEFAULT_PORT = 1433;
 

diff --git a/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java b/plugins/jtds/src/main/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsPlugin.java
@@ -25,7 +25,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 
 import java.security.ProtectionDomain;
 
@@ -37,7 +37,7 @@
 public class JtdsPlugin implements ProfilerPlugin, TransformTemplateAware {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
 
-    private final JdbcConnectionStringParser jdbcUrlParser = new JtdsJdbcUrlParser();
+    private final JdbcUrlParserV2 jdbcUrlParser = new JtdsJdbcUrlParser();
 
     private TransformTemplate transformTemplate;
 
@@ -50,7 +50,7 @@ public void setup(ProfilerPluginSetupContext context) {
             return;
         }
 
-        context.addJdbcConnectionStringParser(jdbcUrlParser);
+        context.addJdbcUrlParser(jdbcUrlParser);
 
         addConnectionTransformer(config);
         addDriverTransformer();
@@ -98,7 +98,7 @@ private void addDriverTransformer() {
             public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
                 InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);
 
-                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptor2", va(JtdsConstants.MSSQL), JtdsConstants.JTDS_SCOPE, ExecutionPolicy.ALWAYS);
+                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptorV2", va(JtdsConstants.MSSQL), JtdsConstants.JTDS_SCOPE, ExecutionPolicy.ALWAYS);
 
                 return target.toBytecode();
             }

diff --git a/...b-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParser.java b/...b-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParser.java
@@ -20,7 +20,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -32,7 +32,7 @@
 /**
  * @author dawidmalina
  */
-public class MariaDBJdbcUrlParser implements JdbcConnectionStringParser {
+public class MariaDBJdbcUrlParser implements JdbcUrlParserV2 {
 
 //    jdbc:(mysql|mariadb):[replication:|failover|loadbalance:|aurora:]//<hostDescription>[,<hostDescription>]/[database>]
 //    jdbc:mariadb:loadbalance://10.22.33.44:3306,10.22.33.55:3306/MariaDB?characterEncoding=UTF-8

diff --git a/.../mariadb-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBPlugin.java b/.../mariadb-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBPlugin.java
@@ -26,7 +26,7 @@
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.PreparedStatementBindingMethodFilter;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 
 import java.security.ProtectionDomain;
 
@@ -38,7 +38,7 @@
 public class MariaDBPlugin implements ProfilerPlugin, TransformTemplateAware {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
 
-    private final JdbcConnectionStringParser jdbcUrlParser = new MariaDBJdbcUrlParser();
+    private final JdbcUrlParserV2 jdbcUrlParser = new MariaDBJdbcUrlParser();
 
     private TransformTemplate transformTemplate;
 
@@ -51,7 +51,7 @@ public void setup(ProfilerPluginSetupContext context) {
             return;
         }
 
-        context.addJdbcConnectionStringParser(jdbcUrlParser);
+        context.addJdbcUrlParser(jdbcUrlParser);
 
         addConnectionTransformer(config);
         addDriverTransformer();
@@ -127,7 +127,7 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, Strin
                 target.addField("com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor");
 
                 target.addScopedInterceptor(
-                        "com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptor2",
+                        "com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptorV2",
                         va(MariaDBConstants.MARIADB, true), MariaDBConstants.MARIADB_SCOPE, ExecutionPolicy.ALWAYS);
 
                 return target.toBytecode();

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
@@ -20,7 +20,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -32,7 +32,7 @@
 /**
  * @author emeroad
  */
-public class MySqlJdbcUrlParser implements JdbcConnectionStringParser {
+public class MySqlJdbcUrlParser implements JdbcUrlParserV2 {
 
     private static final String URL_PREFIX = "jdbc:mysql:";
     // jdbc:mysql:loadbalance://10.22.33.44:3306,10.22.33.55:3306/MySQL?characterEncoding=UTF-8

diff --git a/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java b/plugins/mysql-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlPlugin.java
@@ -26,7 +26,7 @@
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin;
 import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.PreparedStatementBindingMethodFilter;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 
 import java.security.ProtectionDomain;
 
@@ -38,7 +38,7 @@
 public class MySqlPlugin implements ProfilerPlugin, TransformTemplateAware {
     private final PLogger logger = PLoggerFactory.getLogger(this.getClass());
     private TransformTemplate transformTemplate;
-    private final JdbcConnectionStringParser jdbcUrlParser = new MySqlJdbcUrlParser();
+    private final JdbcUrlParserV2 jdbcUrlParser = new MySqlJdbcUrlParser();
 
     @Override
     public void setup(ProfilerPluginSetupContext context) {
@@ -49,7 +49,7 @@ public void setup(ProfilerPluginSetupContext context) {
             return;
         }
 
-        context.addJdbcConnectionStringParser(jdbcUrlParser);
+        context.addJdbcUrlParser(jdbcUrlParser);
 
         addConnectionTransformer(config);
         addDriverTransformer();
@@ -108,7 +108,7 @@ private void addDriverTransformer() {
             public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException {
                 InstrumentClass target = instrumentor.getInstrumentClass(loader, className, classfileBuffer);
 
-                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptor2", va(MySqlConstants.MYSQL, false), MySqlConstants.MYSQL_SCOPE, ExecutionPolicy.ALWAYS);
+                target.addScopedInterceptor("com.navercorp.pinpoint.bootstrap.plugin.jdbc.interceptor.DriverConnectInterceptorV2", va(MySqlConstants.MYSQL, false), MySqlConstants.MYSQL_SCOPE, ExecutionPolicy.ALWAYS);
 
                 return target.toBytecode();
             }

diff --git a/...cle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleJdbcUrlParser.java b/...cle-jdbc/src/main/java/com/navercorp/pinpoint/plugin/jdbc/oracle/OracleJdbcUrlParser.java
@@ -20,7 +20,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo;
-import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcConnectionStringParser;
+import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.StringMaker;
 import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo;
 import com.navercorp.pinpoint.common.trace.ServiceType;
@@ -34,7 +34,7 @@
 /**
  * @author emeroad
  */
-public class OracleJdbcUrlParser implements JdbcConnectionStringParser {
+public class OracleJdbcUrlParser implements JdbcUrlParserV2 {
 
     private static final String URL_PREFIX = "jdbc:oracle:";