Change jdbc db.type to sql (#274)

This commit is contained in:
Trask Stalnaker 2020-03-23 09:50:55 -07:00 committed by GitHub
parent 19fa3618d4
commit da05fc7e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 53 additions and 53 deletions

View File

@ -64,7 +64,7 @@ class CriteriaTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /

View File

@ -68,7 +68,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -113,7 +113,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -191,7 +191,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /

View File

@ -81,7 +81,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -166,7 +166,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -238,7 +238,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -260,7 +260,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -390,7 +390,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -468,7 +468,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -567,7 +567,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^insert / "$Tags.DB_STATEMENT" ~/^insert /
@ -581,7 +581,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^delete / "$Tags.DB_STATEMENT" ~/^delete /

View File

@ -64,7 +64,7 @@ class CriteriaTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /

View File

@ -68,7 +68,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -113,7 +113,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -191,7 +191,7 @@ class QueryTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /

View File

@ -80,7 +80,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -171,7 +171,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -193,7 +193,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -323,7 +323,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -401,7 +401,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" String "$Tags.DB_STATEMENT" String
@ -500,7 +500,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^insert / "$Tags.DB_STATEMENT" ~/^insert /
@ -514,7 +514,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^delete / "$Tags.DB_STATEMENT" ~/^delete /
@ -546,7 +546,7 @@ class SessionTest extends AbstractHibernateTest {
tags { tags {
"$MoreTags.SERVICE_NAME" "h2" "$MoreTags.SERVICE_NAME" "h2"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "db1" "$Tags.DB_INSTANCE" "db1"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^insert / "$Tags.DB_STATEMENT" ~/^insert /

View File

@ -107,7 +107,7 @@ class ProcedureCallTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "{call TEST_PROC()}" "$Tags.DB_STATEMENT" "{call TEST_PROC()}"

View File

@ -51,7 +51,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "select customer0_.id as id1_0_, customer0_.firstName as firstNam2_0_, customer0_.lastName as lastName3_0_ from Customer customer0_" "$Tags.DB_STATEMENT" "select customer0_.id as id1_0_, customer0_.firstName as firstNam2_0_, customer0_.lastName as lastName3_0_ from Customer customer0_"
@ -79,7 +79,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "call next value for hibernate_sequence" "$Tags.DB_STATEMENT" "call next value for hibernate_sequence"
@ -95,7 +95,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*, \?, \?\)/ "$Tags.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*, \?, \?\)/
@ -120,7 +120,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "select customer0_.id as id1_0_0_, customer0_.firstName as firstNam2_0_0_, customer0_.lastName as lastName3_0_0_ from Customer customer0_ where customer0_.id=?" "$Tags.DB_STATEMENT" "select customer0_.id as id1_0_0_, customer0_.firstName as firstNam2_0_0_, customer0_.lastName as lastName3_0_0_ from Customer customer0_ where customer0_.id=?"
@ -135,7 +135,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "update Customer set firstName=?, lastName=? where id=?" "$Tags.DB_STATEMENT" "update Customer set firstName=?, lastName=? where id=?"
@ -160,7 +160,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "select customer0_.id as id1_0_, customer0_.firstName as firstNam2_0_, customer0_.lastName as lastName3_0_ from Customer customer0_ where customer0_.lastName=?" "$Tags.DB_STATEMENT" "select customer0_.id as id1_0_, customer0_.firstName as firstNam2_0_, customer0_.lastName as lastName3_0_ from Customer customer0_ where customer0_.lastName=?"
@ -183,7 +183,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "select customer0_.id as id1_0_0_, customer0_.firstName as firstNam2_0_0_, customer0_.lastName as lastName3_0_0_ from Customer customer0_ where customer0_.id=?" "$Tags.DB_STATEMENT" "select customer0_.id as id1_0_0_, customer0_.firstName as firstNam2_0_0_, customer0_.lastName as lastName3_0_0_ from Customer customer0_ where customer0_.id=?"
@ -198,7 +198,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" "delete from Customer where id=?" "$Tags.DB_STATEMENT" "delete from Customer where id=?"

View File

@ -49,7 +49,7 @@ class SlickTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" SlickUtils.Driver() "$MoreTags.SERVICE_NAME" SlickUtils.Driver()
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" SlickUtils.Driver() "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" SlickUtils.Db() "$Tags.DB_INSTANCE" SlickUtils.Db()
"$Tags.DB_USER" SlickUtils.Username() "$Tags.DB_USER" SlickUtils.Username()
"$Tags.DB_STATEMENT" SlickUtils.TestQuery() "$Tags.DB_STATEMENT" SlickUtils.TestQuery()

View File

@ -96,8 +96,8 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
} }
} }
span.setAttribute(Tags.DB_TYPE, "sql");
if (dbInfo != null) { if (dbInfo != null) {
span.setAttribute(Tags.DB_TYPE, dbInfo.getType());
span.setAttribute(MoreTags.SERVICE_NAME, dbInfo.getType()); span.setAttribute(MoreTags.SERVICE_NAME, dbInfo.getType());
} }
return super.onConnection(span, dbInfo); return super.onConnection(span, dbInfo);

View File

@ -199,7 +199,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" renameService ? dbName.toLowerCase() : driver "$MoreTags.SERVICE_NAME" renameService ? dbName.toLowerCase() : driver
"$Tags.COMPONENT" "java-jdbc-statement" "$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -257,7 +257,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" driver "$MoreTags.SERVICE_NAME" driver
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -307,7 +307,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" driver "$MoreTags.SERVICE_NAME" driver
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -357,7 +357,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" driver "$MoreTags.SERVICE_NAME" driver
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -407,7 +407,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" driver "$MoreTags.SERVICE_NAME" driver
"$Tags.COMPONENT" "java-jdbc-statement" "$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -460,7 +460,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" driver "$MoreTags.SERVICE_NAME" driver
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -529,7 +529,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
} else { } else {
"$Tags.COMPONENT" "java-jdbc-statement" "$Tags.COMPONENT" "java-jdbc-statement"
} }
"$Tags.DB_TYPE" driver "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
if (username != null) { if (username != null) {
"$Tags.DB_USER" username "$Tags.DB_USER" username
@ -636,7 +636,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" database "$MoreTags.SERVICE_NAME" database
"$Tags.COMPONENT" "java-jdbc-statement" "$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" database "$Tags.DB_TYPE" "sql"
"$Tags.DB_STATEMENT" query "$Tags.DB_STATEMENT" query
"span.origin.type" TestStatement.name "span.origin.type" TestStatement.name
} }
@ -698,7 +698,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" dbType "$MoreTags.SERVICE_NAME" dbType
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" dbType "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
"$Tags.DB_USER" "SA" "$Tags.DB_USER" "SA"
"$Tags.DB_STATEMENT" query "$Tags.DB_STATEMENT" query
@ -715,7 +715,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" dbType "$MoreTags.SERVICE_NAME" dbType
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" dbType "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_INSTANCE" dbName.toLowerCase()
"$Tags.DB_USER" "SA" "$Tags.DB_USER" "SA"
"$Tags.DB_STATEMENT" query "$Tags.DB_STATEMENT" query

View File

@ -84,7 +84,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -118,7 +118,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^insert / "$Tags.DB_STATEMENT" ~/^insert /
@ -152,7 +152,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -166,7 +166,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^update / "$Tags.DB_STATEMENT" ~/^update /
@ -198,7 +198,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -230,7 +230,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^select / "$Tags.DB_STATEMENT" ~/^select /
@ -244,7 +244,7 @@ class SpringJpaTest extends AgentTestRunner {
tags { tags {
"$MoreTags.SERVICE_NAME" "hsqldb" "$MoreTags.SERVICE_NAME" "hsqldb"
"$Tags.COMPONENT" "java-jdbc-prepared_statement" "$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb" "$Tags.DB_TYPE" "sql"
"$Tags.DB_INSTANCE" "test" "$Tags.DB_INSTANCE" "test"
"$Tags.DB_USER" "sa" "$Tags.DB_USER" "sa"
"$Tags.DB_STATEMENT" ~/^delete / "$Tags.DB_STATEMENT" ~/^delete /