fix preload

Author: mydea

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

@@ -1,18 +1,17 @@
 import type * as http from 'node:http';
 import type * as https from 'node:https';
-import { context } from '@opentelemetry/api';
 import { VERSION } from '@opentelemetry/core';
 import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
-import { addBreadcrumb, getClient, getCurrentScope, getIsolationScope } from '@sentry/core';
-import { setScopesOnContext } from '@sentry/opentelemetry';
+import { addBreadcrumb, getClient, getIsolationScope } from '@sentry/core';
 import type { SanitizedRequestData } from '@sentry/types';
 import {
   getBreadcrumbLogLevelFromHttpStatusCode,
   getSanitizedUrlString,
   parseUrl,
   stripUrlQueryAndFragment,
 } from '@sentry/utils';
+import { withIsolationScope } from '../..';
 import type { NodeClient } from '../../sdk/client';
 
 type Http = typeof http;
@@ -129,13 +128,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
 
         isolationScope.setTransactionName(bestEffortTransactionName);
 
-        const parentContext = context.active();
-        const requestContext = setScopesOnContext(parentContext, {
-          scope: getCurrentScope(),
-          isolationScope,
-        });
-
-        return context.with(requestContext, () => {
+        return withIsolationScope(isolationScope, () => {
           return original.apply(this, [event, ...args]);
         });
       };

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

@@ -1,5 +1,4 @@
 import type { Integration } from '@sentry/types';
-import { instrumentHttp } from '../http';
 
 import { amqplibIntegration, instrumentAmqplib } from './amqplib';
 import { connectIntegration, instrumentConnect } from './connect';
@@ -54,7 +53,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getOpenTelemetryInstrumentationToPreload(): (((options?: any) => void) & { id: string })[] {
   return [
-    instrumentHttp,
     instrumentExpress,
     instrumentConnect,
     instrumentFastify,

packages/opentelemetry/src/index.ts

@@ -7,7 +7,7 @@ export { wrapClientClass } from './custom/client';
 
 export { getSpanKind } from './utils/getSpanKind';
 
-export { getScopesFromContext, setScopesOnContext } from './utils/contextData';
+export { getScopesFromContext } from './utils/contextData';
 
 export {
   spanHasAttributes,