Merge remote-tracking branch 'upstream/develop' into timfish/feat/orchestrion-stats

Author: timfish

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @dobladov. Thank you for your contribution!
+Work in this release was contributed by @dobladov and @PeterWadie. Thank you for your contributions!
 
 ## 10.65.0
 

packages/astro/test/server/middleware.test.ts

@@ -66,6 +66,7 @@ describe('sentryMiddleware', () => {
             queryParams: true,
             graphQL: { document: true, variables: true },
             genAI: { inputs: false, outputs: false },
+            databaseQueryData: true,
             stackFrameVariables: true,
             frameContextLines: 5,
           }),

packages/bun/package.json

@@ -49,7 +49,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@apm-js-collab/code-transformer-bundler-plugins": "^0.5.0",
+    "@apm-js-collab/code-transformer-bundler-plugins": "^0.6.0",
     "@sentry/core": "10.65.0",
     "@sentry/node": "10.65.0",
     "@sentry/server-utils": "10.65.0"

packages/bun/src/index.ts

@@ -198,7 +198,12 @@ export type { BunOptions } from './types';
 
 // eslint-disable-next-line typescript/no-deprecated
 export { BunClient } from './client';
-export { getDefaultIntegrations, init } from './sdk';
+export {
+  getDefaultIntegrations,
+  getDefaultIntegrationsWithoutPerformance,
+  init,
+  initWithoutDefaultIntegrations,
+} from './sdk';
 export { bunServerIntegration } from './integrations/bunserver';
 export { bunRuntimeMetricsIntegration, type BunRuntimeMetricsOptions } from './integrations/bunRuntimeMetrics';
 export { makeFetchTransport } from './transports';

packages/bun/src/sdk.ts

@@ -63,9 +63,9 @@ function getPerformanceIntegrations(options: Options): Integration[] {
   ];
 }
 
-/** Get the default integrations for the Bun SDK. */
-export function getDefaultIntegrations(options: Options): Integration[] {
-  // We return a copy of the defaultIntegrations here to avoid mutating this
+/** Get the default integrations for the Bun SDK, excluding performance integrations. */
+export function getDefaultIntegrationsWithoutPerformance(): Integration[] {
+  // Return a fresh array on each call so callers can safely mutate the result.
   return [
     // Common
     // TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration`
@@ -88,10 +88,14 @@ export function getDefaultIntegrations(options: Options): Integration[] {
     processSessionIntegration(),
     // Bun Specific
     bunServerIntegration(),
-    ...getPerformanceIntegrations(options),
   ];
 }
 
+/** Get the default integrations for the Bun SDK. */
+export function getDefaultIntegrations(options: Options): Integration[] {
+  return [...getDefaultIntegrationsWithoutPerformance(), ...getPerformanceIntegrations(options)];
+}
+
 /**
  * The Sentry Bun SDK Client.
  *
@@ -137,6 +141,23 @@ export function getDefaultIntegrations(options: Options): Integration[] {
  * @see {@link BunOptions} for documentation on configuration options.
  */
 export function init(userOptions: BunOptions = {}): NodeClient | undefined {
+  return _init(userOptions, getDefaultIntegrations);
+}
+
+/**
+ * Initialize Sentry for Bun, without any integrations added by default.
+ */
+export function initWithoutDefaultIntegrations(userOptions: BunOptions = {}): NodeClient | undefined {
+  return _init(userOptions, () => []);
+}
+
+/**
+ * Internal initialization function.
+ */
+function _init(
+  userOptions: BunOptions = {},
+  getDefaultIntegrationsImpl: (options: Options) => Integration[],
+): NodeClient | undefined {
   applySdkMetadata(userOptions, 'bun');
 
   const options = {
@@ -149,7 +170,7 @@ export function init(userOptions: BunOptions = {}): NodeClient | undefined {
   options.transport = options.transport || makeFetchTransport;
 
   if (options.defaultIntegrations === undefined) {
-    options.defaultIntegrations = getDefaultIntegrations(options);
+    options.defaultIntegrations = getDefaultIntegrationsImpl(options);
   }
 
   return initNode(options);

packages/bun/test/init.test.ts

@@ -2,7 +2,13 @@ import { type Integration } from '@sentry/core';
 import * as sentryNode from '@sentry/node';
 import type { Mock } from 'bun:test';
 import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from 'bun:test';
-import { getClient, init } from '../src';
+import {
+  getClient,
+  getDefaultIntegrations,
+  getDefaultIntegrationsWithoutPerformance,
+  init,
+  initWithoutDefaultIntegrations,
+} from '../src';
 
 const PUBLIC_DSN = 'https://username@domain/123';
 
@@ -123,4 +129,47 @@ describe('init()', () => {
       expect(integrations?.map(({ name }) => name)).toContain('Some mock integration 4.3');
     });
   });
+
+  describe('initWithoutDefaultIntegrations()', () => {
+    it('installs no default integrations', () => {
+      initWithoutDefaultIntegrations({ dsn: PUBLIC_DSN });
+
+      const client = getClient();
+
+      expect(client?.getOptions().integrations).toEqual([]);
+      expect(mockAutoPerformanceIntegrations).toHaveBeenCalledTimes(0);
+    });
+
+    it('still installs user-provided integrations', () => {
+      const customIntegration = new MockIntegration('Custom integration');
+
+      initWithoutDefaultIntegrations({ dsn: PUBLIC_DSN, integrations: [customIntegration] });
+
+      const client = getClient();
+
+      expect(client?.getOptions().integrations.map(({ name }) => name)).toEqual(['Custom integration']);
+      expect(customIntegration.setupOnce).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('getDefaultIntegrationsWithoutPerformance()', () => {
+    it('matches the full default set when tracing is disabled (no performance integrations added)', () => {
+      const withoutPerformance = getDefaultIntegrationsWithoutPerformance().map(({ name }) => name);
+      const full = getDefaultIntegrations({}).map(({ name }) => name);
+
+      expect(withoutPerformance).toEqual(full);
+      expect(mockAutoPerformanceIntegrations).toHaveBeenCalledTimes(0);
+    });
+
+    it('omits the performance integrations that the full set adds when tracing is enabled', () => {
+      const performanceIntegration = new MockIntegration('Performance integration');
+      mockAutoPerformanceIntegrations.mockImplementation(() => [performanceIntegration]);
+
+      const withoutPerformance = getDefaultIntegrationsWithoutPerformance().map(({ name }) => name);
+      const full = getDefaultIntegrations({ tracesSampleRate: 1 }).map(({ name }) => name);
+
+      expect(full).toContain('Performance integration');
+      expect(withoutPerformance).not.toContain('Performance integration');
+    });
+  });
 });

packages/core/src/client.ts

@@ -467,7 +467,6 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   // @ts-expect-error - PromiseLike is a subset of Promise
   public async close(timeout?: number): PromiseLike<boolean> {
-    _INTERNAL_flushLogsBuffer(this);
     const result = await this.flush(timeout);
     this.getOptions().enabled = false;
     this.emit('close');

packages/core/src/integrations/http/client-subscriptions.ts

@@ -16,6 +16,7 @@
 import type { SpanStatus } from '../../types/spanStatus';
 import { addOutgoingRequestBreadcrumb } from './add-outgoing-request-breadcrumb';
 import {
+  bindScopeToEmitter,
   getSpanStatusFromHttpCode,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_UNSET,
@@ -156,6 +157,7 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
         response.resume();
       }
       setIncomingResponseSpanData(response, span);
+      bindScopeToEmitter(response);
       options.outgoingResponseHook?.(span, response);
 
       let finished = false;

packages/core/src/integrations/supabase.ts

@@ -385,7 +385,8 @@ function instrumentPostgRESTFilterBuilder(
         }
 
         const client = getClient();
-        const shouldSendData = _options.sendOperationData ?? client?.getDataCollectionOptions().userInfo === true;
+        const shouldSendData =
+          _options.sendOperationData ?? client?.getDataCollectionOptions().databaseQueryData === true;
         const bodyPayload = getMutationBodyPayloadForTelemetry(typedThis.body, body);
 
         // Adding operation to the beginning of the description if it's not a `select` operation
@@ -563,7 +564,7 @@ interface SupabaseIntegrationOptions {
    * Whether to attach PostgREST query filters and mutation body payloads
    * to Sentry telemetry.
    *
-   * Falls back to `dataCollection.userInfo` when not set.
+   * Falls back to `dataCollection.databaseQueryData` when not set.
    * @default undefined
    */
   sendOperationData?: boolean;

packages/core/src/types/datacollection.ts

@@ -78,6 +78,14 @@ export interface DataCollection {
     outputs?: boolean;
   };
 
+  /**
+   * Include data associated with database queries. This controls collection of query parameters, inline literal values within query text, mutation/request bodies, and returned result data.
+   *
+   * Sanitized or parameterized DB statements (`db.query.text`) are **not** controlled by this property. Structural metadata such as the database system, query summary, operation name, or the table being acted upon is also **always** collected.
+   * @default true
+   */
+  databaseQueryData?: boolean;
+
   /**
    * Capture local variable values in stack frames.
    * @default true