Skip to content

Commit 5ede329

Browse files
nenadnoveljicnenadnoveljic
committed
refactor peerConnectionProperties
1 parent 70ccad4 commit 5ede329

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

‎dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,17 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
7676
@Shared
7777
def sqlserver
7878

79-
@Shared
80-
private Properties peerConnectionProps = {
81-
def props = new Properties()
82-
props.setProperty("user", "sa")
83-
props.setProperty("password", "sa")
84-
return props
85-
}()
86-
8779
// JDBC Connection pool name (i.e. HikariCP) -> Map<dbName, Datasource>
8880
@Shared
8981
private Map<String, Map<String, DataSource>> cpDatasources = new HashMap<>()
9082

83+
def peerConnectionProps(String db){
84+
def props = new Properties()
85+
props.setProperty("user", jdbcUserNames.get(db))
86+
props.setProperty("password", jdbcPasswords.get(db))
87+
return props
88+
}
89+
9190
def prepareConnectionPoolDatasources() {
9291
String[] connectionPoolNames = ["tomcat", "hikari", "c3p0",]
9392
connectionPoolNames.each { cpName ->
@@ -253,8 +252,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
253252

254253
where:
255254
driver | connection | renameService | query | operation | obfuscatedQuery
256-
"mysql" | connectTo(driver, peerConnectionProps) | false | "SELECT 3" | "SELECT" | "SELECT ?"
257-
"postgresql" | connectTo(driver, peerConnectionProps) | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
255+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | false | "SELECT 3" | "SELECT" | "SELECT ?"
256+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
258257
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | false | "SELECT 3" | "SELECT" | "SELECT ?"
259258
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | false | "SELECT 3 FROM pg_user" | "SELECT" | "SELECT ? FROM pg_user"
260259
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | false | "SELECT 3" | "SELECT" | "SELECT ?"
@@ -313,8 +312,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
313312

314313
where:
315314
driver | connection | query | operation | obfuscatedQuery
316-
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
317-
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
315+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
316+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
318317
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
319318
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
320319
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
@@ -371,8 +370,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
371370

372371
where:
373372
driver | connection | query | operation | obfuscatedQuery
374-
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
375-
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
373+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
374+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
376375
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
377376
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
378377
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
@@ -428,8 +427,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
428427

429428
where:
430429
driver | connection | query | operation | obfuscatedQuery
431-
"mysql" | connectTo(driver, peerConnectionProps) | "SELECT 3" | "SELECT" | "SELECT ?"
432-
"postgresql" | connectTo(driver, peerConnectionProps) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
430+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3" | "SELECT" | "SELECT ?"
431+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
433432
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
434433
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "SELECT 3 from pg_user" | "SELECT" | "SELECT ? from pg_user"
435434
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "SELECT 3" | "SELECT" | "SELECT ?"
@@ -491,8 +490,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
491490

492491
where:
493492
driver | connection | query | operation
494-
"mysql" | connectTo(driver, peerConnectionProps) | "CREATE TEMPORARY TABLE s_test_ (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
495-
"postgresql" | connectTo(driver, peerConnectionProps) | "CREATE TEMPORARY TABLE s_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
493+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "CREATE TEMPORARY TABLE s_test_ (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
494+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | "CREATE TEMPORARY TABLE s_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
496495
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_tomcat_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
497496
"postgresql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_tomcat_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
498497
"mysql" | cpDatasources.get("hikari").get(driver).getConnection() | "CREATE TEMPORARY TABLE s_hikari_test (id INTEGER not NULL, PRIMARY KEY ( id ))" | "CREATE"
@@ -529,8 +528,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
529528
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "{ ? = call upper( ? ) }"
530529
"postgresql" | cpDatasources.get("c3p0").get(driver).getConnection() | " { ? = call upper( ? ) }"
531530
"mysql" | cpDatasources.get("c3p0").get(driver).getConnection() | "{ ? = call upper( ? ) }"
532-
"postgresql" | connectTo(driver, peerConnectionProps) | " { ? = call upper( ? ) }"
533-
"mysql" | connectTo(driver, peerConnectionProps) | " { ? = call upper( ? ) }"
531+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | " { ? = call upper( ? ) }"
532+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | " { ? = call upper( ? ) }"
534533
}
535534

536535
def "prepared procedure call on #driver with #connection.getClass().getCanonicalName() does not hang"() {
@@ -593,8 +592,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
593592
"mysql" | cpDatasources.get("tomcat").get(driver).getConnection() | "CALL dummy(?)"
594593
"postgresql" | cpDatasources.get("c3p0").get(driver).getConnection() | " CALL dummy(?)"
595594
"mysql" | cpDatasources.get("c3p0").get(driver).getConnection() | "CALL dummy(?)"
596-
"postgresql" | connectTo(driver, peerConnectionProps) | " CALL dummy(?)"
597-
"mysql" | connectTo(driver, peerConnectionProps) | "CALL dummy(?)"
595+
"postgresql" | connectTo(driver, peerConnectionProps(driver)) | " CALL dummy(?)"
596+
"mysql" | connectTo(driver, peerConnectionProps(driver)) | "CALL dummy(?)"
598597
}
599598

600599

0 commit comments

Comments
 (0)