diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs index d3d42053ee..531ee3acad 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs @@ -69,8 +69,6 @@ public void SuccessfulCommandTest( sqlConnection.Open(); - var dataSource = sqlConnection.DataSource; - sqlConnection.ChangeDatabase("master"); SqlTransaction? transaction = null; #pragma warning disable CA2100 @@ -91,7 +89,7 @@ public void SuccessfulCommandTest( { commandResult = sqlCommand.ExecuteScalar(); } - catch + catch (Exception) { } @@ -127,8 +125,6 @@ public async Task SuccessfulParameterizedQueryTest() var sampler = new TestSampler(); var activities = new List(); - using var scope = SemanticConventionScope.Get(useNewConventions: true); - using var tracerProvider = Sdk.CreateTracerProviderBuilder() .SetSampler(sampler) .AddInMemoryExporter(activities) @@ -139,8 +135,6 @@ public async Task SuccessfulParameterizedQueryTest() await sqlConnection.OpenAsync(); - var dataSource = sqlConnection.DataSource; - sqlConnection.ChangeDatabase("master"); using var sqlCommand = new SqlCommand("SELECT @x + @y", sqlConnection); @@ -168,12 +162,10 @@ public async Task ActivityIsStoppedWhenOnlyUsingMetrics() var activities = new List(); var metrics = new List(); - using var listener = new ActivityListener() - { - ActivityStarted = activities.Add, - Sample = (ref _) => ActivitySamplingResult.AllData, - ShouldListenTo = _ => true, - }; + using var listener = new ActivityListener(); + listener.ActivityStarted = activities.Add; + listener.Sample = (ref _) => ActivitySamplingResult.AllData; + listener.ShouldListenTo = _ => true; ActivitySource.AddActivityListener(listener); @@ -186,8 +178,6 @@ public async Task ActivityIsStoppedWhenOnlyUsingMetrics() await sqlConnection.OpenAsync(); - var dataSource = sqlConnection.DataSource; - sqlConnection.ChangeDatabase("master"); using var sqlCommand = new SqlCommand("select 1/1", sqlConnection); @@ -286,10 +276,4 @@ private static void VerifySamplingParameters(SamplingParameters samplingParamete private string GetConnectionString() => this.fixture.DatabaseContainer.GetConnectionString(); - - private static class SemanticConventionScope - { - public static IDisposable Get(bool useNewConventions) - => EnvironmentVariableScope.Create("OTEL_SEMCONV_STABILITY_OPT_IN", useNewConventions ? "database" : string.Empty); - } }