Don't call trace-command when the indirect tracer has already been …

…started
github · May 9, 2024 · 7a6352f · 7a6352f
1 parent 7d9b7a1
commit 7a6352f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 55 deletions.
diff --git a/lib/autobuild.js b/lib/autobuild.js
diff --git a/lib/autobuild.js.map b/lib/autobuild.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/src/autobuild.ts b/src/autobuild.ts
@@ -173,7 +173,7 @@ export async function runAutobuild(
   ) {
     await codeQL.extractUsingBuildMode(config, language);
   } else {
-    await codeQL.runAutobuild(config, language, features);
+    await codeQL.runAutobuild(config, language);
   }
   if (language === Language.go) {
     core.exportVariable(EnvVar.DID_AUTOBUILD_GOLANG, "true");

diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -910,12 +910,7 @@ test("runTool summarizes autobuilder errors", async (t) => {
   sinon.stub(safeWhich, "safeWhich").resolves("");
 
   await t.throwsAsync(
-    async () =>
-      await codeqlObject.runAutobuild(
-        stubConfig,
-        Language.java,
-        createFeatures([]),
-      ),
+    async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
     {
       instanceOf: CommandInvocationError,
       message:
@@ -943,12 +938,7 @@ test("runTool truncates long autobuilder errors", async (t) => {
   sinon.stub(safeWhich, "safeWhich").resolves("");
 
   await t.throwsAsync(
-    async () =>
-      await codeqlObject.runAutobuild(
-        stubConfig,
-        Language.java,
-        createFeatures([]),
-      ),
+    async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
     {
       instanceOf: CommandInvocationError,
       message:

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -88,11 +88,7 @@ export interface CodeQL {
   /**
    * Runs the autobuilder for the given language.
    */
-  runAutobuild(
-    config: Config,
-    language: Language,
-    features: FeatureEnablement,
-  ): Promise<void>;
+  runAutobuild(config: Config, language: Language): Promise<void>;
   /**
    * Extract code for a scanned language using 'codeql database trace-command'
    * and running the language extractor.
@@ -634,27 +630,9 @@ export async function getCodeQLForCmd(
         { stdin: externalRepositoryToken },
       );
     },
-    async runAutobuild(
-      config: Config,
-      language: Language,
-      features: FeatureEnablement,
-    ) {
+    async runAutobuild(config: Config, language: Language) {
       applyAutobuildAzurePipelinesTimeoutFix();
 
-      if (
-        await features.getValue(Feature.AutobuildDirectTracingEnabled, this)
-      ) {
-        await runTool(cmd, [
-          "database",
-          "trace-command",
-          ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
-          ...getExtractionVerbosityArguments(config.debugMode),
-          ...getExtraOptionsFromEnv(["database", "trace-command"]),
-          util.getCodeQLDatabasePath(config, language),
-        ]);
-        return;
-      }
-
       const autobuildCmd = path.join(
         await this.resolveExtractor(language),
         "tools",