ref(node): Extract framework wrapping warning into utility function

getsentry · May 21, 2024 · e123f24 · e123f24
1 parent 40f399c
commit e123f24
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 112 deletions.
diff --git a/packages/node/src/integrations/tracing/connect.ts b/packages/node/src/integrations/tracing/connect.ts
@@ -1,19 +1,15 @@
-import { isWrapped } from '@opentelemetry/core';
 import { ConnectInstrumentation } from '@opentelemetry/instrumentation-connect';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   captureException,
   defineIntegration,
   getClient,
-  hasTracingEnabled,
-  isEnabled,
   spanToJSON,
 } from '@sentry/core';
 import { addOpenTelemetryInstrumentation } from '@sentry/opentelemetry';
 import type { IntegrationFn, Span } from '@sentry/types';
-import { consoleSandbox } from '@sentry/utils';
-import { isCjs } from '../../sdk/init';
+import { ensureIsWrapped } from '../../utils/ensureIsWrapped';
 
 type ConnectApp = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -50,21 +46,7 @@ export const setupConnectErrorHandler = (app: ConnectApp): void => {
     });
   }
 
-  if (!isWrapped(app.use) && isEnabled() && hasTracingEnabled()) {
-    consoleSandbox(() => {
-      if (isCjs()) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Connect is not instrumented. This is likely because you required/imported connect before calling `Sentry.init()`.',
-        );
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Connect is not instrumented. Please make sure to initialize Sentry in a separate file that you `--import` when running node, see: https://docs.sentry.io/platforms/javascript/guides/connect/install/esm/.',
-        );
-      }
-    });
-  }
+  ensureIsWrapped(app.use, 'connect');
 };
 
 function addConnectSpanAttributes(span: Span): void {

diff --git a/packages/node/src/integrations/tracing/express.ts b/packages/node/src/integrations/tracing/express.ts
@@ -1,23 +1,14 @@
 import type * as http from 'node:http';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  defineIntegration,
-  getDefaultIsolationScope,
-  hasTracingEnabled,
-  isEnabled,
-  spanToJSON,
-} from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, defineIntegration, getDefaultIsolationScope, spanToJSON } from '@sentry/core';
 import { captureException, getClient, getIsolationScope } from '@sentry/core';
 import { addOpenTelemetryInstrumentation } from '@sentry/opentelemetry';
 import type { IntegrationFn } from '@sentry/types';
-
-import { isWrapped } from '@opentelemetry/core';
-import { consoleSandbox, logger } from '@sentry/utils';
+import { logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../../debug-build';
 import type { NodeClient } from '../../sdk/client';
-import { isCjs } from '../../sdk/init';
 import { addOriginToSpan } from '../../utils/addOriginToSpan';
+import { ensureIsWrapped } from '../../utils/ensureIsWrapped';
 
 const _expressIntegration = (() => {
   return {
@@ -140,24 +131,7 @@ export function expressErrorHandler(options?: {
  */
 export function setupExpressErrorHandler(app: { use: (middleware: ExpressMiddleware) => unknown }): void {
   app.use(expressErrorHandler());
-
-  if (!isWrapped(app.use) && isEnabled() && hasTracingEnabled()) {
-    consoleSandbox(() => {
-      consoleSandbox(() => {
-        if (isCjs()) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            '[Sentry] Express is not instrumented. This is likely because you required/imported express before calling `Sentry.init()`.',
-          );
-        } else {
-          // eslint-disable-next-line no-console
-          console.warn(
-            '[Sentry] Express is not instrumented. Please make sure to initialize Sentry in a separate file that you `--import` when running node, see: https://docs.sentry.io/platforms/javascript/guides/express/install/esm/.',
-          );
-        }
-      });
-    });
-  }
+  ensureIsWrapped(app.use, 'express');
 }
 
 function getStatusCodeFromResponse(error: MiddlewareError): number {

diff --git a/packages/node/src/integrations/tracing/fastify.ts b/packages/node/src/integrations/tracing/fastify.ts
@@ -1,4 +1,3 @@
-import { isWrapped } from '@opentelemetry/core';
 import { FastifyInstrumentation } from '@opentelemetry/instrumentation-fastify';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
@@ -7,14 +6,11 @@ import {
   defineIntegration,
   getClient,
   getIsolationScope,
-  hasTracingEnabled,
-  isEnabled,
   spanToJSON,
 } from '@sentry/core';
 import { addOpenTelemetryInstrumentation } from '@sentry/opentelemetry';
 import type { IntegrationFn, Span } from '@sentry/types';
-import { consoleSandbox } from '@sentry/utils';
-import { isCjs } from '../../sdk/init';
+import { ensureIsWrapped } from '../../utils/ensureIsWrapped';
 
 // We inline the types we care about here
 interface Fastify {
@@ -103,23 +99,7 @@ export function setupFastifyErrorHandler(fastify: Fastify): void {
     });
   }
 
-  if (!isWrapped(fastify.addHook) && isEnabled() && hasTracingEnabled()) {
-    consoleSandbox(() => {
-      consoleSandbox(() => {
-        if (isCjs()) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            '[Sentry] Fastify is not instrumented. This is likely because you required/imported fastify before calling `Sentry.init()`.',
-          );
-        } else {
-          // eslint-disable-next-line no-console
-          console.warn(
-            '[Sentry] Fastify is not instrumented. Please make sure to initialize Sentry in a separate file that you `--import` when running node, see: https://docs.sentry.io/platforms/javascript/guides/fastify/install/esm/',
-          );
-        }
-      });
-    });
-  }
+  ensureIsWrapped(fastify.addHook, 'fastify');
 }
 
 function addFastifySpanAttributes(span: Span): void {

diff --git a/packages/node/src/integrations/tracing/hapi/index.ts b/packages/node/src/integrations/tracing/hapi/index.ts
@@ -1,4 +1,3 @@
-import { isWrapped } from '@opentelemetry/core';
 import { HapiInstrumentation } from '@opentelemetry/instrumentation-hapi';
 import {
   SDK_VERSION,
@@ -12,15 +11,13 @@ import {
   getDefaultIsolationScope,
   getIsolationScope,
   getRootSpan,
-  hasTracingEnabled,
-  isEnabled,
   spanToJSON,
 } from '@sentry/core';
 import { addOpenTelemetryInstrumentation } from '@sentry/opentelemetry';
 import type { IntegrationFn, Span } from '@sentry/types';
-import { consoleSandbox, logger } from '@sentry/utils';
+import { logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../../../debug-build';
-import { isCjs } from '../../../sdk/init';
+import { ensureIsWrapped } from '../../../utils/ensureIsWrapped';
 import type { Boom, RequestEvent, ResponseObject, Server } from './types';
 
 const _hapiIntegration = (() => {
@@ -112,21 +109,7 @@ export async function setupHapiErrorHandler(server: Server): Promise<void> {
   }
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  if (!isWrapped(server.register) && isEnabled() && hasTracingEnabled()) {
-    consoleSandbox(() => {
-      if (isCjs()) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Hapi is not instrumented. This is likely because you required/imported hapi before calling `Sentry.init()`.',
-        );
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Hapi is not instrumented. Please make sure to initialize Sentry in a separate file that you `--import` when running node, see: https://docs.sentry.io/platforms/javascript/guides/hapi/install/esm/',
-        );
-      }
-    });
-  }
+  ensureIsWrapped(server.register, 'hapi');
 }
 
 function addHapiSpanAttributes(span: Span): void {

diff --git a/packages/node/src/integrations/tracing/koa.ts b/packages/node/src/integrations/tracing/koa.ts
@@ -1,4 +1,3 @@
-import { isWrapped } from '@opentelemetry/core';
 import { KoaInstrumentation } from '@opentelemetry/instrumentation-koa';
 import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
 import {
@@ -8,15 +7,13 @@ import {
   defineIntegration,
   getDefaultIsolationScope,
   getIsolationScope,
-  hasTracingEnabled,
-  isEnabled,
   spanToJSON,
 } from '@sentry/core';
 import { addOpenTelemetryInstrumentation } from '@sentry/opentelemetry';
 import type { IntegrationFn, Span } from '@sentry/types';
-import { consoleSandbox, logger } from '@sentry/utils';
+import { logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../../debug-build';
-import { isCjs } from '../../sdk/init';
+import { ensureIsWrapped } from '../../utils/ensureIsWrapped';
 
 function addKoaSpanAttributes(span: Span): void {
   span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.http.otel.koa');
@@ -78,19 +75,5 @@ export const setupKoaErrorHandler = (app: { use: (arg0: (ctx: any, next: any) =>
     }
   });
 
-  if (!isWrapped(app.use) && isEnabled() && hasTracingEnabled()) {
-    consoleSandbox(() => {
-      if (isCjs()) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Koa is not instrumented. This is likely because you required/imported koa before calling `Sentry.init()`.',
-        );
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[Sentry] Koa is not instrumented. Please make sure to initialize Sentry in a separate file that you `--import` when running node, see: https://docs.sentry.io/platforms/javascript/guides/koa/install/esm/',
-        );
-      }
-    });
-  }
+  ensureIsWrapped(app.use, 'koa');
 };
diff --git a/packages/node/src/utils/ensureIsWrapped.ts b/packages/node/src/utils/ensureIsWrapped.ts
@@ -0,0 +1,28 @@
+import { isWrapped } from '@opentelemetry/core';
+import { hasTracingEnabled, isEnabled } from '@sentry/core';
+import { consoleSandbox } from '@sentry/utils';
+import { isCjs } from '../sdk/init';
+
+/**
+ * Checks and warns if a framework isn't wrapped by opentelemetry.
+ */
+export function ensureIsWrapped(
+  maybeWrappedModule: unknown,
+  name: 'express' | 'connect' | 'fastify' | 'hapi' | 'koa',
+): void {
+  if (!isWrapped(maybeWrappedModule) && isEnabled() && hasTracingEnabled()) {
+    consoleSandbox(() => {
+      if (isCjs()) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `[Sentry] ${name} is not instrumented. This is likely because you required/imported ${name} before calling \`Sentry.init()\`.`,
+        );
+      } else {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `[Sentry] ${name} is not instrumented. Please make sure to initialize Sentry in a separate file that you \`--import\` when running node, see: https://docs.sentry.io/platforms/javascript/guides/${name}/install/esm/.`,
+        );
+      }
+    });
+  }
+}