fix generic url parsing in jdbc instrumentation (#9777)

* fix generic url parsing in jdbc instrumentation

* add test

* extract DBM specific test to a different class

* fix existing test that was not asserting the correct thing

* just realized there was already a test on this that I could reuse

* Revert "extract DBM specific test to a different class"

This reverts commit b776e20.

* Revert "add test"

This reverts commit f992419.

Author: vandonr

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java

@@ -870,7 +870,7 @@ public static DBInfo parse(String connectionUrl, final Properties props) {
         // Delegate to specific parser
         return typeParsers.get(baseType).doParse(jdbcUrl, parsedProps).build();
       }
-      return GENERIC_URL_LIKE.doParse(connectionUrl, parsedProps).build();
+      return GENERIC_URL_LIKE.doParse(jdbcUrl, parsedProps).build();
     } catch (final Exception e) {
       ExceptionLogger.LOGGER.debug("Error parsing URL", e);
       return parsedProps.build();

dd-java-agent/instrumentation/jdbc/src/test/groovy/DBMInjectionForkedTest.groovy

@@ -20,7 +20,7 @@ class DBMInjectionForkedTest extends InstrumentationSpecification {
   }
 
   static query = "SELECT 1"
-  static serviceInjection = "ddps='my_service_name',dddbs='remapped_testdb'"
+  static serviceInjection = "ddps='my_service_name',dddbs='remapped_testdb',ddh='localhost'"
   static fullInjection = serviceInjection + ",traceparent='00-00000000000000000000000000000004-0000000000000003-01'"
 
   def "prepared stmt"() {

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCConnectionUrlParserTest.groovy

@@ -1,9 +1,9 @@
+import static datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser.extractDBInfo
+
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo
 import spock.lang.Shared
 
-import static datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser.extractDBInfo
-
 class JDBCConnectionUrlParserTest extends InstrumentationSpecification {
 
   @Shared
@@ -207,6 +207,8 @@ class JDBCConnectionUrlParserTest extends InstrumentationSpecification {
     // sybase
     "jdbc:sybase:Tds:dbhostname:2638?ServiceName=demo"                                                                                                                                                                                          | null     | "sybase"     | "tds"         | null     | "dbhostname"                                                          | 2638    | "demo"                               | null
     "jdbc:sybase:Tds:dbhostname:2638/dbname"                                                                                                                                                                                                    | null     | "sybase"     | "tds"         | null     | "dbhostname"                                                          | 2638    | null                                 | "dbname"
+    // unknown DB type
+    "jdbc:testdb://myhost:9999/testdatabase" | null | "testdb" | null | null | "myhost" | 9999 | null | "testdatabase"
     expected = new DBInfo.Builder().type(type).subtype(subtype).user(user).instance(instance).db(db).host(host).port(port).build()
   }
 }

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTestBase.groovy

@@ -1,3 +1,8 @@
+import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
+import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_POOL_WAITING_ENABLED
+
 import com.mchange.v2.c3p0.ComboPooledDataSource
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
@@ -6,18 +11,6 @@ import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
-import org.apache.commons.dbcp2.BasicDataSource
-import org.apache.commons.pool2.PooledObject
-import org.apache.commons.pool2.PooledObjectFactory
-import org.apache.commons.pool2.impl.DefaultPooledObject
-import org.apache.commons.pool2.impl.GenericObjectPool
-import org.apache.derby.jdbc.EmbeddedDataSource
-import org.h2.jdbcx.JdbcDataSource
-import spock.lang.Shared
-import test.TestConnection
-import test.WrappedConnection
-
-import javax.sql.DataSource
 import java.sql.CallableStatement
 import java.sql.Connection
 import java.sql.Driver
@@ -28,11 +21,17 @@ import java.sql.SQLTimeoutException
 import java.sql.SQLTransientConnectionException
 import java.sql.Statement
 import java.time.Duration
-
-import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
-import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE
-import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_POOL_WAITING_ENABLED
+import javax.sql.DataSource
+import org.apache.commons.dbcp2.BasicDataSource
+import org.apache.commons.pool2.PooledObject
+import org.apache.commons.pool2.PooledObjectFactory
+import org.apache.commons.pool2.impl.DefaultPooledObject
+import org.apache.commons.pool2.impl.GenericObjectPool
+import org.apache.derby.jdbc.EmbeddedDataSource
+import org.h2.jdbcx.JdbcDataSource
+import spock.lang.Shared
+import test.TestConnection
+import test.WrappedConnection
 
 abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
 
@@ -724,14 +723,15 @@ abstract class JDBCInstrumentationTest extends VersionedNamingTestBase {
           errored false
           measured true
           tags {
+            "$Tags.PEER_HOSTNAME" "localhost"
             "$Tags.COMPONENT" "java-jdbc-statement"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.DB_TYPE" database
             "$Tags.DB_OPERATION" CharSequence
             if (addDbmTag) {
               "$InstrumentationTags.DBM_TRACE_INJECTED" true
             }
-            defaultTagsNoPeerService()
+            defaultTags()
           }
         }
       }

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCWrappedInterfacesTest.groovy

@@ -1,3 +1,6 @@
+import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -7,9 +10,6 @@ import test.TestPreparedStatement
 import test.WrappedConnection
 import test.WrappedPreparedStatement
 
-import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
-import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-
 /**
  * This tests all combinations of wrapped/unwrapped connections and prepared statements
  * H2 classes are called out because the don't implement the Wrapper interface.  They are based an older spec leading to AbstractMethodError
@@ -255,6 +255,9 @@ class JDBCWrappedInterfacesTest extends InstrumentationSpecification {
           childOfPrevious()
           errored false
           tags {
+            if (database == "testdb") {
+              "$Tags.PEER_HOSTNAME" "localhost"
+            }
             "$Tags.COMPONENT" "java-jdbc-prepared_statement"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
             "$Tags.DB_TYPE" "${database}"