fixes

Author: mydea

packages/opentelemetry/src/asyncLocalStorageContextManager.ts

@@ -230,7 +230,7 @@ export class SentryAsyncLocalStorageContextManager implements ContextManager {
  * would classify plain objects like `{ on: true }` as emitters and later try to call a non-function.
  */
 function isEventEmitter(target: unknown): target is EventEmitter {
-  if (typeof target !== 'object' || target === null) {
+  if (typeof target !== 'object' || !target) {
     return false;
   }
   const candidate = target as Partial<Record<'on' | 'emit', unknown>>;

packages/opentelemetry/src/nodeAsyncContextStrategy.ts

@@ -4,37 +4,19 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { getRootSpan, spanIsIgnored, type TracingChannelBinding } from '@sentry/core';
 import { SENTRY_TRACE_STATE_CHILD_IGNORED } from './constants';
 
-export function setNodeOpenTelemetryContextAsyncContextStrategy(options?: {
-  asyncLocalStorage?: AsyncLocalStorage<api.Context>;
-}): void {
+export function setNodeOpenTelemetryContextAsyncContextStrategy(): void {
+  const asyncLocalStorage = new AsyncLocalStorage<api.Context>();
+
   setOpenTelemetryContextAsyncContextStrategy({
-    getTracingChannelBinding: options?.asyncLocalStorage
-      ? getAsyncLocalStorageFactory(options.asyncLocalStorage)
-      : getDefaultAsyncLocalStorageFactory(),
+    getTracingChannelBinding: () => {
+      return {
+        asyncLocalStorage,
+        getStoreWithActiveSpan,
+      } satisfies TracingChannelBinding;
+    },
   });
 }
 
-/**
- * In the default case, we build the local storage instance ourselves here.
- * The default asyncLocalStorageContextManager will then use this internally.
- */
-function getDefaultAsyncLocalStorageFactory(): () => TracingChannelBinding {
-  const defaultAsyncLocalStorage = new AsyncLocalStorage<api.Context>();
-  return getAsyncLocalStorageFactory(defaultAsyncLocalStorage);
-}
-
-/**
- * Build the tracing channel binding factory for the given async local storage instance.
- */
-function getAsyncLocalStorageFactory(asyncLocalStorage: AsyncLocalStorage<api.Context>): () => TracingChannelBinding {
-  return () => {
-    return {
-      asyncLocalStorage,
-      getStoreWithActiveSpan,
-    } satisfies TracingChannelBinding;
-  };
-}
-
 function getStoreWithActiveSpan(span: Parameters<TracingChannelBinding['getStoreWithActiveSpan']>[0]): api.Context {
   const activeContext = api.context.active();
 

packages/vercel-edge/src/async-local-storage.ts

@@ -22,14 +22,14 @@ import {
   SentryAsyncLocalStorageContextManager,
   SentryPropagator,
   SentryTracerProvider,
+  setOpenTelemetryContextAsyncContextStrategy,
   setupEventContextTrace,
 } from '@sentry/opentelemetry';
 import { VercelEdgeClient } from './client';
 import { winterCGFetchIntegration } from './integrations/wintercg-fetch';
 import { makeEdgeTransport } from './transports';
 import type { VercelEdgeOptions } from './types';
 import { getVercelEnv } from './utils/vercel';
-import { setVercelEdgeAsyncLocalStorageStrategy } from './async-local-storage';
 
 declare const process: {
   env: Record<string, string>;
@@ -56,7 +56,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
 
 /** Inits the Sentry NextJS SDK on the Edge Runtime. */
 export function init(options: VercelEdgeOptions = {}): Client {
-  setVercelEdgeAsyncLocalStorageStrategy();
+  setOpenTelemetryContextAsyncContextStrategy();
 
   const scope = getCurrentScope();
   scope.update(options.initialScope);