deduplicate integrations

Author: s1gr1d

packages/hono/src/cloudflare/middleware.ts

@@ -1,5 +1,12 @@
 import { withSentry } from '@sentry/cloudflare';
-import { applySdkMetadata, type BaseTransportOptions, debug, type Integration, type Options } from '@sentry/core';
+import {
+  applySdkMetadata,
+  type BaseTransportOptions,
+  debug,
+  getIntegrationsToSetup,
+  type Integration,
+  type Options,
+} from '@sentry/core';
 import type { Context, Hono, MiddlewareHandler } from 'hono';
 import { requestHandler, responseHandler } from '../shared/middlewareHandlers';
 
@@ -20,10 +27,14 @@ export const sentry = (app: Hono, options: HonoOptions | undefined = {}): Middle
   withSentry(
     () => ({
       ...options,
-      // Always filter out the Hono integration from user-provided integrations (or when nothing is specified).
-      // The Hono integration is already set up by withSentry, so adding it again would cause double-capturing (and non-parametrized URLs).
+      // Always filter out the Hono integration from defaults and user integrations.
+      // The Hono integration is already set up by withSentry, so adding it again would cause capturing too early (in Cloudflare SDK) and non-parametrized URLs.
       integrations: Array.isArray(userIntegrations)
-        ? defaults => [...defaults.filter(filterHonoIntegration), ...userIntegrations.filter(filterHonoIntegration)]
+        ? defaults =>
+            getIntegrationsToSetup({
+              defaultIntegrations: defaults.filter(filterHonoIntegration),
+              integrations: userIntegrations.filter(filterHonoIntegration),
+            })
         : typeof userIntegrations === 'function'
           ? defaults => userIntegrations(defaults).filter(filterHonoIntegration)
           : defaults => defaults.filter(filterHonoIntegration),

packages/hono/test/cloudflare/middleware.test.ts

@@ -143,18 +143,39 @@ describe('Hono Cloudflare Middleware', () => {
       const app = new Hono();
       sentry(app, { integrations: input });
 
-      const integrationsFn = getIntegrationsResult() as (defaults: SentryCore.Integration[]) => SentryCore.Integration[];
+      const integrationsFn = getIntegrationsResult() as (
+        defaults: SentryCore.Integration[],
+      ) => SentryCore.Integration[];
       expect(integrationsFn([])).toEqual(expected);
     });
 
     it('filters Hono from defaults when user provides an array', () => {
       const app = new Hono();
       sentry(app, { integrations: [otherIntegration] });
 
-      const integrationsFn = getIntegrationsResult() as (defaults: SentryCore.Integration[]) => SentryCore.Integration[];
-      // Simulates getIntegrationsToSetup: defaults (from Cloudflare) include Hono; result must exclude it
+      const integrationsFn = getIntegrationsResult() as (
+        defaults: SentryCore.Integration[],
+      ) => SentryCore.Integration[];
+      // Defaults (from Cloudflare) include Hono; result must exclude it and deduplicate (user + defaults overlap)
       const defaultsWithHono = [honoIntegration, otherIntegration];
-      expect(integrationsFn(defaultsWithHono)).toEqual([otherIntegration, otherIntegration]);
+      expect(integrationsFn(defaultsWithHono)).toEqual([otherIntegration]);
+    });
+
+    it('deduplicates when user integrations overlap with defaults (by name)', () => {
+      const app = new Hono();
+      const duplicateIntegration = { name: 'Other' } as SentryCore.Integration;
+      sentry(app, { integrations: [duplicateIntegration] });
+
+      const integrationsFn = getIntegrationsResult() as (
+        defaults: SentryCore.Integration[],
+      ) => SentryCore.Integration[];
+      const defaultsWithOverlap = [
+        honoIntegration,
+        otherIntegration, // same name as duplicateIntegration
+      ];
+      const result = integrationsFn(defaultsWithOverlap);
+      expect(result).toHaveLength(1);
+      expect(result[0]?.name).toBe('Other');
     });
 
     it('filters Hono integration out of a function result', () => {