github
diff --git a/‎lib/analyze.js
Lines changed: 10 additions & 2 deletions b/‎lib/analyze.js
Lines changed: 10 additions & 2 deletions
diff --git a/‎lib/analyze.js.map
Lines changed: 1 addition & 1 deletion b/‎lib/analyze.js.map
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/tracer-config.js
Lines changed: 25 additions & 1 deletion b/‎lib/tracer-config.js
Lines changed: 25 additions & 1 deletion
diff --git a/‎lib/tracer-config.js.map
Lines changed: 1 addition & 1 deletion b/‎lib/tracer-config.js.map
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/analyze.ts
Lines changed: 14 additions & 3 deletions b/‎src/analyze.ts
Lines changed: 14 additions & 3 deletions
diff --git a/‎src/tracer-config.ts
Lines changed: 33 additions & 0 deletions b/‎src/tracer-config.ts
Lines changed: 33 additions & 0 deletions
@@ -5,12 +5,17 @@ import * as toolrunner from "@actions/exec/lib/toolrunner";
 import * as yaml from "js-yaml";
 
 import * as analysisPaths from "./analysis-paths";
-import { CODEQL_VERSION_COUNTS_LINES, getCodeQL } from "./codeql";
+import {
+  CODEQL_VERSION_COUNTS_LINES,
+  CODEQL_VERSION_NEW_TRACING,
+  getCodeQL,
+} from "./codeql";
 import * as configUtils from "./config-utils";
 import { countLoc } from "./count-loc";
 import { isScannedLanguage, Language } from "./languages";
 import { Logger } from "./logging";
 import * as sharedEnv from "./shared-environment";
+import { endTracingForCluster } from "./tracer-config";
 import * as util from "./util";
 
 export class CodeQLAnalysisError extends Error {
@@ -409,8 +414,14 @@ export async function runFinalize(
   config: configUtils.Config,
   logger: Logger
 ) {
-  // Delete the tracer config env var to avoid tracing ourselves
-  delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];
+  const codeql = await getCodeQL(config.codeQLCmd);
+  if (await util.codeQlVersionAbove(codeql, CODEQL_VERSION_NEW_TRACING)) {
+    // Delete variables as specified by the end-tracing script
+    await endTracingForCluster(config);
+  } else {
+    // Delete the tracer config env var to avoid tracing ourselves
+    delete process.env[sharedEnv.ODASA_TRACER_CONFIGURATION];
+  }
 
   fs.mkdirSync(outputDir, { recursive: true });
 
 
@@ -20,6 +20,39 @@ const CRITICAL_TRACER_VARS = new Set([
   "SEMMLE_JAVA_TOOL_OPTIONS",
 ]);
 
+export async function endTracingForCluster(
+  config: configUtils.Config
+): Promise<void> {
+  // If there are no traced languages, we don't need to do anything.
+  if (!config.languages.some(isTracedLanguage)) return;
+
+  const envVariablesFile = path.resolve(
+    config.dbLocation,
+    "temp/tracingEnvironment/end-tracing.json"
+  );
+  if (!fs.existsSync(envVariablesFile)) {
+    throw new Error(
+      `Environment file for ending tracing not found: ${envVariablesFile}`
+    );
+  }
+  try {
+    const endTracingEnvVariables: Map<string, string | null> = JSON.parse(
+      fs.readFileSync(envVariablesFile, "utf8")
+    );
+    for (const [key, value] of Object.entries(endTracingEnvVariables)) {
+      if (value !== null) {
+        process.env[key] = value;
+      } else {
+        delete process.env[key];
+      }
+    }
+  } catch (e) {
+    throw new Error(
+      `Failed to parse file containing end tracing environment variables: ${e}`
+    );
+  }
+}
+
 export async function getTracerConfigForCluster(
   config: configUtils.Config
 ): Promise<TracerConfig> {