Skip to content

Commit

Permalink
refactor peerConnectionProperties
Browse files Browse the repository at this point in the history
  • Loading branch information
@nenadnoveljic
nenadnoveljic committed Jul 12, 2024
1 parent 70ccad4 commit 5ede329
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,17 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
@Shared
def sqlserver

@Shared
private Properties peerConnectionProps = {
def props = new Properties()
props.setProperty("user", "sa")
props.setProperty("password", "sa")
return props
}()

// JDBC Connection pool name (i.e. HikariCP) -> Map<dbName, Datasource>
@Shared
private Map<String, Map<String, DataSource>> cpDatasources = new HashMap<>()

def peerConnectionProps(String db){
def props = new Properties()
props.setProperty("user", jdbcUserNames.get(db))
props.setProperty("password", jdbcPasswords.get(db))
return props
}

def prepareConnectionPoolDatasources() {
String[] connectionPoolNames = ["tomcat", "hikari", "c3p0",]
connectionPoolNames.each { cpName ->
Expand Down Expand Up @@ -253,8 +252,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

where:
driver | connection | renameService | query | operation | obfuscatedQuery
"mysql" | connectTo(driver, peerConnectionProps) | false | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps) | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | false | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | false | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | false | "SELECT 3" | "SELECT" | "SELECT ?"
Expand Down Expand Up @@ -313,8 +312,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

where:
driver | connection | query | operation | obfuscatedQuery
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
Expand Down Expand Up @@ -371,8 +370,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

where:
driver | connection | query | operation | obfuscatedQuery
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
Expand Down Expand Up @@ -428,8 +427,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

where:
driver | connection | query | operation | obfuscatedQuery
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
Expand Down Expand Up @@ -491,8 +490,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

where:
driver | connection | query | operation
"mysql" | connectTo(driver, peerConnectionProps) | "CREATE TEMPORARY TABLE s_test_ (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"postgresql" | connectTo(driver, peerConnectionProps) | "CREATE TEMPORARY TABLE s_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "CREATE TEMPORARY TABLE s_test_ (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "CREATE TEMPORARY TABLE s_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_tomcat_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_tomcat_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_hikari_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
Expand Down Expand Up @@ -529,8 +528,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "{ ? = call upper( ? ) }"
"postgresql" | cpDatasources.get("c3p0").get(driver).getConnection() | " { ? = call upper( ? ) }"
"mysql" | cpDatasources.get("c3p0").get(driver).getConnection() | "{ ? = call upper( ? ) }"
"postgresql" | connectTo(driver, peerConnectionProps) | " { ? = call upper( ? ) }"
"mysql" | connectTo(driver, peerConnectionProps) | " { ? = call upper( ? ) }"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | " { ? = call upper( ? ) }"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | " { ? = call upper( ? ) }"
}

def "prepared procedure call on #driver with #connection.getClass().getCanonicalName() does not hang"() {
Expand Down Expand Up @@ -593,8 +592,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CALL dummy(?)"
"postgresql" | cpDatasources.get("c3p0").get(driver).getConnection() | " CALL dummy(?)"
"mysql" | cpDatasources.get("c3p0").get(driver).getConnection() | "CALL dummy(?)"
"postgresql" | connectTo(driver, peerConnectionProps) | " CALL dummy(?)"
"mysql" | connectTo(driver, peerConnectionProps) | "CALL dummy(?)"
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | " CALL dummy(?)"
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "CALL dummy(?)"
}


Expand Down

0 comments on commit 5ede329

Please sign in to comment.