[EFCore] Extend known providers (#3025)

Author: martincostello

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md

@@ -12,6 +12,9 @@
   conventions when opted into using the `OTEL_SEMCONV_STABILITY_OPT_IN` environment
   variable.
   ([#3011](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3011))
+* Extend `db.system.name` values to identity additional providers related to Couchbase,
+  DB2, MongoDB, MySQL, Oracle, PostgreSQL and SQLite.
+  ([#3025](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3025))
 
 ## 1.12.0-beta.2
 

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs

@@ -286,6 +286,7 @@ internal static (string Old, string New) GetDbSystemNames(string? providerOrComm
             "Devart.Data.MySql.MySqlCommand" or
             "MySql.Data.EntityFrameworkCore" or
             "MySql.Data.MySqlClient.MySqlCommand" or
+            "MySql.EntityFrameworkCore" or
             "Pomelo.EntityFrameworkCore.MySql"
                 => (DbSystems.Mysql, DbSystemNames.Mysql),
             "Npgsql.EntityFrameworkCore.PostgreSQL" or
@@ -307,6 +308,15 @@ internal static (string Old, string New) GetDbSystemNames(string? providerOrComm
             "Teradata.Client.Provider.TdCommand" or
             "Teradata.EntityFrameworkCore"
                 => (DbSystems.Teradata, DbSystemNames.Teradata),
+            "MongoDB.EntityFrameworkCore"
+                => (DbSystems.Mongodb, DbSystemNames.Mongodb),
+            "Couchbase.EntityFrameworkCore" or
+            "Couchbase.EntityFrameworkCore.Storage.Internal"
+                => (DbSystems.Couchbase, DbSystemNames.Couchbase),
+            "IBM.EntityFrameworkCore" or
+            "IBM.EntityFrameworkCore-lnx" or
+            "IBM.EntityFrameworkCore-osx"
+                => (DbSystems.Db2, DbSystemNames.IbmDb2),
             //// These names are custom and are retained for backwards compatibility
             "EFCore.Snowflake" or
             "EFCore.Snowflake.Storage" or
@@ -367,9 +377,12 @@ private static class DbSystemNames
     {
         public const string OtherSql = "other_sql";
         public const string AzureCosmosDb = "azure.cosmosdb";
+        public const string Couchbase = "couchbase";
         public const string Firebirdsql = "firebirdsql";
         public const string GcpSpanner = "gcp.spanner";
+        public const string IbmDb2 = "ibm.db2";
         public const string MicrosoftSqlServer = "microsoft.sql_server";
+        public const string Mongodb = "mongodb";
         public const string Mysql = "mysql";
         public const string OracleDb = "oracle.db";
         public const string Postgresql = "postgresql";
@@ -384,7 +397,10 @@ private static class DbSystems
     {
         public const string OtherSql = "other_sql";
         public const string Cosmosdb = "cosmosdb";
+        public const string Couchbase = "couchbase";
+        public const string Db2 = "db2";
         public const string Firebird = "firebird";
+        public const string Mongodb = "mongodb";
         public const string Mssql = "mssql";
         public const string Mysql = "mysql";
         public const string Oracle = "oracle";

test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs

@@ -37,10 +37,36 @@ public static TheoryData<string, string, string> DbSystemTestCases()
             { "FileContextCore", "filecontextcore", "filecontextcore" },
             { "Microsoft.EntityFrameworkCore.Cosmos", "cosmosdb", "azure.cosmosdb" },
             { "Microsoft.EntityFrameworkCore.InMemory", "efcoreinmemory", "efcoreinmemory" },
+            { "MongoDB.EntityFrameworkCore", "mongodb", "mongodb" },
         };
 
-        // Firebird
+        // Couchbase
         string[] names =
+        [
+            "Couchbase.EntityFrameworkCore",
+            "Couchbase.EntityFrameworkCore.Storage.Internal",
+        ];
+
+        foreach (string name in names)
+        {
+            testCases.Add(name, "couchbase", "couchbase");
+        }
+
+        // DB2
+        names =
+        [
+            "IBM.EntityFrameworkCore",
+            "IBM.EntityFrameworkCore-lnx",
+            "IBM.EntityFrameworkCore-osx",
+        ];
+
+        foreach (string name in names)
+        {
+            testCases.Add(name, "db2", "ibm.db2");
+        }
+
+        // Firebird
+        names =
         [
             "FirebirdSql.Data.FirebirdClient.FbCommand",
             "FirebirdSql.EntityFrameworkCore.Firebird",
@@ -82,6 +108,7 @@ public static TheoryData<string, string, string> DbSystemTestCases()
             "Devart.Data.MySql.MySqlCommand",
             "MySql.Data.EntityFrameworkCore",
             "MySql.Data.MySqlClient.MySqlCommand",
+            "MySql.EntityFrameworkCore",
             "Pomelo.EntityFrameworkCore.MySql",
         ];