Merge branch 'develop' into timfish/feat/disable-blocked-detection

Author: timfish

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @janpapenbrock. Thank you for your contribution!
+
 ## 9.38.0
 
 ### Important Changes

dev-packages/e2e-tests/run.ts

@@ -84,10 +84,10 @@ async function run(): Promise<void> {
       const cwd = tmpDirPath;
 
       console.log(`Building ${testAppPath} in ${tmpDirPath}...`);
-      await asyncExec('pnpm test:build', { env, cwd });
+      await asyncExec('volta run pnpm test:build', { env, cwd });
 
       console.log(`Testing ${testAppPath}...`);
-      await asyncExec('pnpm test:assert', { env, cwd });
+      await asyncExec('volta run pnpm test:assert', { env, cwd });
 
       // clean up (although this is tmp, still nice to do)
       await rm(tmpDirPath, { recursive: true });

packages/aws-serverless/package.json

@@ -3,7 +3,7 @@
   "version": "9.38.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
-  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
+  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
   "author": "Sentry",
   "license": "MIT",
   "engines": {

packages/core/src/logs/exports.ts

@@ -7,7 +7,7 @@ import type { Scope, ScopeData } from '../scope';
 import type { Log, SerializedLog, SerializedLogAttributeValue } from '../types-hoist/log';
 import { mergeScopeData } from '../utils/applyScopeDataToEvent';
 import { isParameterizedString } from '../utils/is';
-import { debug } from '../utils/logger';
+import { consoleSandbox, debug } from '../utils/logger';
 import { _getSpanForScope } from '../utils/spanOnScope';
 import { timestampInSeconds } from '../utils/time';
 import { SEVERITY_TEXT_TO_SEVERITY_NUMBER } from './constants';
@@ -168,7 +168,8 @@ export function _INTERNAL_captureLog(
 
   client.emit('beforeCaptureLog', processedLog);
 
-  const log = beforeSendLog ? beforeSendLog(processedLog) : processedLog;
+  // We need to wrap this in `consoleSandbox` to avoid recursive calls to `beforeSendLog`
+  const log = beforeSendLog ? consoleSandbox(() => beforeSendLog(processedLog)) : processedLog;
   if (!log) {
     client.recordDroppedEvent('before_send', 'log_item', 1);
     DEBUG_BUILD && debug.warn('beforeSendLog returned null, log will not be captured.');

packages/node-native/src/event-loop-block-integration.ts

@@ -10,7 +10,7 @@ import type {
   Integration,
   IntegrationFn,
 } from '@sentry/core';
-import { defineIntegration, getClient, getFilenameToDebugIdMap, getIsolationScope, logger } from '@sentry/core';
+import { debug, defineIntegration, getClient, getFilenameToDebugIdMap, getIsolationScope } from '@sentry/core';
 import type { NodeClient } from '@sentry/node';
 import { registerThread, threadPoll } from '@sentry-internal/node-native-stacktrace';
 import type { ThreadBlockedIntegrationOptions, WorkerStartData } from './common';
@@ -20,7 +20,7 @@ const INTEGRATION_NAME = 'ThreadBlocked';
 const DEFAULT_THRESHOLD_MS = 1_000;
 
 function log(message: string, ...args: unknown[]): void {
-  logger.log(`[Sentry Event Loop Blocked] ${message}`, ...args);
+  debug.log(`[Sentry Event Loop Blocked] ${message}`, ...args);
 }
 
 /**
@@ -107,7 +107,7 @@ async function startWorker(
   }
 
   const options: WorkerStartData = {
-    debug: logger.isEnabled(),
+    debug: debug.isEnabled(),
     dsn,
     tunnel: initOptions.tunnel,
     environment: initOptions.environment || 'production',

packages/vercel-edge/src/sdk.ts

@@ -10,6 +10,7 @@ import type { Client, Integration, Options } from '@sentry/core';
 import {
   consoleIntegration,
   createStackParser,
+  debug,
   dedupeIntegration,
   functionToStringIntegration,
   getCurrentScope,
@@ -18,7 +19,6 @@ import {
   hasSpansEnabled,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
-  logger,
   nodeStackLineParser,
   requestDataIntegration,
   SDK_VERSION,
@@ -135,14 +135,14 @@ function validateOpenTelemetrySetup(): void {
 
   for (const k of required) {
     if (!setup.includes(k)) {
-      logger.error(
+      debug.error(
         `You have to set up the ${k}. Without this, the OpenTelemetry & Sentry integration will not work properly.`,
       );
     }
   }
 
   if (!setup.includes('SentrySampler')) {
-    logger.warn(
+    debug.warn(
       'You have to set up the SentrySampler. Without this, the OpenTelemetry & Sentry integration may still work, but sample rates set for the Sentry SDK will not be respected. If you use a custom sampler, make sure to use `wrapSamplingDecision`.',
     );
   }
@@ -182,19 +182,21 @@ export function setupOtel(client: VercelEdgeClient): void {
 }
 
 /**
- * Setup the OTEL logger to use our own logger.
+ * Setup the OTEL logger to use our own debug logger.
  */
 function setupOpenTelemetryLogger(): void {
-  const otelLogger = new Proxy(logger as typeof logger & { verbose: (typeof logger)['debug'] }, {
-    get(target, prop, receiver) {
-      const actualProp = prop === 'verbose' ? 'debug' : prop;
-      return Reflect.get(target, actualProp, receiver);
-    },
-  });
-
   // Disable diag, to ensure this works even if called multiple times
   diag.disable();
-  diag.setLogger(otelLogger, DiagLogLevel.DEBUG);
+  diag.setLogger(
+    {
+      error: debug.error,
+      warn: debug.warn,
+      info: debug.log,
+      debug: debug.log,
+      verbose: debug.log,
+    },
+    DiagLogLevel.DEBUG,
+  );
 }
 
 /**

packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts

@@ -27,7 +27,7 @@
 
 import type { Context } from '@opentelemetry/api';
 import { ROOT_CONTEXT } from '@opentelemetry/api';
-import { GLOBAL_OBJ, logger } from '@sentry/core';
+import { debug, GLOBAL_OBJ } from '@sentry/core';
 import type { AsyncLocalStorage } from 'async_hooks';
 import { DEBUG_BUILD } from '../debug-build';
 import { AbstractAsyncHooksContextManager } from './abstract-async-hooks-context-manager';
@@ -42,7 +42,7 @@ export class AsyncLocalStorageContextManager extends AbstractAsyncHooksContextMa
 
     if (!MaybeGlobalAsyncLocalStorageConstructor) {
       DEBUG_BUILD &&
-        logger.warn(
+        debug.warn(
           "Tried to register AsyncLocalStorage async context strategy in a runtime that doesn't support AsyncLocalStorage.",
         );