Skip to content

Commit 5928bbe

Browse files
committed
move configuration to separate file
1 parent 132e7be commit 5928bbe

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
<ClInclude Include="calltarget_tokens.h" />
175175
<ClInclude Include="class_factory.h" />
176176
<ClInclude Include="com_ptr.h" />
177+
<ClInclude Include="configuration.h" />
177178
<ClInclude Include="continuous_profiler_clr_helpers.h" />
178179
<ClInclude Include="continuous_profiler.h" />
179180
<ClInclude Include="cor_profiler.h" />
@@ -220,6 +221,7 @@
220221
<ClCompile Include="calltarget_tokens.cpp" />
221222
<ClCompile Include="class_factory.cpp" />
222223
<ClCompile Include="clr_helpers.cpp" />
224+
<ClCompile Include="configuration.cpp" />
223225
<ClCompile Include="continuous_profiler_clr_helpers.cpp" />
224226
<ClCompile Include="continuous_profiler.cpp" />
225227
<ClCompile Include="cor_profiler_base.cpp" />
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#include "configuration.h"
2+
3+
namespace trace
4+
{
5+
6+
bool sqlclient_netfx_ilrewrite_enabled = false;
7+
8+
bool IsSqlClientNetFxILRewriteEnabled()
9+
{
10+
return sqlclient_netfx_ilrewrite_enabled;
11+
}
12+
13+
void SetSqlClientNetFxILRewriteEnabled(bool enabled)
14+
{
15+
sqlclient_netfx_ilrewrite_enabled = enabled;
16+
}
17+
18+
} // namespace trace
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace trace
2+
{
3+
4+
bool IsSqlClientNetFxILRewriteEnabled();
5+
void SetSqlClientNetFxILRewriteEnabled(bool enabled);
6+
7+
} // namespace trace

src/OpenTelemetry.AutoInstrumentation.Native/cor_profiler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "dllmain.h"
1313
#include "environment_variables.h"
1414
#include "environment_variables_util.h"
15+
#include "configuration.h"
1516
#include "il_rewriter.h"
1617
#include "il_rewriter_wrapper.h"
1718
#include "stub_generator.h"

src/OpenTelemetry.AutoInstrumentation.Native/environment_variables_util.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
namespace trace
99
{
1010

11-
bool sqlclient_netfx_ilrewrite_enabled = false;
12-
1311
bool DisableOptimizations()
1412
{
1513
CheckIfTrue(GetEnvironmentValue(environment::clr_disable_optimizations));
@@ -45,14 +43,4 @@ bool IsNetFxAssemblyRedirectionEnabled()
4543
ToBooleanWithDefault(GetEnvironmentValue(environment::netfx_assembly_redirection_enabled), true);
4644
}
4745

48-
bool IsSqlClientNetFxILRewriteEnabled()
49-
{
50-
return sqlclient_netfx_ilrewrite_enabled;
51-
}
52-
53-
void SetSqlClientNetFxILRewriteEnabled(bool enabled)
54-
{
55-
sqlclient_netfx_ilrewrite_enabled = enabled;
56-
}
57-
5846
} // namespace trace

src/OpenTelemetry.AutoInstrumentation.Native/environment_variables_util.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ bool IsDumpILRewriteEnabled();
5050
bool IsAzureAppServices();
5151
bool IsFailFastEnabled();
5252
bool IsNetFxAssemblyRedirectionEnabled();
53-
bool IsSqlClientNetFxILRewriteEnabled();
54-
void SetSqlClientNetFxILRewriteEnabled(bool enabled);
5553

5654
} // namespace trace
5755

src/OpenTelemetry.AutoInstrumentation.Native/interop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//---------------------------------------------------------------------------------------
1111

1212
#include "cor_profiler.h"
13-
#include "environment_variables_util.h"
13+
#include "configuration.h"
1414

1515
#ifndef _WIN32
1616
#include <dlfcn.h>

0 commit comments

Comments
 (0)