SqlTest improvements (#1122)

* SqlClientTest - simplify assertions for tags * remove unnecessary interpolation * connect using 127.0.0.1 instead of localhost * remove unnecessary interpolation * build - execute integration tests after unit tests Co-authored-by: Rajkumar Rangaraj <rajrang@microsoft.com>
open-telemetry · Aug 23, 2022 · 0a2664b · 0a2664b
1 parent 0723264
commit 0a2664b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/build/nuke/Build.Steps.cs b/build/nuke/Build.Steps.cs
@@ -298,6 +298,7 @@ partial class Build
 
     Target RunManagedIntegrationTests => _ => _
         .Unlisted()
+        .After(RunManagedUnitTests)
         .Executes(() =>
         {
             var project = Solution.GetProject("IntegrationTests");

diff --git a/test/IntegrationTests/Helpers/InstrumentedProcessHelper.cs b/test/IntegrationTests/Helpers/InstrumentedProcessHelper.cs
@@ -35,7 +35,7 @@ public static Process StartInstrumentedProcess(
         // clear all relevant environment variables to start with a clean slate
         EnvironmentHelper.ClearProfilerEnvironmentVariables();
 
-        var startInfo = new ProcessStartInfo(executable, $"{arguments ?? string.Empty}");
+        var startInfo = new ProcessStartInfo(executable, arguments ?? string.Empty);
 
         environmentHelper.SetEnvironmentVariables(testSettings, startInfo.EnvironmentVariables, executable);
 

diff --git a/test/IntegrationTests/Helpers/TestHelper.cs b/test/IntegrationTests/Helpers/TestHelper.cs
@@ -202,7 +202,7 @@ private void RunTestApplication(TestSettings testSettings)
         Output.WriteResult(helper);
 
         processTimeout.Should().BeFalse("Test application timed out");
-        process.ExitCode.Should().Be(0, $"Test application exited with non-zero exit code");
+        process.ExitCode.Should().Be(0, "Test application exited with non-zero exit code");
     }
 
     private Process StartTestApplication(TestSettings testSettings)

diff --git a/test/IntegrationTests/SqlClientTests.cs b/test/IntegrationTests/SqlClientTests.cs
@@ -55,12 +55,7 @@ public void SubmitTraces()
 
                 foreach (var span in spans)
                 {
-                    span.Service.Should().Be(ServiceName);
-                    span.Name.Should().Be("master");
-                    span.Tags.Should().Contain(new KeyValuePair<string, string>("db.system", "mssql"));
-                    span.Tags.Should().Contain(new KeyValuePair<string, string>("db.name", "master"));
-                    span.Tags.Should().Contain(new KeyValuePair<string, string>("peer.service", $"localhost,{_sqlServerFixture.Port}"));
-                    span.Tags.Should().Contain(new KeyValuePair<string, string>("span.kind", "client"));
+                    span.Tags.Should().Contain(new KeyValuePair<string, string>("otel.library.name", "OpenTelemetry.SqlClient"));
                 }
             }
         }

diff --git a/test/test-applications/integrations/TestApplication.SqlClient/Program.cs b/test/test-applications/integrations/TestApplication.SqlClient/Program.cs
@@ -135,7 +135,7 @@ private static async Task ExecuteDropAsync(SqlConnection connection)
 
         private static string GetConnectionString(string databasePassword, string databasePort)
         {
-            return $"Server=localhost,{databasePort};User=sa;Password={databasePassword};TrustServerCertificate=True;";
+            return $"Server=127.0.0.1,{databasePort};User=sa;Password={databasePassword};TrustServerCertificate=True;";
         }
 
         private static (string DatabasePassword, string Port) ParseArgs(IReadOnlyList<string> args)