diff --git a/instrumentation/finatra-2.9/src/test/scala/FinatraController.scala b/instrumentation/finatra-2.9/src/test/scala/FinatraController.scala index 7bd486de60..0509f37d75 100644 --- a/instrumentation/finatra-2.9/src/test/scala/FinatraController.scala +++ b/instrumentation/finatra-2.9/src/test/scala/FinatraController.scala @@ -69,7 +69,7 @@ class FinatraController extends Controller { }) } - any("/path/:id/param") { request : Request => + any("/path/:id/param") { request: Request => controller(PATH_PARAM, new Closure[Response](null) { override def call(): Response = { response.ok(request.params("id")) diff --git a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/CriteriaTest.groovy b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/CriteriaTest.groovy index c71112af3e..d40105f64b 100644 --- a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/CriteriaTest.groovy +++ b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/CriteriaTest.groovy @@ -64,7 +64,7 @@ class CriteriaTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / diff --git a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/QueryTest.groovy b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/QueryTest.groovy index 5a0bccb0f5..732ba27aca 100644 --- a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/QueryTest.groovy +++ b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/QueryTest.groovy @@ -68,7 +68,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -113,7 +113,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -191,7 +191,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / diff --git a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/SessionTest.groovy b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/SessionTest.groovy index 93eda9b91b..178a377055 100644 --- a/instrumentation/hibernate/hibernate-3.3/src/test/groovy/SessionTest.groovy +++ b/instrumentation/hibernate/hibernate-3.3/src/test/groovy/SessionTest.groovy @@ -81,7 +81,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -166,7 +166,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -238,7 +238,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -260,7 +260,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -390,7 +390,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -468,7 +468,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -567,7 +567,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^insert / @@ -581,7 +581,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^delete / diff --git a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/CriteriaTest.groovy b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/CriteriaTest.groovy index c71112af3e..d40105f64b 100644 --- a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/CriteriaTest.groovy +++ b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/CriteriaTest.groovy @@ -64,7 +64,7 @@ class CriteriaTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / diff --git a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/QueryTest.groovy b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/QueryTest.groovy index 0904020c2b..a3122096cb 100644 --- a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/QueryTest.groovy +++ b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/QueryTest.groovy @@ -68,7 +68,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -113,7 +113,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -191,7 +191,7 @@ class QueryTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / diff --git a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/SessionTest.groovy b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/SessionTest.groovy index bc28441a75..fc39552166 100644 --- a/instrumentation/hibernate/hibernate-4.0/src/test/groovy/SessionTest.groovy +++ b/instrumentation/hibernate/hibernate-4.0/src/test/groovy/SessionTest.groovy @@ -80,7 +80,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -171,7 +171,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -193,7 +193,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -323,7 +323,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -401,7 +401,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" String @@ -500,7 +500,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^insert / @@ -514,7 +514,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^delete / @@ -546,7 +546,7 @@ class SessionTest extends AbstractHibernateTest { tags { "$MoreTags.SERVICE_NAME" "h2" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "h2" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "db1" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^insert / diff --git a/instrumentation/hibernate/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy b/instrumentation/hibernate/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy index 916cf25beb..b9fdc7786c 100644 --- a/instrumentation/hibernate/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy +++ b/instrumentation/hibernate/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy @@ -107,7 +107,7 @@ class ProcedureCallTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" "{call TEST_PROC()}" diff --git a/instrumentation/hibernate/hibernate-4.3/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-4.3/src/test/groovy/SpringJpaTest.groovy index 90018e61c6..e0e43f7ec3 100644 --- a/instrumentation/hibernate/hibernate-4.3/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-4.3/src/test/groovy/SpringJpaTest.groovy @@ -51,7 +51,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$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_" @@ -79,7 +79,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" "call next value for hibernate_sequence" @@ -95,7 +95,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*, \?, \?\)/ @@ -120,7 +120,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$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=?" @@ -135,7 +135,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" "update Customer set firstName=?, lastName=? where id=?" @@ -160,7 +160,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$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=?" @@ -183,7 +183,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$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=?" @@ -198,7 +198,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" "delete from Customer where id=?" diff --git a/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy b/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy index e97821e431..d714bd6962 100644 --- a/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy +++ b/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy @@ -49,7 +49,7 @@ class SlickTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" SlickUtils.Driver() "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" SlickUtils.Driver() + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" SlickUtils.Db() "$Tags.DB_USER" SlickUtils.Username() "$Tags.DB_STATEMENT" SlickUtils.TestQuery() diff --git a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java index f7a80d6e21..6b31a3b908 100644 --- a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java +++ b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java @@ -96,8 +96,8 @@ public class JDBCDecorator extends DatabaseClientDecorator { } } + span.setAttribute(Tags.DB_TYPE, "sql"); if (dbInfo != null) { - span.setAttribute(Tags.DB_TYPE, dbInfo.getType()); span.setAttribute(MoreTags.SERVICE_NAME, dbInfo.getType()); } return super.onConnection(span, dbInfo); diff --git a/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy b/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy index 311653c0af..b7c14481d7 100644 --- a/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy +++ b/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy @@ -199,7 +199,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" renameService ? dbName.toLowerCase() : driver "$Tags.COMPONENT" "java-jdbc-statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -257,7 +257,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" driver "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -307,7 +307,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" driver "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -357,7 +357,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" driver "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -407,7 +407,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" driver "$Tags.COMPONENT" "java-jdbc-statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -460,7 +460,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" driver "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -529,7 +529,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { } else { "$Tags.COMPONENT" "java-jdbc-statement" } - "$Tags.DB_TYPE" driver + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() if (username != null) { "$Tags.DB_USER" username @@ -636,7 +636,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" database "$Tags.COMPONENT" "java-jdbc-statement" - "$Tags.DB_TYPE" database + "$Tags.DB_TYPE" "sql" "$Tags.DB_STATEMENT" query "span.origin.type" TestStatement.name } @@ -698,7 +698,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" dbType "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" dbType + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_USER" "SA" "$Tags.DB_STATEMENT" query @@ -715,7 +715,7 @@ class JDBCInstrumentationTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" dbType "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" dbType + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" dbName.toLowerCase() "$Tags.DB_USER" "SA" "$Tags.DB_STATEMENT" query diff --git a/instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy b/instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy index d7ae49320c..29c4662b36 100644 --- a/instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy @@ -84,7 +84,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -118,7 +118,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^insert / @@ -152,7 +152,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -166,7 +166,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^update / @@ -198,7 +198,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -230,7 +230,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^select / @@ -244,7 +244,7 @@ class SpringJpaTest extends AgentTestRunner { tags { "$MoreTags.SERVICE_NAME" "hsqldb" "$Tags.COMPONENT" "java-jdbc-prepared_statement" - "$Tags.DB_TYPE" "hsqldb" + "$Tags.DB_TYPE" "sql" "$Tags.DB_INSTANCE" "test" "$Tags.DB_USER" "sa" "$Tags.DB_STATEMENT" ~/^delete /