Skip to content

[SqlClient.Tests] Avoid setting OTEL_SEMCONV_STABILITY_OPT_IN #3682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kielek merged 2 commits into from
Jan 13, 2026
Merged

[SqlClient.Tests] Avoid setting OTEL_SEMCONV_STABILITY_OPT_IN #3682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a604a
[SqlClient.Tests] Avoid setting OTEL_SEMCONV_STABILITY_OPT_IN
Kielek Jan 13, 2026
05ba731
semi auto cleanup
Kielek Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ public void SuccessfulCommandTest(

sqlConnection.Open();

var dataSource = sqlConnection.DataSource;

sqlConnection.ChangeDatabase("master");
SqlTransaction? transaction = null;
#pragma warning disable CA2100
Expand All @@ -91,7 +89,7 @@ public void SuccessfulCommandTest(
{
commandResult = sqlCommand.ExecuteScalar();
}
catch
catch (Exception)
{
}

Expand Down Expand Up @@ -127,8 +125,6 @@ public async Task SuccessfulParameterizedQueryTest()
var sampler = new TestSampler();
var activities = new List<Activity>();

using var scope = SemanticConventionScope.Get(useNewConventions: true);

using var tracerProvider = Sdk.CreateTracerProviderBuilder()
.SetSampler(sampler)
.AddInMemoryExporter(activities)
Expand All @@ -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);
Expand Down Expand Up @@ -168,12 +162,10 @@ public async Task ActivityIsStoppedWhenOnlyUsingMetrics()
var activities = new List<Activity>();
var metrics = new List<MetricSnapshot>();

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);

Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
}