From 9d4ddf8b93964fae910fe36d83eea9b53c9639a0 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <sylvain.juge@elastic.co>
Date: Wed, 8 Sep 2021 15:14:52 +0200
Subject: [PATCH] fix integration tests

---
 .../src/test/resources/json-specs/span_types.json           | 6 +++---
 .../src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java   | 2 +-
 2 files changed, 4 insertions(+), 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
index 18189088a9..b60c3730d2 100644
--- 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
index 5cdae8a581..8457228e2f 100644
--- 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"},
         });