Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add full APM/DBM mode for Oracle #8090

Merged
merged 13 commits into from
Dec 20, 2024
Merged

Add full APM/DBM mode for Oracle #8090

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fe6ca2f
Full APM/DBM mode for Oracle
nenadnoveljic Dec 13, 2024
6a0e5ae
enabled injection in tests
nenadnoveljic Dec 13, 2024
ef32413
tests
nenadnoveljic Dec 13, 2024
b07cca4
oracle container
nenadnoveljic Dec 16, 2024
4d0fab8
fixing oracle image
nenadnoveljic Dec 16, 2024
20c710b
fixed containers
nenadnoveljic Dec 16, 2024
5bd91c4
fixed first tests
nenadnoveljic Dec 16, 2024
860bb75
more oracle tests
nenadnoveljic Dec 16, 2024
f7636a4
finished tests
nenadnoveljic Dec 16, 2024
907ad6b
fixed tests
nenadnoveljic Dec 17, 2024
082bc46
Update dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace…
nenadnoveljic Dec 20, 2024
612ae6d
DD_INSTRUMENTATION_PREFIX
nenadnoveljic Dec 20, 2024
f8907b1
compute isOracle
nenadnoveljic Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests
  • Loading branch information
@nenadnoveljic
nenadnoveljic committed Dec 17, 2024
commit ef324134464b28702d1a595d27db0561ac0c10ca
31 changes: 19 additions & 12 deletions dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
static final String POSTGRESQL = "postgresql"
static final String MYSQL = "mysql"
static final String SQLSERVER = "sqlserver"
static final String ORACLE = "oracle"

@Shared
private Map<String, String> dbName = [
Expand All @@ -46,30 +47,34 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {

@Shared
private Map<String, String> jdbcUrls = [
"postgresql" : "jdbc:postgresql://localhost:5432/" + dbName.get("postgresql"),
"mysql" : "jdbc:mysql://localhost:3306/" + dbName.get("mysql"),
"sqlserver" : "jdbc:sqlserver://localhost:1433/" + dbName.get("sqlserver"),
POSTGRESQL : "jdbc:postgresql://localhost:5432/" + dbName.get(POSTGRESQL),
MYSQL : "jdbc:mysql://localhost:3306/" + dbName.get(MYSQL),
SQLSERVER : "jdbc:sqlserver://localhost:1433/" + dbName.get(SQLSERVER),
ORACLE : "jdbc:oracle://localhost:1521/" + dbName.get(ORACLE),
]

@Shared
private Map<String, String> jdbcDriverClassNames = [
"postgresql": "org.postgresql.Driver",
"mysql" : "com.mysql.jdbc.Driver",
"sqlserver" : "com.microsoft.sqlserver.jdbc.SQLServerDriver",
POSTGRESQL: "org.postgresql.Driver",
MYSQL: "com.mysql.jdbc.Driver",
SQLSERVER : "com.microsoft.sqlserver.jdbc.SQLServerDriver",
ORACLE: "oracle.jdbc.OracleDriver",
]

@Shared
private Map<String, String> jdbcUserNames = [
"postgresql": "sa",
"mysql" : "sa",
"sqlserver" : "sa",
POSTGRESQL: "sa",
MYSQL : "sa",
SQLSERVER : "sa",
ORACLE : "system",
]

@Shared
private Map<String, String> jdbcPasswords = [
"mysql" : "sa",
"postgresql": "sa",
"sqlserver" : "Datad0g_",
MYSQL : "sa",
POSTGRESQL: "sa",
SQLSERVER : "Datad0g_",
ORACLE: "manager",
]

@Shared
Expand All @@ -78,6 +83,8 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
def mysql
@Shared
def sqlserver
@Shared
def oracle

// JDBC Connection pool name (i.e. HikariCP) -> Map<dbName, Datasource>
@Shared
Expand Down