diff --git a/build/nuke/Build.Steps.cs b/build/nuke/Build.Steps.cs index 361413907c..58f74609d0 100644 --- 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 index ce81b4e36e..5b239c9906 100644 --- 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 index fe3181d33c..71e7acb271 100644 --- 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 index ebda70cb0e..dd52272155 100644 --- 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("db.system", "mssql")); - span.Tags.Should().Contain(new KeyValuePair("db.name", "master")); - span.Tags.Should().Contain(new KeyValuePair("peer.service", $"localhost,{_sqlServerFixture.Port}")); - span.Tags.Should().Contain(new KeyValuePair("span.kind", "client")); + span.Tags.Should().Contain(new KeyValuePair("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 index 3d112a9508..49a6d22c42 100644 --- 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 args)