Use nativeNodeFetchIntegration for ESM too

Author: timfish

packages/node-experimental/src/integrations/node-fetch.ts

@@ -27,30 +27,29 @@ const _nativeNodeFetchIntegration = ((options: NodeFetchOptions = {}) => {
   const _breadcrumbs = typeof options.breadcrumbs === 'undefined' ? true : options.breadcrumbs;
   const _ignoreOutgoingRequests = options.ignoreOutgoingRequests;
 
-  function getInstrumentation(): [Instrumentation] | void {
+  async function getInstrumentation(): Promise<[Instrumentation] | void> {
     // Only add NodeFetch if Node >= 16, as previous versions do not support it
     if (NODE_MAJOR < 16) {
       return;
     }
 
     try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { FetchInstrumentation } = require('opentelemetry-instrumentation-fetch-node');
+      const pkg = await import('opentelemetry-instrumentation-fetch-node');
       return [
-        new FetchInstrumentation({
+        new pkg.FetchInstrumentation({
           ignoreRequestHook: (request: { origin?: string }) => {
             const url = request.origin;
             return _ignoreOutgoingRequests && url && _ignoreOutgoingRequests(url);
           },
-
           onRequest: ({ span }: { span: Span }) => {
             _updateSpan(span);
 
             if (_breadcrumbs) {
               _addRequestBreadcrumb(span);
             }
           },
-        }),
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any),
       ];
     } catch (error) {
       // Could not load instrumentation
@@ -60,13 +59,14 @@ const _nativeNodeFetchIntegration = ((options: NodeFetchOptions = {}) => {
   return {
     name: 'NodeFetch',
     setupOnce() {
-      const instrumentations = getInstrumentation();
-
-      if (instrumentations) {
-        registerInstrumentations({
-          instrumentations,
-        });
-      }
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      getInstrumentation().then(instrumentations => {
+        if (instrumentations) {
+          registerInstrumentations({
+            instrumentations,
+          });
+        }
+      });
     },
   };
 }) satisfies IntegrationFn;

packages/node-experimental/src/integrations/tracing/prisma.ts

@@ -1,5 +1,5 @@
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
-// When importing CommonJs modules into an ESM module, we import the named exports directly.
+// When importing CJS modules into an ESM module, we cannot import the named exports directly.
 import * as prismaInstrumentation from '@prisma/instrumentation';
 import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';

packages/node-experimental/src/sdk/init.ts

@@ -40,7 +40,7 @@ import { NodeClient } from './client';
 import { initOtel } from './initOtel';
 
 function getCjsOnlyIntegrations(isCjs = typeof require !== 'undefined'): Integration[] {
-  return isCjs ? [nativeNodeFetchIntegration(), modulesIntegration()] : [];
+  return isCjs ? [modulesIntegration()] : [];
 }
 
 /** Get the default integrations for the Node Experimental SDK. */
@@ -55,6 +55,7 @@ export function getDefaultIntegrations(options: Options): Integration[] {
     // Native Wrappers
     consoleIntegration(),
     httpIntegration(),
+    nativeNodeFetchIntegration(),
     // Global Handlers
     onUncaughtExceptionIntegration(),
     onUnhandledRejectionIntegration(),

packages/node-experimental/tsconfig.json

@@ -4,6 +4,7 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "lib": ["es6"]
+    "lib": ["es6"],
+    "module": "Node16",
   }
 }