format

Author: Lms24

.oxlintrc.json

@@ -10,8 +10,12 @@
   "categories": {},
   "rules": {
     "no-unused-vars": [
-      "warn",
-      { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_", "caughtErrorsIgnorePattern": "^_" }
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
     ],
 
     // === Base rules from eslint-config-sdk/base.js ===

packages/aws-serverless/src/init.ts

@@ -49,8 +49,8 @@ function shouldDisableLayerExtensionForProxy(): boolean {
  */
 // NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
 // If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
-export function getDefaultIntegrations(_options: Options): Integration[] {
-  return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
+export function getDefaultIntegrations(options: Options): Integration[] {
+  return [...getDefaultIntegrationsWithoutPerformance(options), awsIntegration(), awsLambdaIntegration()];
 }
 
 export interface AwsServerlessOptions extends NodeOptions {

packages/browser/test/integrations/spanstreaming.test.ts

@@ -1,12 +1,5 @@
 import * as SentryCore from '@sentry/core';
-import {
-  captureSpan,
-  debug,
-  hasSpanStreamingEnabled,
-  isStreamedBeforeSendSpanCallback,
-  spanIsSampled,
-} from '@sentry/core';
-import type { Span } from '@sentry/core';
+import { debug } from '@sentry/core';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { BrowserClient, spanStreamingIntegration } from '../../src';
 import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
@@ -27,35 +20,6 @@ vi.mock('@sentry/core', async () => {
   return {
     ...original,
     SpanBuffer: MockSpanBuffer,
-    setupSpanStreaming: vi.fn((client: any) => {
-      const initialMessage = 'SpanStreaming integration requires';
-      const fallbackMsg = 'Falling back to static trace lifecycle.';
-
-      if (!(original as any).hasSpanStreamingEnabled(client)) {
-        (original as any).debug.warn(`${initialMessage} \`traceLifecycle\` to be set to "stream"! ${fallbackMsg}`);
-        return undefined;
-      }
-
-      const beforeSendSpan = client.getOptions().beforeSendSpan;
-      if (beforeSendSpan && !(original as any).isStreamedBeforeSendSpanCallback(beforeSendSpan)) {
-        client.getOptions().traceLifecycle = 'static';
-        (original as any).debug.warn(
-          `${initialMessage} a beforeSendSpan callback using \`withStreamedSpan\`! ${fallbackMsg}`,
-        );
-        return undefined;
-      }
-
-      const buffer = new MockSpanBuffer(client);
-
-      client.on('afterSpanEnd', (span: Readonly<Span>) => {
-        if (!(original as any).spanIsSampled(span)) {
-          return;
-        }
-        buffer.add((original as any).captureSpan(span, client));
-      });
-
-      return buffer;
-    }),
   };
 });
 
@@ -113,7 +77,7 @@ describe('spanStreamingIntegration', () => {
       dsn: 'https://username@domain/123',
       integrations: [spanStreamingIntegration()],
       traceLifecycle: 'stream',
-      beforeSendSpan: (span: Span) => span,
+      beforeSendSpan: (span: SentryCore.SpanJSON) => span,
     });
 
     SentryCore.setCurrentClient(client);

packages/google-cloud-serverless/src/sdk.ts

@@ -16,8 +16,8 @@ function getCjsOnlyIntegrations(): Integration[] {
 }
 
 /** Get the default integrations for the GCP SDK. */
-export function getDefaultIntegrations(_options: Options): Integration[] {
-  return [...getDefaultIntegrationsWithoutPerformance(), ...getCjsOnlyIntegrations()];
+export function getDefaultIntegrations(options?: Options): Integration[] {
+  return [...getDefaultIntegrationsWithoutPerformance(options), ...getCjsOnlyIntegrations()];
 }
 
 /**

packages/node/src/sdk/index.ts

@@ -15,7 +15,7 @@ import { initOpenTelemetry } from './initOtel';
 /**
  * Get default integrations, excluding performance.
  */
-export function getDefaultIntegrationsWithoutPerformance(options: Options): Integration[] {
+export function getDefaultIntegrationsWithoutPerformance(options?: Options | undefined): Integration[] {
   const nodeCoreIntegrations = getNodeCoreDefaultIntegrations(options);
 
   // Filter out the node-core HTTP and NodeFetch integrations and replace them with Node SDK's composite versions