Unconditionally enable autobuild direct tracing feature

github · May 13, 2024 · c97b532 · c97b532
1 parent 08487db
commit c97b532
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 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/tracer-config.js b/lib/tracer-config.js
diff --git a/lib/tracer-config.js.map b/lib/tracer-config.js.map
diff --git a/src/autobuild.ts b/src/autobuild.ts
@@ -159,18 +159,15 @@ export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
 export async function runAutobuild(
   config: configUtils.Config,
   language: Language,
-  features: FeatureEnablement,
+  _features: FeatureEnablement,
   logger: Logger,
 ) {
   logger.startGroup(`Attempting to automatically build ${language} code`);
   const codeQL = await getCodeQL(config.codeQLCmd);
   if (language === Language.cpp) {
     await setupCppAutobuild(codeQL, logger);
   }
-  if (
-    config.buildMode &&
-    (await features.getValue(Feature.AutobuildDirectTracing, codeQL))
-  ) {
+  if (config.buildMode) {
     await codeQL.extractUsingBuildMode(config, language);
   } else {
     await codeQL.runAutobuild(config, language);

diff --git a/src/tracer-config.ts b/src/tracer-config.ts
@@ -3,7 +3,7 @@ import * as path from "path";
 
 import { type CodeQL } from "./codeql";
 import { type Config } from "./config-utils";
-import { Feature, FeatureEnablement } from "./feature-flags";
+import { FeatureEnablement } from "./feature-flags";
 import { isTracedLanguage } from "./languages";
 import { Logger } from "./logging";
 import { ToolsFeature } from "./tools-features";
@@ -14,14 +14,13 @@ export type TracerConfig = {
 };
 
 export async function shouldEnableIndirectTracing(
-  codeql: CodeQL,
+  _codeql: CodeQL,
   config: Config,
-  features: FeatureEnablement,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _features: FeatureEnablement,
 ): Promise<boolean> {
   return (
-    (!config.buildMode ||
-      config.buildMode === BuildMode.Manual ||
-      !(await features.getValue(Feature.AutobuildDirectTracing, codeql))) &&
+    (!config.buildMode || config.buildMode === BuildMode.Manual) &&
     config.languages.some((l) => isTracedLanguage(l))
   );
 }