Revert unrelated Astro changes, add ESM test for sql.unsafe()

Author: onurtemizkan

dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs

@@ -6,6 +6,7 @@ const dsn = process.env.E2E_TEST_DSN;
 
 // https://astro.build/config
 export default defineConfig({
+  output: 'hybrid',
   adapter: cloudflare({
     imageService: 'passthrough',
   }),

dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

@@ -17,7 +17,7 @@
     "test:assert": "pnpm -v"
   },
   "dependencies": {
-    "@astrojs/cloudflare": "12.6.11",
+    "@astrojs/cloudflare": "8.1.0",
     "@sentry/astro": "latest || *",
     "astro": "5.15.9"
   },

dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario-unsafe.mjs

@@ -0,0 +1,37 @@
+import * as Sentry from '@sentry/node';
+import postgres from 'postgres';
+
+// Stop the process from exiting before the transaction is sent
+setInterval(() => {}, 1000);
+
+// Test with plain object options
+const sql = postgres({ port: 5444, user: 'test', password: 'test', database: 'test_db' });
+
+async function run() {
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async () => {
+      try {
+        // Test sql.unsafe() - this was not being instrumented before the fix
+        await sql.unsafe('CREATE TABLE "User" ("id" SERIAL NOT NULL, "email" TEXT NOT NULL, PRIMARY KEY ("id"))');
+
+        await sql.unsafe('INSERT INTO "User" ("email") VALUES ($1)', ['test@example.com']);
+
+        await sql.unsafe('SELECT * FROM "User" WHERE "email" = $1', ['test@example.com']);
+
+        await sql.unsafe('DROP TABLE "User"');
+
+        // This will be captured as an error as the table no longer exists
+        await sql.unsafe('SELECT * FROM "User"');
+      } finally {
+        await sql.end();
+      }
+    },
+  );
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+run();

dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts

@@ -625,4 +625,23 @@ describe('postgresjs auto instrumentation', () => {
       .start()
       .completed();
   });
+
+  test('should instrument sql.unsafe() queries (ESM)', { timeout: 90_000 }, async () => {
+    const EXPECTED_TRANSACTION = {
+      transaction: 'Test Transaction',
+      spans: expect.arrayContaining([
+        createDbSpanMatcher('CREATE TABLE'),
+        createDbSpanMatcher('INSERT'),
+        createDbSpanMatcher('SELECT'),
+        createDbSpanMatcher('DROP TABLE'),
+      ]),
+    };
+
+    await createRunner(__dirname, 'scenario-unsafe.mjs')
+      .withFlags('--import', `${__dirname}/instrument.mjs`)
+      .withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['port 5432'] })
+      .expect({ transaction: EXPECTED_TRANSACTION })
+      .start()
+      .completed();
+  });
 });