Move supabaseIntegration to @sentry/core

onurtemizkan · onurtemizkan · commit ebda873571e3 · 2025-03-27T19:57:29.000Z
diff --git a/.craft.yml b/.craft.yml
@@ -32,6 +32,7 @@ targets:
   - name: npm
     id: '@sentry-internal/replay-canvas'
     includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
+
   ## 2. Browser & Node SDKs
   - name: npm
     id: '@sentry/browser'
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js
@@ -0,0 +1,41 @@
+import * as Sentry from '@sentry/browser';
+import { createClient } from '@supabase/supabase-js';
+
+
+window.Sentry = Sentry;
+
+const supabase = createClient(
+  'https://test.supabase.co',
+  'test-key'
+);
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [
+    new Sentry.BrowserTracing({
+      tracingOrigins: ['localhost', 'my.supabase.co'],
+    }),
+    Sentry.supabaseIntegration(supabase)
+  ],
+  tracesSampleRate: 1.0,
+});
+
+// Simulate database operations
+async function performDatabaseOperations() {
+  try {
+    await supabase
+      .from('todos')
+      .insert([{ title: 'Test Todo' }]);
+
+    await supabase
+      .from('todos')
+      .select('*');
+
+    // Trigger an error to capture the breadcrumbs
+    throw new Error('Test Error');
+  } catch (error) {
+    Sentry.captureException(error);
+  }
+}
+
+performDatabaseOperations();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts
@@ -0,0 +1,53 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/core';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+
+describe('Supabase Integration', () => {
+  sentryTest('should capture Supabase database operation breadcrumbs', async ({ getLocalTestUrl, page }) => {
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+
+    expect(eventData.breadcrumbs).toBeDefined();
+    expect(eventData.breadcrumbs).toContainEqual({
+      timestamp: expect.any(Number),
+      type: 'supabase',
+      category: 'db.insert',
+      message: 'from(todos)',
+      data: expect.any(Object),
+    });
+  });
+
+  sentryTest('should capture multiple Supabase operations in sequence', async ({ getLocalTestUrl, page }) => {
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const events = await getMultipleSentryEnvelopeRequests<Event>(page, 2, { url });
+
+    expect(events).toHaveLength(2);
+
+    events.forEach(event => {
+      expect(
+        event.breadcrumbs?.some(
+          breadcrumb => breadcrumb.type === 'supabase' && breadcrumb?.category?.startsWith('db.'),
+        ),
+      ).toBe(true);
+    });
+  });
+
+  sentryTest('should include correct data payload in Supabase breadcrumbs', async ({ getLocalTestUrl, page }) => {
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+
+    const supaBreadcrumb = eventData.breadcrumbs?.find(b => b.type === 'supabase');
+
+    expect(supaBreadcrumb).toBeDefined();
+    expect(supaBreadcrumb?.data).toMatchObject({
+      table: expect.any(String),
+      operation: expect.any(String),
+      timestamp: expect.any(Number),
+    });
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/supabase-nextjs/.eslintrc.json b/dev-packages/e2e-tests/test-applications/supabase-nextjs/.eslintrc.json
diff --git a/dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAdmin.ts b/dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAdmin.ts
@@ -1,6 +1,5 @@
 import { createClient } from '@supabase/supabase-js';
 import * as Sentry from '@sentry/nextjs';
-import { supabaseIntegration } from '@sentry/supabase';
 
 // These are the default development keys for a local Supabase instance
 const NEXT_PUBLIC_SUPABASE_URL = 'http://localhost:54321';
@@ -16,7 +15,7 @@ export const supabase = createClient(NEXT_PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_
 });
 
 Sentry.addIntegration(
-  supabaseIntegration({
+  Sentry.supabaseIntegration({
     supabaseClient: supabase,
   }),
 );
diff --git a/dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAnon.ts b/dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAnon.ts
@@ -1,6 +1,5 @@
 import { createClient } from '@supabase/supabase-js';
 import * as Sentry from '@sentry/nextjs';
-import { supabaseIntegration } from '@sentry/supabase';
 
 // These are the default development keys for a local Supabase instance
 const NEXT_PUBLIC_SUPABASE_URL = 'http://localhost:54321';
@@ -10,7 +9,7 @@ const NEXT_PUBLIC_SUPABASE_ANON_KEY =
 export const supabase = createClient(NEXT_PUBLIC_SUPABASE_URL, NEXT_PUBLIC_SUPABASE_ANON_KEY);
 
 Sentry.addIntegration(
-  supabaseIntegration({
+  Sentry.supabaseIntegration({
     supabaseClient: supabase,
   }),
 );
diff --git a/dev-packages/e2e-tests/test-applications/supabase-nextjs/package.json b/dev-packages/e2e-tests/test-applications/supabase-nextjs/package.json
@@ -8,22 +8,21 @@
     "start": "next start",
     "clean": "npx rimraf node_modules pnpm-lock.yaml .next",
     "start-local-supabase": "supabase init --force --workdir . && supabase start -o env",
-    "test:prod": "TEST_ENV=production playwright test",
+    "test:prod": "TEST_ENV=production playwright test --ui",
     "test:build": "pnpm install && pnpm start-local-supabase && pnpm build",
     "test:assert": "pnpm test:prod"
   },
   "dependencies": {
-    "@next/font": "14.2.15",
+    "@next/font": "14.2.25",
     "@sentry/nextjs": "latest || *",
-    "@sentry/supabase": "latest || *",
     "@supabase/auth-helpers-react": "0.5.0",
     "@supabase/auth-ui-react": "0.4.7",
     "@supabase/supabase-js": "2.49.1",
     "@types/node": "18.14.0",
     "@types/react": "18.0.28",
     "@types/react-dom": "18.0.11",
     "concurrently": "7.6.0",
-    "next": "14.2.15",
+    "next": "14.2.25",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "supabase": "2.19.7",
@@ -33,7 +32,7 @@
     "@playwright/test": "~1.50.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "eslint": "8.34.0",
-    "eslint-config-next": "14.2.15"
+    "eslint-config-next": "14.2.25"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/e2e-tests/test-applications/supabase-nextjs/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/supabase-nextjs/playwright.config.mjs
@@ -1,7 +1,7 @@
 import { getPlaywrightConfig } from '@sentry-internal/test-utils';
 
 const config = getPlaywrightConfig({
-  startCommand: `pnpm start`,
+  startCommand: `pnpm dev`,
   port: 3030,
 });
 
diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -158,12 +158,6 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/supabase':
-    access: $all
-    publish: $all
-    unpublish: $all
-    # proxy: npmjs # Don't proxy for E2E tests!
-
   '@sentry/svelte':
     access: $all
     publish: $all
diff --git a/package.json b/package.json
@@ -79,7 +79,6 @@
     "packages/replay-worker",
     "packages/solid",
     "packages/solidstart",
-    "packages/supabase",
     "packages/svelte",
     "packages/sveltekit",
     "packages/tanstackstart",
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
@@ -125,6 +125,7 @@ export {
   withIsolationScope,
   withMonitor,
   withScope,
+  supabaseIntegration,
   zodErrorsIntegration,
   profiler,
   logger,
diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts
@@ -109,6 +109,7 @@ export {
   spanToBaggageHeader,
   trpcMiddleware,
   updateSpanName,
+  supabaseIntegration,
   zodErrorsIntegration,
   profiler,
   amqplibIntegration,
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
@@ -128,6 +128,7 @@ export {
   spanToBaggageHeader,
   trpcMiddleware,
   updateSpanName,
+  supabaseIntegration,
   zodErrorsIntegration,
   profiler,
   amqplibIntegration,
diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
@@ -75,6 +75,7 @@ export {
   rewriteFramesIntegration,
   captureConsoleIntegration,
   moduleMetadataIntegration,
+  supabaseIntegration,
   zodErrorsIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -106,6 +106,7 @@ export { captureConsoleIntegration } from './integrations/captureconsole';
 export { dedupeIntegration } from './integrations/dedupe';
 export { extraErrorDataIntegration } from './integrations/extraerrordata';
 export { rewriteFramesIntegration } from './integrations/rewriteframes';
+export { supabaseIntegration } from './integrations/supabase';
 export { zodErrorsIntegration } from './integrations/zoderrors';
 export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
 export { profiler } from './profiling';
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
@@ -71,6 +71,7 @@ export {
   dedupeIntegration,
   extraErrorDataIntegration,
   rewriteFramesIntegration,
+  supabaseIntegration,
   zodErrorsIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
@@ -108,6 +108,7 @@ export {
   spanToBaggageHeader,
   trpcMiddleware,
   updateSpanName,
+  supabaseIntegration,
   zodErrorsIntegration,
   profiler,
   amqplibIntegration,
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -128,7 +128,7 @@ export {
   spanToBaggageHeader,
   trpcMiddleware,
   updateSpanName,
-  supabseIntegration,
+  supabaseIntegration,
   zodErrorsIntegration,
   profiler,
 } from '@sentry/core';
diff --git a/packages/remix/src/cloudflare/index.ts b/packages/remix/src/cloudflare/index.ts
@@ -95,6 +95,7 @@ export {
   rewriteFramesIntegration,
   captureConsoleIntegration,
   moduleMetadataIntegration,
+  supabaseIntegration,
   zodErrorsIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
diff --git a/packages/remix/src/server/index.ts b/packages/remix/src/server/index.ts
@@ -111,6 +111,7 @@ export {
   withIsolationScope,
   withMonitor,
   withScope,
+  supabaseIntegration,
   zodErrorsIntegration,
   logger,
 } from '@sentry/node';
diff --git a/packages/solidstart/src/server/index.ts b/packages/solidstart/src/server/index.ts
@@ -114,6 +114,7 @@ export {
   withIsolationScope,
   withMonitor,
   withScope,
+  supabaseIntegration,
   zodErrorsIntegration,
   logger,
 } from '@sentry/node';
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
@@ -116,6 +116,7 @@ export {
   withIsolationScope,
   withMonitor,
   withScope,
+  supabaseIntegration,
   zodErrorsIntegration,
   logger,
 } from '@sentry/node';
diff --git a/packages/sveltekit/src/worker/index.ts b/packages/sveltekit/src/worker/index.ts
@@ -78,6 +78,7 @@ export {
   withIsolationScope,
   withMonitor,
   withScope,
+  supabaseIntegration,
   zodErrorsIntegration,
 } from '@sentry/cloudflare';
 
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
@@ -75,6 +75,7 @@ export {
   rewriteFramesIntegration,
   captureConsoleIntegration,
   moduleMetadataIntegration,
+  supabaseIntegration,
   zodErrorsIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
