Skip to content

Commit bc6a74b

Browse files
committed
C#: Disable CLR tracer
Also remove old tracer configs, as we now use the Lua tracer.
1 parent 935def7 commit bc6a74b

File tree

4 files changed

+0
-21
lines changed

4 files changed

+0
-21
lines changed

csharp/codeql-extractor.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ version: 1.22.1
44
column_kind: "utf16"
55
extra_env_vars:
66
DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
7-
COR_ENABLE_PROFILING: "1"
8-
COR_PROFILER: "{A3C70A64-7D41-4A94-A3F6-FD47D9259997}"
9-
COR_PROFILER_PATH_64: "${env.CODEQL_EXTRACTOR_CSHARP_ROOT}/tools/${env.CODEQL_PLATFORM}/clrtracer64${env.CODEQL_PLATFORM_DLL_EXTENSION}"
10-
CORECLR_ENABLE_PROFILING: "1"
11-
CORECLR_PROFILER: "{A3C70A64-7D41-4A94-A3F6-FD47D9259997}"
12-
CORECLR_PROFILER_PATH_64: "${env.CODEQL_EXTRACTOR_CSHARP_ROOT}/tools/${env.CODEQL_PLATFORM}/clrtracer64${env.CODEQL_PLATFORM_DLL_EXTENSION}"
137
file_types:
148
- name: cs
159
display_name: C# sources

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ public static ExitCode Run(string[] args)
9999

100100
using var logger = MakeLogger(options.Verbosity, options.Console);
101101

102-
if (Environment.GetEnvironmentVariable("SEMMLE_CLRTRACER") == "1" && !options.ClrTracer)
103-
{
104-
logger.Log(Severity.Info, "Skipping extraction since already extracted from the CLR tracer");
105-
return ExitCode.Ok;
106-
}
107-
108102
var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
109103
var pathTransformer = new PathTransformer(canonicalPathCache);
110104

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Options.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ public sealed class Options : CommonOptions
2727
/// </summary>
2828
public IList<string> CompilerArguments { get; } = new List<string>();
2929

30-
/// <summary>
31-
/// Holds if the extractor was launched from the CLR tracer.
32-
/// </summary>
33-
public bool ClrTracer { get; private set; } = false;
34-
3530
/// <summary>
3631
/// Holds if assembly information should be prefixed to TRAP labels.
3732
/// </summary>
@@ -87,9 +82,6 @@ public override bool HandleFlag(string flag, bool value)
8782
{
8883
switch (flag)
8984
{
90-
case "clrtracer":
91-
ClrTracer = value;
92-
return true;
9385
case "assemblysensitivetrap":
9486
AssemblySensitiveTrap = value;
9587
return true;

csharp/extractor/Semmle.Extraction.Tests/Options.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public void DefaultOptions()
2929
Assert.True(options.Threads >= 1);
3030
Assert.Equal(Verbosity.Info, options.Verbosity);
3131
Assert.False(options.Console);
32-
Assert.False(options.ClrTracer);
3332
Assert.False(options.PDB);
3433
Assert.False(options.Fast);
3534
Assert.Equal(TrapWriter.CompressionMode.Brotli, options.TrapCompression);

0 commit comments

Comments
 (0)