Skip to content

Commit 3aae477

Browse files
ysolomchenkoysolomchenko
committed
wp
1 parent da4859c commit 3aae477

File tree

5 files changed

+16
-21
lines changed

5 files changed

+16
-21
lines changed

‎OpenTelemetry.AutoInstrumentation.sln‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.32112.339
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11222.15 d18.0
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenTelemetry.AutoInstrumentation.Native", "src\OpenTelemetry.AutoInstrumentation.Native\OpenTelemetry.AutoInstrumentation.Native.vcxproj", "{91B6272F-5780-4C94-8071-DBBA7B4F67F3}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -269,7 +269,6 @@ Global
269269
EndGlobalSection
270270
GlobalSection(ProjectConfigurationPlatforms) = postSolution
271271
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Debug|Any CPU.ActiveCfg = Debug|x64
272-
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Debug|Any CPU.Build.0 = Debug|x64
273272
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Debug|ARM64.ActiveCfg = Debug|x64
274273
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Debug|ARM64.Build.0 = Debug|x64
275274
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Debug|x64.ActiveCfg = Debug|x64
@@ -285,7 +284,6 @@ Global
285284
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Release|x86.ActiveCfg = Release|Win32
286285
{91B6272F-5780-4C94-8071-DBBA7B4F67F3}.Release|x86.Build.0 = Release|Win32
287286
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}.Debug|Any CPU.ActiveCfg = Debug|x64
288-
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}.Debug|Any CPU.Build.0 = Debug|x64
289287
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}.Debug|ARM64.ActiveCfg = Debug|x64
290288
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}.Debug|ARM64.Build.0 = Debug|x64
291289
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}.Debug|x64.ActiveCfg = Debug|x64

‎src/OpenTelemetry.AutoInstrumentation/Configurations/DelayedInitialization.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public static void AddGrpcClient(LazyInstrumentationLoader lazyInstrumentationLo
4141
}
4242

4343
[MethodImpl(MethodImplOptions.NoInlining)]
44-
public static void AddSqlClient(LazyInstrumentationLoader lazyInstrumentationLoader, PluginManager pluginManager, TracerSettings tracerSettings)
44+
public static void AddSqlClient(LazyInstrumentationLoader lazyInstrumentationLoader, PluginManager pluginManager)
4545
{
46-
_ = new SqlClientTracerInitializer(lazyInstrumentationLoader, pluginManager, tracerSettings);
46+
_ = new SqlClientTracerInitializer(lazyInstrumentationLoader, pluginManager);
4747
}
4848

4949
#if NET

‎src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static TracerProviderBuilder UseEnvironmentVariables(
3535
TracerInstrumentation.GrpcNetClient => Wrappers.AddGrpcClientInstrumentation(builder, pluginManager, lazyInstrumentationLoader, settings),
3636
TracerInstrumentation.HttpClient => Wrappers.AddHttpClientInstrumentation(builder, pluginManager, lazyInstrumentationLoader, settings),
3737
TracerInstrumentation.Npgsql => builder.AddSource("Npgsql"),
38-
TracerInstrumentation.SqlClient => Wrappers.AddSqlClientInstrumentation(builder, pluginManager, lazyInstrumentationLoader, settings),
38+
TracerInstrumentation.SqlClient => Wrappers.AddSqlClientInstrumentation(builder, pluginManager, lazyInstrumentationLoader),
3939
TracerInstrumentation.NServiceBus => builder.AddSource("NServiceBus.Core"),
4040
TracerInstrumentation.Elasticsearch => builder.AddSource("Elastic.Clients.Elasticsearch.ElasticsearchClient"),
4141
TracerInstrumentation.ElasticTransport => builder.AddSource("Elastic.Transport"),
@@ -307,9 +307,9 @@ public static TracerProviderBuilder AddAzureInstrumentation(TracerProviderBuilde
307307
}
308308

309309
[MethodImpl(MethodImplOptions.NoInlining)]
310-
public static TracerProviderBuilder AddSqlClientInstrumentation(TracerProviderBuilder builder, PluginManager pluginManager, LazyInstrumentationLoader lazyInstrumentationLoader, TracerSettings tracerSettings)
310+
public static TracerProviderBuilder AddSqlClientInstrumentation(TracerProviderBuilder builder, PluginManager pluginManager, LazyInstrumentationLoader lazyInstrumentationLoader)
311311
{
312-
DelayedInitialization.Traces.AddSqlClient(lazyInstrumentationLoader, pluginManager, tracerSettings);
312+
DelayedInitialization.Traces.AddSqlClient(lazyInstrumentationLoader, pluginManager);
313313

314314
return builder.AddSource("OpenTelemetry.Instrumentation.SqlClient");
315315
}

‎src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@ public static void Initialize()
131131

132132
if (TracerSettings.Value.TracesEnabled)
133133
{
134+
#if NETFRAMEWORK
135+
if (TracerSettings.Value.InstrumentationOptions.SqlClientNetFxIlRewriteEnabled)
136+
{
137+
NativeMethods.SetSqlClientNetFxILRewriteEnabled(true);
138+
}
139+
#endif
134140
if (GeneralSettings.Value.SetupSdk)
135141
{
136142
var builder = Sdk
@@ -505,7 +511,7 @@ private static void AddLazilyLoadedTraceInstrumentations(LazyInstrumentationLoad
505511
DelayedInitialization.Traces.AddGrpcClient(lazyInstrumentationLoader, pluginManager, tracerSettings);
506512
break;
507513
case TracerInstrumentation.SqlClient:
508-
DelayedInitialization.Traces.AddSqlClient(lazyInstrumentationLoader, pluginManager, tracerSettings);
514+
DelayedInitialization.Traces.AddSqlClient(lazyInstrumentationLoader, pluginManager);
509515
break;
510516
case TracerInstrumentation.Quartz:
511517
DelayedInitialization.Traces.AddQuartz(lazyInstrumentationLoader, pluginManager);

‎src/OpenTelemetry.AutoInstrumentation/Loading/Initializers/SqlClientTracerInitializer.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@ namespace OpenTelemetry.AutoInstrumentation.Loading.Initializers;
99
internal sealed class SqlClientTracerInitializer : SqlClientInitializer
1010
{
1111
private readonly PluginManager _pluginManager;
12-
#if NETFRAMEWORK
13-
private readonly TracerSettings _tracerSettings;
14-
#endif
12+
1513
private int _initialized;
1614

17-
public SqlClientTracerInitializer(LazyInstrumentationLoader lazyInstrumentationLoader, PluginManager pluginManager, TracerSettings tracerSettings)
15+
public SqlClientTracerInitializer(LazyInstrumentationLoader lazyInstrumentationLoader, PluginManager pluginManager)
1816
: base(lazyInstrumentationLoader, nameof(SqlClientTracerInitializer))
1917
{
2018
_pluginManager = pluginManager;
21-
#if NETFRAMEWORK
22-
_tracerSettings = tracerSettings;
23-
#endif
2419
}
2520

2621
protected override void InitializeOnFirstCall(ILifespanManager lifespanManager)
@@ -31,10 +26,6 @@ protected override void InitializeOnFirstCall(ILifespanManager lifespanManager)
3126
return;
3227
}
3328

34-
#if NETFRAMEWORK
35-
NativeMethods.SetSqlClientNetFxILRewriteEnabled(_tracerSettings.InstrumentationOptions.SqlClientNetFxIlRewriteEnabled);
36-
#endif
37-
3829
var instrumentationType = Type.GetType("OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentation, OpenTelemetry.Instrumentation.SqlClient")!;
3930
var instanceField = instrumentationType?.GetField("Instance");
4031
var instance = instanceField?.GetValue(null);

0 commit comments

Comments
 (0)