Fix LibraryVersions

open-telemetry · Oct 31, 2023 · fdcd1a9 · fdcd1a9
1 parent c125f3b
commit fdcd1a9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 11 deletions.
diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs
@@ -72,7 +72,7 @@ public static class LibraryVersion
             }
         },
         {
-            "TestApplication.SqlClient",
+            "TestApplication.SqlClient.Microsoft",
             new List<PackageBuildInfo>
             {
                 new("1.1.4"),
@@ -82,6 +82,13 @@ public static class LibraryVersion
                 new("5.1.2"),
             }
         },
+        {
+            "TestApplication.SqlClient.System",
+            new List<PackageBuildInfo>
+            {
+                new("4.8.5"),
+            }
+        },
         {
             "TestApplication.MongoDB",
             new List<PackageBuildInfo>

diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs
@@ -76,7 +76,7 @@ public static class LibraryVersion
         new object[] { "8.1.1" },
 #endif
     };
-    public static readonly IReadOnlyCollection<object[]> SqlClient = new List<object[]>
+    public static readonly IReadOnlyCollection<object[]> SqlClientMicrosoft = new List<object[]>
     {
 #if DEFAULT_TEST_PACKAGE_VERSIONS
         new object[] { string.Empty }
@@ -86,6 +86,14 @@ public static class LibraryVersion
         new object[] { "3.1.2" },
         new object[] { "4.1.1" },
         new object[] { "5.1.2" },
+#endif
+    };
+    public static readonly IReadOnlyCollection<object[]> SqlClientSystem = new List<object[]>
+    {
+#if DEFAULT_TEST_PACKAGE_VERSIONS
+        new object[] { string.Empty }
+#else
+        new object[] { "4.8.5" },
 #endif
     };
     public static readonly IReadOnlyCollection<object[]> MongoDB = new List<object[]>

diff --git a/test/IntegrationTests/SqlClientMicrosoftTests.cs b/test/IntegrationTests/SqlClientMicrosoftTests.cs
@@ -32,7 +32,12 @@ public SqlClientMicrosoftTests(ITestOutputHelper output, SqlServerFixture sqlSer
 
     public static IEnumerable<object[]> GetData()
     {
-        return LibraryVersion.SqlClient;
+#if NETFRAMEWORK
+        // 3.1.2 is not supported on .NET Framework. For details check: https://github.com/open-telemetry/opentelemetry-dotnet/issues/4243
+        return LibraryVersion.SqlClientMicrosoft.Where(x => x.First().ToString() != "3.1.2");
+#else
+        return LibraryVersion.SqlClientMicrosoft;
+#endif
     }
 
     [Theory]

diff --git a/test/IntegrationTests/SqlClientSystemTests.cs b/test/IntegrationTests/SqlClientSystemTests.cs
@@ -32,12 +32,7 @@ public SqlClientSystemTests(ITestOutputHelper output, SqlServerFixture sqlServer
 
     public static IEnumerable<object[]> GetData()
     {
-#if NETFRAMEWORK
-        // 3.1.2 is not supported on .NET Framework. For details check: https://github.com/open-telemetry/opentelemetry-dotnet/issues/4243
-        return LibraryVersion.SqlClient.Where(x => x.First().ToString() != "3.1.2");
-#else
-        return LibraryVersion.SqlClient;
-#endif
+        return LibraryVersion.SqlClientSystem;
     }
 
     [Theory]

diff --git a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs
@@ -102,9 +102,9 @@ internal static class PackageVersionDefinitions
         },
         new()
         {
-            IntegrationName = "SqlClient",
+            IntegrationName = "SqlClientMicrosoft",
             NugetPackageName = "Microsoft.Data.SqlClient",
-            TestApplicationName = "TestApplication.SqlClient",
+            TestApplicationName = "TestApplication.SqlClient.Microsoft",
             Versions = new List<PackageVersion>
             {
                 new("1.1.4"),
@@ -115,6 +115,16 @@ internal static class PackageVersionDefinitions
             }
         },
         new()
+        {
+            IntegrationName = "SqlClientSystem",
+            NugetPackageName = "System.Data.SqlClient",
+            TestApplicationName = "TestApplication.SqlClient.System",
+            Versions = new List<PackageVersion>
+            {
+                new("*")
+            }
+        },
+        new()
         {
             IntegrationName = "MongoDB",
             NugetPackageName = "MongoDB.Driver",