Merge pull request #9966 from hvitved/csharp/no-clr-tracer

C#: Disable CLR tracer

Author: hvitved

csharp/codeql-extractor.yml

@@ -4,12 +4,6 @@ version: 1.22.1
 column_kind: "utf16"
 extra_env_vars:
   DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
-  COR_ENABLE_PROFILING: "1"
-  COR_PROFILER: "{A3C70A64-7D41-4A94-A3F6-FD47D9259997}"
-  COR_PROFILER_PATH_64: "${env.CODEQL_EXTRACTOR_CSHARP_ROOT}/tools/${env.CODEQL_PLATFORM}/clrtracer64${env.CODEQL_PLATFORM_DLL_EXTENSION}"
-  CORECLR_ENABLE_PROFILING: "1"
-  CORECLR_PROFILER: "{A3C70A64-7D41-4A94-A3F6-FD47D9259997}"
-  CORECLR_PROFILER_PATH_64: "${env.CODEQL_EXTRACTOR_CSHARP_ROOT}/tools/${env.CODEQL_PLATFORM}/clrtracer64${env.CODEQL_PLATFORM_DLL_EXTENSION}"
 file_types:
   - name: cs
     display_name: C# sources

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

@@ -99,12 +99,6 @@ public static ExitCode Run(string[] args)
 
             using var logger = MakeLogger(options.Verbosity, options.Console);
 
-            if (Environment.GetEnvironmentVariable("SEMMLE_CLRTRACER") == "1" && !options.ClrTracer)
-            {
-                logger.Log(Severity.Info, "Skipping extraction since already extracted from the CLR tracer");
-                return ExitCode.Ok;
-            }
-
             var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
             var pathTransformer = new PathTransformer(canonicalPathCache);
 

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

@@ -27,11 +27,6 @@ public sealed class Options : CommonOptions
         /// </summary>
         public IList<string> CompilerArguments { get; } = new List<string>();
 
-        /// <summary>
-        /// Holds if the extractor was launched from the CLR tracer.
-        /// </summary>
-        public bool ClrTracer { get; private set; } = false;
-
         /// <summary>
         /// Holds if assembly information should be prefixed to TRAP labels.
         /// </summary>
@@ -87,9 +82,6 @@ public override bool HandleFlag(string flag, bool value)
         {
             switch (flag)
             {
-                case "clrtracer":
-                    ClrTracer = value;
-                    return true;
                 case "assemblysensitivetrap":
                     AssemblySensitiveTrap = value;
                     return true;

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

@@ -29,7 +29,6 @@ public void DefaultOptions()
             Assert.True(options.Threads >= 1);
             Assert.Equal(Verbosity.Info, options.Verbosity);
             Assert.False(options.Console);
-            Assert.False(options.ClrTracer);
             Assert.False(options.PDB);
             Assert.False(options.Fast);
             Assert.Equal(TrapWriter.CompressionMode.Brotli, options.TrapCompression);