more tests

Author: timfish

packages/bundler-plugin-core/src/sentry/transports.ts

@@ -12,6 +12,8 @@ import type {
   TransportRequest,
   TransportRequestExecutor,
 } from "@sentry/types";
+import { join } from "node:path";
+import { appendFileSync } from "node:fs";
 
 // Estimated maximum size for reasonable standalone event
 const GZIP_THRESHOLD = 1024 * 32;
@@ -119,6 +121,12 @@ export function makeOptionallyEnabledNodeTransport(
         }
 
         if (await shouldSendTelemetry) {
+          if (process.env["SENTRY_TEST_OUT_DIR"]) {
+            const path = join(process.env["SENTRY_TEST_OUT_DIR"], "sentry-telemetry.json");
+            appendFileSync(path, JSON.stringify(request) + ",\n");
+            return { statusCode: 200 };
+          }
+
           return nodeTransport.send(request);
         }
 

packages/integration-tests-next/fixtures/rolldown/after-upload-deletion.config.ts

@@ -0,0 +1,18 @@
+import { sentryRollupPlugin } from "@sentry/rollup-plugin";
+import { defineConfig } from "rolldown";
+
+export default defineConfig({
+  input: "src/basic.js",
+  output: {
+    file: "out/after-upload-deletion/basic.js",
+    sourcemap: true,
+  },
+  plugins: [
+    sentryRollupPlugin({
+      telemetry: false,
+      sourcemaps: {
+        filesToDeleteAfterUpload: ["out/after-upload-deletion/basic.js.map"],
+      },
+    }),
+  ],
+});

packages/integration-tests-next/fixtures/rolldown/after-upload-deletion.test.ts

@@ -0,0 +1,18 @@
+import { expect } from "vitest";
+import { test } from "./utils";
+
+test(import.meta.url, ({ runRolldown, readOutputFiles, runFileInNode }) => {
+  runRolldown();
+  expect(readOutputFiles()).toMatchInlineSnapshot(`
+    {
+      "basic.js": "//#region src/basic.js
+    !function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{};e.SENTRY_RELEASE={id:"CURRENT_SHA"};var n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b699d9c1-b033-4536-aa25-233c92609b54",e._sentryDebugIdIdentifier="sentry-dbid-b699d9c1-b033-4536-aa25-233c92609b54");}catch(e){}}();console.log("hello world");
+
+    //#endregion
+    //# sourceMappingURL=basic.js.map",
+    }
+  `);
+
+  const output = runFileInNode("basic.js");
+  expect(output).toBe("hello world\n");
+});

packages/integration-tests-next/fixtures/rolldown/telemetry.config.ts

@@ -0,0 +1,10 @@
+import { sentryRollupPlugin } from "@sentry/rollup-plugin";
+import { defineConfig } from "rolldown";
+
+export default defineConfig({
+  input: "src/basic.js",
+  output: {
+    file: "out/telemetry/basic.js",
+  },
+  plugins: [sentryRollupPlugin()],
+});

packages/integration-tests-next/fixtures/rolldown/telemetry.test.ts

@@ -0,0 +1,19 @@
+import { expect } from "vitest";
+import { test } from "./utils";
+
+test(import.meta.url, ({ runRolldown, readOutputFiles, runFileInNode }) => {
+  runRolldown();
+  expect(readOutputFiles()).toMatchInlineSnapshot(`
+    {
+      "basic.js": "//#region src/basic.js
+    !function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{};e.SENTRY_RELEASE={id:"CURRENT_SHA"};var n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b699d9c1-b033-4536-aa25-233c92609b54",e._sentryDebugIdIdentifier="sentry-dbid-b699d9c1-b033-4536-aa25-233c92609b54");}catch(e){}}();console.log("hello world");
+
+    //#endregion",
+      "sentry-telemetry.json": "[{"sent_at":"TIMESTAMP","sdk":{"name":"sentry.javascript.node","version":"8.30.0"}},[[{"type":"session"},{"sid":"UUID","init":false,"started":"TIMESTAMP","timestamp":"TIMESTAMP","status":"exited","errors":0,"duration":DURATION,"attrs":{"release":"PLUGIN_VERSION","environment":"production"}}]]],
+    ",
+    }
+  `);
+
+  const output = runFileInNode("basic.js");
+  expect(output).toBe("hello world\n");
+});

packages/integration-tests-next/fixtures/rolldown/utils.ts

@@ -14,7 +14,7 @@ type TestCallback = (props: {
   readOutputFiles: () => Record<string, string>;
   runFileInNode: (file: string) => string;
   createTempDir: () => string;
-}) => void;
+}) => void | Promise<void>;
 
 export function test(url: string, callback: TestCallback) {
   const filePath = fileURLToPath(url);

packages/integration-tests-next/fixtures/utils.ts

@@ -15,7 +15,7 @@ type SourceMap = {
 export function runBundler(command: string, opt: ExecSyncOptions, outDir?: string): void {
   if (outDir) {
     // We've patched the sentry-cli helper to write the args to a file instead of actually executing the command
-    opt.env = { ...opt.env, SENTRY_CLI_FILE_APPEND: join(outDir, "sentry-cli-mock.json") };
+    opt.env = { ...opt.env, SENTRY_TEST_OUT_DIR: outDir };
   }
 
   execSync(command, { stdio: DEBUG ? "inherit" : "ignore", ...opt });
@@ -32,8 +32,9 @@ export function readAllFiles(directory: string): Record<string, string> {
     if (stat.isFile()) {
       let contents = readFileSync(fullPath, "utf-8");
       // We replace the current SHA with a placeholder to make snapshots deterministic
-      contents = contents.replaceAll(CURRENT_SHA, "CURRENT_SHA");
-      contents = contents.replaceAll(/"nodeVersion":\d+/g, `"nodeVersion":"NODE_VERSION"`);
+      contents = contents
+        .replaceAll(CURRENT_SHA, "CURRENT_SHA")
+        .replaceAll(/"nodeVersion":\d+/g, `"nodeVersion":"NODE_VERSION"`);
 
       // Normalize Windows stuff in .map paths
       if (entry.endsWith(".map")) {
@@ -47,6 +48,16 @@ export function readAllFiles(directory: string): Record<string, string> {
           /"[^"]+sentry-bundler-plugin-upload.+?",/g,
           '"sentry-bundler-plugin-upload-path",'
         );
+      } else if (entry === "sentry-telemetry.json") {
+        // Remove the temporary directory path too
+        contents = contents
+          .replace(
+            /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/g,
+            "TIMESTAMP"
+          )
+          .replace(/[a-f0-9]{32}/g, "UUID")
+          .replace(/"duration":[\d.]+/g, '"duration":DURATION')
+          .replace(/"release":"[\d.]+"/g, '"release":"PLUGIN_VERSION"');
       } else {
         // Normalize Windows line endings for cross-platform snapshots
         contents = contents.replace(/\r\n/g, "\n");

patches/@sentry+cli+2.58.5.patch

@@ -1,14 +1,15 @@
 diff --git a/node_modules/@sentry/cli/js/helper.js b/node_modules/@sentry/cli/js/helper.js
-index 56f95c9..c70f216 100644
+index 56f95c9..b397122 100644
 --- a/node_modules/@sentry/cli/js/helper.js
 +++ b/node_modules/@sentry/cli/js/helper.js
-@@ -298,6 +298,12 @@ function execute(args_1, live_1, silent_1, configFile_1) {
+@@ -298,6 +298,13 @@ function execute(args_1, live_1, silent_1, configFile_1) {
          if (config.customHeader) {
              env.CUSTOM_HEADER = config.customHeader;
          }
 +
-+        if (process.env['SENTRY_CLI_FILE_APPEND']) {
-+            fs.appendFileSync(process.env['SENTRY_CLI_FILE_APPEND'], JSON.stringify(args) + ',\n');
++        if (process.env['SENTRY_TEST_OUT_DIR']) {
++            const out = path.join(process.env['SENTRY_TEST_OUT_DIR'], 'sentry-cli-mock.json');
++            fs.appendFileSync(out, JSON.stringify(args) + ',\n');
 +            return Promise.resolve();
 +        }
 +