Fix BetterSQLite3 tests, cleanup

Author: timokoessler

library/agent/hooks/instrumentation/injectedFunctions.ts

@@ -2,7 +2,6 @@ import { getInstance } from "../../AgentSingleton";
 import { getContext } from "../../Context";
 import { inspectArgs } from "../wrapExport";
 import { getPackageCallbackInfo } from "./instructions";
-import { getBuiltinModuleWithoutPatching } from "./processGetBuiltin";
 
 export function __instrumentInspectArgs(
   id: string,
@@ -118,7 +117,3 @@ export function __instrumentModifyReturnValue(
 
   return returnValue;
 }
-
-export function __getBuiltinModuleWithoutPatching(id: string) {
-  return getBuiltinModuleWithoutPatching(id);
-}

library/agent/hooks/instrumentation/instructions.test.ts

@@ -178,6 +178,12 @@ t.test("it works using injected functions", async (t) => {
     [],
     this
   );
+  __instrumentModifyReturnValue(
+    "foo.bar.js.bazABCDEF.MethodDefinition.^1.0.0",
+    [1, 2, 3],
+    "42",
+    this
+  );
   t.equal(pkgInspectArgsCalled, false);
   t.equal(pkgModifyArgsCalled, false);
   t.equal(pkgModifyReturnValueCalled, false);
@@ -209,6 +215,12 @@ t.test("it works using injected functions", async (t) => {
     [],
     this
   );
+  __instrumentModifyReturnValue(
+    "foo.bar.js.bazABCDEF.MethodDefinition.^1.0.0",
+    [1, 2, 3],
+    "42",
+    this
+  );
   t.equal(pkgInspectArgsCalled, false);
   t.equal(pkgModifyArgsCalled, false);
   t.equal(pkgModifyReturnValueCalled, false);

library/helpers/createTestAgent.ts

@@ -17,7 +17,6 @@ export function createTestAgent(opts?: {
   token?: Token;
   serverless?: string;
   suppressConsoleLog?: boolean;
-  newInstrumentation?: boolean;
 }) {
   if (opts?.suppressConsoleLog ?? true) {
     wrap(console, "log", function log() {
@@ -30,8 +29,7 @@ export function createTestAgent(opts?: {
     opts?.logger ?? new LoggerNoop(),
     opts?.api ?? new ReportingAPIForTesting(),
     opts?.token, // Defaults to undefined
-    opts?.serverless, // Defaults to undefined
-    opts?.newInstrumentation ?? false
+    opts?.serverless // Defaults to undefined
   );
 
   setInstance(agent);

library/sinks/BetterSQLite3.test.ts

@@ -110,14 +110,16 @@ t.test("it detects SQL injections", async (t) => {
     });
 
     await runWithContext(dangerousPathContext, async () => {
-      const error = t.throws(() => db.backup("/tmp/insecure"));
-      t.ok(error instanceof Error);
-      if (error instanceof Error) {
+      try {
+        await db.backup("/tmp/insecure");
+        t.fail("Expected an error");
+      } catch (error: any) {
         t.same(
           error.message,
           "Zen has blocked a path traversal attack: better-sqlite3.backup(...) originating from body.myTitle"
         );
       }
+
       await db.backup("/tmp/sqlite-test-secure");
     });