fix integration tests

elastic · Sep 8, 2021 · 9d4ddf8 · 9d4ddf8
1 parent 8f28861
commit 9d4ddf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apm-agent-core/src/test/resources/json-specs/span_types.json b/apm-agent-core/src/test/resources/json-specs/span_types.json
@@ -141,7 +141,8 @@
       "mssql": {
         "__description": "Microsoft SQL Server",
         "__used_by": [
-          "nodejs"
+          "nodejs",
+          "java"
         ]
       },
       "mysql": {
@@ -183,9 +184,8 @@
         ]
       },
       "sqlserver": {
-        "__description": "Microsoft SQL Server",
+        "__description": "Microsoft SQL Server (deprecated, use mssql instead)",
         "__used_by": [
-          "java"
         ]
       },
       "unknown": {

diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java
@@ -42,7 +42,7 @@ public static Iterable<Object[]> data() {
             {"jdbc:tc:postgresql:9://hostname/databasename", "postgresql"},
             {"jdbc:tc:postgresql:10://hostname/databasename", "postgresql"},
             {"jdbc:tc:mariadb:10://hostname/databasename", "mariadb"},
-            {"jdbc:tc:sqlserver:2017-CU12://hostname/databasename", "sqlserver"},
+            {"jdbc:tc:sqlserver:2017-CU12://hostname/databasename", "mssql"},
             {"jdbc:tc:db2:11.5.0.0a://hostname/databasename", "db2"},
             {"jdbc:tc:oracle://hostname/databasename", "oracle"},
         });