Merge branch 'develop' into sig/hono-errorHandler

Author: s1gr1d

dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json

@@ -20,7 +20,7 @@
     "@sentry/cloudflare": "latest || *",
     "@sentry/remix": "latest || *",
     "@sentry/vite-plugin": "^3.1.2",
-    "@shopify/hydrogen": "^2025.1.0",
+    "@shopify/hydrogen": "2025.4.0",
     "@shopify/remix-oxygen": "^2.0.10",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
@@ -34,7 +34,7 @@
     "@remix-run/dev": "^2.15.2",
     "@remix-run/eslint-config": "^2.15.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
-    "@shopify/cli": "^3.74.1",
+    "@shopify/cli": "3.74.1",
     "@shopify/hydrogen-codegen": "^0.3.1",
     "@shopify/mini-oxygen": "3.2.0",
     "@shopify/oxygen-workers-types": "^4.1.2",

packages/browser/src/client.ts

@@ -85,41 +85,41 @@ export class BrowserClient extends Client<BrowserClientOptions> {
 
     super(opts);
 
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const client = this;
-    const { sendDefaultPii, _experiments } = client._options;
+    const { sendDefaultPii, sendClientReports, _experiments } = this._options;
     const enableLogs = _experiments?.enableLogs;
 
-    if (opts.sendClientReports && WINDOW.document) {
+    if (WINDOW.document && (sendClientReports || enableLogs)) {
       WINDOW.document.addEventListener('visibilitychange', () => {
         if (WINDOW.document.visibilityState === 'hidden') {
-          this._flushOutcomes();
+          if (sendClientReports) {
+            this._flushOutcomes();
+          }
           if (enableLogs) {
-            _INTERNAL_flushLogsBuffer(client);
+            _INTERNAL_flushLogsBuffer(this);
           }
         }
       });
     }
 
     if (enableLogs) {
-      client.on('flush', () => {
-        _INTERNAL_flushLogsBuffer(client);
+      this.on('flush', () => {
+        _INTERNAL_flushLogsBuffer(this);
       });
 
-      client.on('afterCaptureLog', () => {
-        if (client._logFlushIdleTimeout) {
-          clearTimeout(client._logFlushIdleTimeout);
+      this.on('afterCaptureLog', () => {
+        if (this._logFlushIdleTimeout) {
+          clearTimeout(this._logFlushIdleTimeout);
         }
 
-        client._logFlushIdleTimeout = setTimeout(() => {
-          _INTERNAL_flushLogsBuffer(client);
+        this._logFlushIdleTimeout = setTimeout(() => {
+          _INTERNAL_flushLogsBuffer(this);
         }, DEFAULT_FLUSH_INTERVAL);
       });
     }
 
     if (sendDefaultPii) {
-      client.on('postprocessEvent', addAutoIpAddressToUser);
-      client.on('beforeSendSession', addAutoIpAddressToSession);
+      this.on('postprocessEvent', addAutoIpAddressToUser);
+      this.on('beforeSendSession', addAutoIpAddressToSession);
     }
   }
 

packages/node/src/integrations/http/SentryHttpInstrumentation.ts

@@ -77,8 +77,8 @@ export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
    * Do not capture the request body for incoming HTTP requests to URLs where the given callback returns `true`.
    * This can be useful for long running requests where the body is not needed and we want to avoid capturing it.
    *
-   * @param url Contains the entire URL, including query string (if any), protocol, host, etc. of the outgoing request.
-   * @param request Contains the {@type RequestOptions} object used to make the outgoing request.
+   * @param url Contains the entire URL, including query string (if any), protocol, host, etc. of the incoming request.
+   * @param request Contains the {@type RequestOptions} object used to make the incoming request.
    */
   ignoreIncomingRequestBody?: (url: string, request: http.RequestOptions) => boolean;
 

packages/node/src/integrations/http/index.ts

@@ -3,7 +3,8 @@ import { diag } from '@opentelemetry/api';
 import type { HttpInstrumentationConfig } from '@opentelemetry/instrumentation-http';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import type { Span } from '@sentry/core';
-import { defineIntegration, getClient } from '@sentry/core';
+import { defineIntegration, getClient, hasSpansEnabled } from '@sentry/core';
+import { NODE_VERSION } from '../../nodeVersion';
 import { generateInstrumentOnce } from '../../otel/instrument';
 import type { NodeClient } from '../../sdk/client';
 import type { HTTPModuleRequestIncomingMessage } from '../../transports/http-module';
@@ -85,8 +86,8 @@ interface HttpOptions {
    * Do not capture the request body for incoming HTTP requests to URLs where the given callback returns `true`.
    * This can be useful for long running requests where the body is not needed and we want to avoid capturing it.
    *
-   * @param url Contains the entire URL, including query string (if any), protocol, host, etc. of the outgoing request.
-   * @param request Contains the {@type RequestOptions} object used to make the outgoing request.
+   * @param url Contains the entire URL, including query string (if any), protocol, host, etc. of the incoming request.
+   * @param request Contains the {@type RequestOptions} object used to make the incoming request.
    */
   ignoreIncomingRequestBody?: (url: string, request: RequestOptions) => boolean;
 
@@ -159,8 +160,22 @@ export const instrumentOtelHttp = generateInstrumentOnce<HttpInstrumentationConf
 /** Exported only for tests. */
 export function _shouldInstrumentSpans(options: HttpOptions, clientOptions: Partial<NodeClientOptions> = {}): boolean {
   // If `spans` is passed in, it takes precedence
-  // Else, we by default emit spans, unless `skipOpenTelemetrySetup` is set to `true`
-  return typeof options.spans === 'boolean' ? options.spans : !clientOptions.skipOpenTelemetrySetup;
+  // Else, we by default emit spans, unless `skipOpenTelemetrySetup` is set to `true` or spans are not enabled
+  if (typeof options.spans === 'boolean') {
+    return options.spans;
+  }
+
+  if (clientOptions.skipOpenTelemetrySetup) {
+    return false;
+  }
+
+  // IMPORTANT: We only disable span instrumentation when spans are not enabled _and_ we are on Node 22+,
+  // as otherwise the necessary diagnostics channel is not available yet
+  if (!hasSpansEnabled(clientOptions) && NODE_VERSION.major >= 22) {
+    return false;
+  }
+
+  return true;
 }
 
 /**

packages/node/src/integrations/node-fetch/index.ts

@@ -1,7 +1,7 @@
 import type { UndiciInstrumentationConfig } from '@opentelemetry/instrumentation-undici';
 import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
 import type { IntegrationFn } from '@sentry/core';
-import { defineIntegration, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { defineIntegration, getClient, hasSpansEnabled, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { generateInstrumentOnce } from '../../otel/instrument';
 import type { NodeClient } from '../../sdk/client';
 import type { NodeClientOptions } from '../../types';
@@ -86,8 +86,10 @@ function getAbsoluteUrl(origin: string, path: string = '/'): string {
 
 function _shouldInstrumentSpans(options: NodeFetchOptions, clientOptions: Partial<NodeClientOptions> = {}): boolean {
   // If `spans` is passed in, it takes precedence
-  // Else, we by default emit spans, unless `skipOpenTelemetrySetup` is set to `true`
-  return typeof options.spans === 'boolean' ? options.spans : !clientOptions.skipOpenTelemetrySetup;
+  // Else, we by default emit spans, unless `skipOpenTelemetrySetup` is set to `true` or spans are not enabled
+  return typeof options.spans === 'boolean'
+    ? options.spans
+    : !clientOptions.skipOpenTelemetrySetup && hasSpansEnabled(clientOptions);
 }
 
 function getConfigWithDefaults(options: Partial<NodeFetchOptions> = {}): UndiciInstrumentationConfig {

packages/node/test/integrations/http.test.ts

@@ -1,19 +1,30 @@
 import { describe, expect, it } from 'vitest';
 import { _shouldInstrumentSpans } from '../../src/integrations/http';
+import { conditionalTest } from '../helpers/conditional';
 
 describe('httpIntegration', () => {
   describe('_shouldInstrumentSpans', () => {
     it.each([
-      [{}, {}, true],
       [{ spans: true }, {}, true],
       [{ spans: false }, {}, false],
       [{ spans: true }, { skipOpenTelemetrySetup: true }, true],
       [{ spans: false }, { skipOpenTelemetrySetup: true }, false],
       [{}, { skipOpenTelemetrySetup: true }, false],
-      [{}, { skipOpenTelemetrySetup: false }, true],
+      [{}, { tracesSampleRate: 0, skipOpenTelemetrySetup: true }, false],
+      [{}, { tracesSampleRate: 0 }, true],
     ])('returns the correct value for options=%j and clientOptions=%j', (options, clientOptions, expected) => {
       const actual = _shouldInstrumentSpans(options, clientOptions);
       expect(actual).toBe(expected);
     });
+
+    conditionalTest({ min: 22 })('returns false without tracesSampleRate on Node >=22', () => {
+      const actual = _shouldInstrumentSpans({}, {});
+      expect(actual).toBe(false);
+    });
+
+    conditionalTest({ max: 21 })('returns true without tracesSampleRate on Node <22', () => {
+      const actual = _shouldInstrumentSpans({}, {});
+      expect(actual).toBe(true);
+    });
   });
 });