Merge branch 'develop' into abhi-enable-console-logs-by-default

Author: AbhiPrasad

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+- **feat(cloudflare): Add honoIntegration with error-filtering function ([#17743](https://github.com/getsentry/sentry-javascript/pull/17743))**
+
+  This release adds a `honoIntegration` to `@sentry/cloudflare`, which exposes a `shouldHandleError` function that lets you define which errors in `onError` should be captured.
+  By default, Sentry captures exceptions with `error.status >= 500 || error.status <= 299`.
+
+  The integration is added by default, and it's possible to modify this behavior like this:
+
+  ```js
+   integrations: [
+     honoIntegration({
+      shouldHandleError: (err) => true; // always capture exceptions in onError
+     })
+   ]
+  ```
+
 Work in this release was contributed by @Karibash. Thank you for your contribution!
 
 ## 10.14.0
@@ -12,7 +27,7 @@ Work in this release was contributed by @Karibash. Thank you for your contributi
 
 - **feat(cloudflare,vercel-edge): Add support for Google Gen AI instrumentation ([#17723](https://github.com/getsentry/sentry-javascript/pull/17723))**
 
-  The SDK now automatically instruments Google's Generative AI operations in Cloudflare Workers and Vercel Edge Runtime environments, providing insights into your AI operations.
+  The SDK now supports manually instrumenting Google's Generative AI operations in Cloudflare Workers and Vercel Edge Runtime environments, providing insights into your AI operations. You can use `const wrappedClient = Sentry.instrumentGoogleGenAIClient(genAiClient)` to get an instrumented client.
 
 ### Other Changes
 

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-layer/ExperimentalExtension/index.mjs

@@ -242,52 +242,4 @@ test.describe('Lambda layer', () => {
       }),
     );
   });
-
-  test('experimental extension works', async ({ lambdaClient }) => {
-    const transactionEventPromise = waitForTransaction('aws-serverless-lambda-sam', transactionEvent => {
-      return transactionEvent?.transaction === 'LayerExperimentalExtension';
-    });
-
-    await lambdaClient.send(
-      new InvokeCommand({
-        FunctionName: 'LayerExperimentalExtension',
-        Payload: JSON.stringify({}),
-      }),
-    );
-
-    const transactionEvent = await transactionEventPromise;
-
-    expect(transactionEvent.transaction).toEqual('LayerExperimentalExtension');
-    expect(transactionEvent.contexts?.trace).toEqual({
-      data: {
-        'sentry.sample_rate': 1,
-        'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
-        'sentry.op': 'function.aws.lambda',
-        'cloud.account.id': '012345678912',
-        'faas.execution': expect.any(String),
-        'faas.id': 'arn:aws:lambda:us-east-1:012345678912:function:LayerExperimentalExtension',
-        'faas.coldstart': true,
-        'otel.kind': 'SERVER',
-      },
-      op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      status: 'ok',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-    });
-
-    expect(transactionEvent.spans).toHaveLength(1);
-
-    expect(transactionEvent.spans).toContainEqual(
-      expect.objectContaining({
-        data: expect.objectContaining({
-          'sentry.op': 'test',
-          'sentry.origin': 'manual',
-        }),
-        description: 'manual-span',
-        op: 'test',
-      }),
-    );
-  });
 });

dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts

@@ -15,12 +15,10 @@ export function getDefaultIntegrations(options: Options): Integration[] {
 }
 
 export interface AwsServerlessOptions extends NodeOptions {
-  _experiments?: NodeOptions['_experiments'] & {
-    /**
-     * If proxying Sentry events through the Sentry Lambda extension should be enabled.
-     */
-    enableLambdaExtension?: boolean;
-  };
+  /**
+   * If Sentry events should be proxied through the Lambda extension when using the Lambda layer. Defaults to `true` when using the Lambda layer.
+   */
+  useLayerExtension?: boolean;
 }
 
 /**
@@ -29,14 +27,14 @@ export interface AwsServerlessOptions extends NodeOptions {
  * @param options Configuration options for the SDK, @see {@link AWSLambdaOptions}.
  */
 export function init(options: AwsServerlessOptions = {}): NodeClient | undefined {
+  const sdkSource = getSDKSource();
   const opts = {
     defaultIntegrations: getDefaultIntegrations(options),
+    useLayerExtension: sdkSource === 'aws-lambda-layer' && !options.tunnel,
     ...options,
   };
 
-  const sdkSource = getSDKSource();
-
-  if (opts._experiments?.enableLambdaExtension) {
+  if (opts.useLayerExtension) {
     if (sdkSource === 'aws-lambda-layer') {
       if (!opts.tunnel) {
         DEBUG_BUILD && debug.log('Proxying Sentry events through the Sentry Lambda extension');

packages/aws-serverless/src/init.ts

@@ -18,14 +18,12 @@ const mockGetSDKSource = vi.mocked(getSDKSource);
 const mockInitWithoutDefaultIntegrations = vi.mocked(initWithoutDefaultIntegrations);
 
 describe('init', () => {
-  describe('experimental Lambda extension support', () => {
+  describe('Lambda extension setup', () => {
     test('should preserve user-provided tunnel option when Lambda extension is enabled', () => {
       mockGetSDKSource.mockReturnValue('aws-lambda-layer');
       const options: AwsServerlessOptions = {
         tunnel: 'https://custom-tunnel.example.com',
-        _experiments: {
-          enableLambdaExtension: true,
-        },
+        useLayerExtension: true,
       };
 
       init(options);
@@ -40,9 +38,7 @@ describe('init', () => {
     test('should set default tunnel when Lambda extension is enabled and SDK source is aws-lambda-layer', () => {
       mockGetSDKSource.mockReturnValue('aws-lambda-layer');
       const options: AwsServerlessOptions = {
-        _experiments: {
-          enableLambdaExtension: true,
-        },
+        useLayerExtension: true,
       };
 
       init(options);
@@ -57,9 +53,7 @@ describe('init', () => {
     test('should not set tunnel when Lambda extension is disabled', () => {
       mockGetSDKSource.mockReturnValue('aws-lambda-layer');
       const options: AwsServerlessOptions = {
-        _experiments: {
-          enableLambdaExtension: false,
-        },
+        useLayerExtension: false,
       };
 
       init(options);
@@ -74,9 +68,7 @@ describe('init', () => {
     test('should not set tunnel when SDK source is not aws-lambda-layer even with Lambda extension enabled', () => {
       mockGetSDKSource.mockReturnValue('npm');
       const options: AwsServerlessOptions = {
-        _experiments: {
-          enableLambdaExtension: true,
-        },
+        useLayerExtension: true,
       };
 
       init(options);
@@ -88,17 +80,52 @@ describe('init', () => {
       );
     });
 
-    test('should not set tunnel when no experiments are provided', () => {
+    test('should default useLayerExtension to true when SDK source is aws-lambda-layer', () => {
       mockGetSDKSource.mockReturnValue('aws-lambda-layer');
       const options: AwsServerlessOptions = {};
 
       init(options);
 
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: true,
+          tunnel: 'http://localhost:9000/envelope',
+        }),
+      );
+    });
+
+    test('should default useLayerExtension to false when SDK source is not aws-lambda-layer', () => {
+      mockGetSDKSource.mockReturnValue('npm');
+      const options: AwsServerlessOptions = {};
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: false,
+        }),
+      );
       expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
         expect.not.objectContaining({
           tunnel: expect.any(String),
         }),
       );
     });
+
+    test('should default useLayerExtension to false when tunnel is provided even when SDK source is aws-lambda-layer', () => {
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {
+        tunnel: 'https://custom-tunnel.example.com',
+      };
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: false,
+          tunnel: 'https://custom-tunnel.example.com',
+        }),
+      );
+    });
   });
 });

packages/aws-serverless/test/init.test.ts

@@ -2,8 +2,10 @@ import type { SpanAttributes } from '@sentry/core';
 import { browserPerformanceTimeOrigin } from '@sentry/core';
 import { extractNetworkProtocol, getBrowserPerformanceAPI } from './utils';
 
-function getAbsoluteTime(time = 0): number {
-  return ((browserPerformanceTimeOrigin() || performance.timeOrigin) + time) / 1000;
+function getAbsoluteTime(time: number | undefined): number | undefined {
+  // falsy values should be preserved so that we can later on drop undefined values and
+  // preserve 0 vals for cross-origin resources without proper `Timing-Allow-Origin` header.
+  return time ? ((browserPerformanceTimeOrigin() || performance.timeOrigin) + time) / 1000 : time;
 }
 
 /**
@@ -30,7 +32,7 @@ export function resourceTimingToSpanAttributes(resourceTiming: PerformanceResour
     return timingSpanData;
   }
 
-  return {
+  return dropUndefinedKeysFromObject({
     ...timingSpanData,
 
     'http.request.redirect_start': getAbsoluteTime(resourceTiming.redirectStart),
@@ -55,6 +57,16 @@ export function resourceTimingToSpanAttributes(resourceTiming: PerformanceResour
     // For TTFB we actually want the relative time from timeOrigin to responseStart
     // This way, TTFB always measures the "first page load" experience.
     // see: https://web.dev/articles/ttfb#measure-resource-requests
-    'http.request.time_to_first_byte': (resourceTiming.responseStart ?? 0) / 1000,
-  };
+    'http.request.time_to_first_byte':
+      resourceTiming.responseStart != null ? resourceTiming.responseStart / 1000 : undefined,
+  });
+}
+
+/**
+ * Remove properties with `undefined` as value from an object.
+ * In contrast to `dropUndefinedKeys` in core this funciton only works on first-level
+ * key-value objects and does not recursively go into object properties or arrays.
+ */
+function dropUndefinedKeysFromObject<T extends object>(attrs: T): Partial<T> {
+  return Object.fromEntries(Object.entries(attrs).filter(([, value]) => value != null)) as Partial<T>;
 }

packages/browser-utils/src/metrics/resourceTiming.ts

@@ -266,6 +266,18 @@ describe('_addResourceSpans', () => {
       decodedBodySize: 593,
       renderBlockingStatus: 'non-blocking',
       nextHopProtocol: 'http/1.1',
+      connectStart: 1000,
+      connectEnd: 1001,
+      redirectStart: 1002,
+      redirectEnd: 1003,
+      fetchStart: 1004,
+      domainLookupStart: 1005,
+      domainLookupEnd: 1006,
+      requestStart: 1007,
+      responseStart: 1008,
+      responseEnd: 1009,
+      secureConnectionStart: 1005,
+      workerStart: 1006,
     });
 
     const timeOrigin = 100;
@@ -305,7 +317,7 @@ describe('_addResourceSpans', () => {
           'http.request.response_end': expect.any(Number),
           'http.request.response_start': expect.any(Number),
           'http.request.secure_connection_start': expect.any(Number),
-          'http.request.time_to_first_byte': 0,
+          'http.request.time_to_first_byte': 1.008,
           'http.request.worker_start': expect.any(Number),
         },
       }),
@@ -492,6 +504,18 @@ describe('_addResourceSpans', () => {
       encodedBodySize: null,
       decodedBodySize: null,
       nextHopProtocol: 'h3',
+      connectStart: 1000,
+      connectEnd: 1001,
+      redirectStart: 1002,
+      redirectEnd: 1003,
+      fetchStart: 1004,
+      domainLookupStart: 1005,
+      domainLookupEnd: 1006,
+      requestStart: 1007,
+      responseStart: 1008,
+      responseEnd: 1009,
+      secureConnectionStart: 1005,
+      workerStart: 1006,
     } as unknown as PerformanceResourceTiming;
 
     _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
@@ -518,7 +542,7 @@ describe('_addResourceSpans', () => {
           'http.request.response_end': expect.any(Number),
           'http.request.response_start': expect.any(Number),
           'http.request.secure_connection_start': expect.any(Number),
-          'http.request.time_to_first_byte': 0,
+          'http.request.time_to_first_byte': 1.008,
           'http.request.worker_start': expect.any(Number),
         },
         description: '/assets/to/css',