Merge remote-tracking branch 'origin/develop' into lforst-nextjs-otel

Author: Luca Forstner

dev-packages/node-integration-tests/suites/tracing-experimental/prisma-orm/scenario.js

@@ -9,6 +9,7 @@ Sentry.init({
   release: '1.0',
   tracesSampleRate: 1.0,
   transport: loggingTransport,
+  integrations: [Sentry.prismaIntegration()],
 });
 
 // Stop the process from exiting before the transaction is sent

packages/astro/src/server/sdk.ts

@@ -1,6 +1,5 @@
 import { applySdkMetadata } from '@sentry/core';
 import type { NodeOptions } from '@sentry/node';
-import { getDefaultIntegrations } from '@sentry/node';
 import { init as initNodeSdk, setTag } from '@sentry/node';
 
 /**
@@ -10,9 +9,6 @@ import { init as initNodeSdk, setTag } from '@sentry/node';
 export function init(options: NodeOptions): void {
   const opts = {
     ...options,
-    // TODO v8: For now, we disable the Prisma integration, because that has weird esm-cjs interop issues
-    // We should figure these out and fix these before v8 goes stable.
-    defaultIntegrations: getDefaultIntegrations(options).filter(integration => integration.name !== 'Prisma'),
   };
   applySdkMetadata(opts, 'astro', ['astro', 'node']);
 

packages/core/src/utils/spanUtils.ts

@@ -85,12 +85,10 @@ function ensureTimestampInSeconds(timestamp: number): number {
 
 /**
  * Convert a span to a JSON representation.
- * Note that all fields returned here are optional and need to be guarded against.
- *
- * Note: Because of this, we currently have a circular type dependency (which we opted out of in package.json).
- * This is not avoidable as we need `spanToJSON` in `spanUtils.ts`, which in turn is needed by `span.ts` for backwards compatibility.
- * And `spanToJSON` needs the Span class from `span.ts` to check here.
  */
+// Note: Because of this, we currently have a circular type dependency (which we opted out of in package.json).
+// This is not avoidable as we need `spanToJSON` in `spanUtils.ts`, which in turn is needed by `span.ts` for backwards compatibility.
+// And `spanToJSON` needs the Span class from `span.ts` to check here.
 export function spanToJSON(span: Span): Partial<SpanJSON> {
   if (spanIsSentrySpan(span)) {
     return span.getSpanJSON();

packages/nextjs/src/config/webpack.ts

@@ -60,6 +60,10 @@ export function constructWebpackConfigFunction(
     const { isServer, dev: isDev, dir: projectDir } = buildContext;
     const runtime = isServer ? (buildContext.nextRuntime === 'edge' ? 'edge' : 'server') : 'client';
 
+    if (runtime !== 'client') {
+      warnAboutDeprecatedConfigFiles(projectDir, runtime);
+    }
+
     let rawNewConfig = { ...incomingConfig };
 
     // if user has custom webpack config (which always takes the form of a function), run it so we have actual values to
@@ -508,25 +512,23 @@ async function addSentryToClientEntryProperty(
  * Searches for old `sentry.(server|edge).config.ts` files and warns if it finds any.
  *
  * @param projectDir The root directory of the project, where config files would be located
- * @param platform Either "server", "client" or "edge", so that we know which file to look for
+ * @param platform Either "server" or "edge", so that we know which file to look for
  */
-export function warnAboutDeprecatedConfigFiles(projectDir: string, platform: 'server' | 'client' | 'edge'): void {
+function warnAboutDeprecatedConfigFiles(projectDir: string, platform: 'server' | 'edge'): void {
   const possibilities = [`sentry.${platform}.config.ts`, `sentry.${platform}.config.js`];
 
   for (const filename of possibilities) {
     if (fs.existsSync(path.resolve(projectDir, filename))) {
-      if (platform === 'server' || platform === 'edge') {
-        // eslint-disable-next-line no-console
-        console.warn(
-          `[@sentry/nextjs] It seems you have configured a \`${filename}\` file. You need to put this file's content into a Next.js instrumentation hook instead! Read more: https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation`,
-        );
-      }
+      // eslint-disable-next-line no-console
+      console.warn(
+        `[@sentry/nextjs] It appears you've configured a \`${filename}\` file. Please ensure to put this file's content into the \`register()\` function of a Next.js instrumentation hook instead. To ensure correct functionality of the SDK, \`Sentry.init\` must be called inside \`instrumentation.ts\`. Learn more about setting up an instrumentation hook in Next.js: https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation. You can safely delete the \`${filename}\` file afterward.`,
+      );
     }
   }
 }
 
 /**
- * Searches for a `sentry.client.config.ts|js` file and returns it's file name if it finds one. (ts being prioritized)
+ * Searches for a `sentry.client.config.ts|js` file and returns its file name if it finds one. (ts being prioritized)
  *
  * @param projectDir The root directory of the project, where config files would be located
  */

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

@@ -11,7 +11,6 @@ import { mysqlIntegration } from './mysql';
 import { mysql2Integration } from './mysql2';
 import { nestIntegration } from './nest';
 import { postgresIntegration } from './postgres';
-import { prismaIntegration } from './prisma';
 
 /**
  * With OTEL, all performance integrations will be added, as OTEL only initializes them when the patched package is actually required.
@@ -26,7 +25,10 @@ export function getAutoPerformanceIntegrations(): Integration[] {
     mysqlIntegration(),
     mysql2Integration(),
     postgresIntegration(),
-    prismaIntegration(),
+    // For now, we do not include prisma by default because it has ESM issues
+    // See https://github.com/prisma/prisma/issues/23410
+    // TODO v8: Figure out a better solution for this, maybe only disable in ESM mode?
+    // prismaIntegration(),
     nestIntegration(),
     hapiIntegration(),
     koaIntegration(),

packages/opentelemetry/src/spanExporter.ts

@@ -178,7 +178,7 @@ function createTransactionForOtelSpan(span: ReadableSpan): TransactionEvent {
     data: attributes,
     origin,
     op,
-    status: getStatusMessage(status),
+    status: getStatusMessage(status), // As per protocol, span status is allowed to be undefined
   });
 
   const transactionEvent: TransactionEvent = {
@@ -252,7 +252,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], remai
     start_timestamp: convertOtelTimeToSeconds(startTime),
     // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
     timestamp: convertOtelTimeToSeconds(endTime) || undefined,
-    status: getStatusMessage(status),
+    status: getStatusMessage(status), // As per protocol, span status is allowed to be undefined
     op,
     origin,
     _metrics_summary: getMetricSummaryJsonForSpan(span as unknown as Span),

packages/opentelemetry/src/trace.ts

@@ -12,6 +12,7 @@ import {
   getDynamicSamplingContextFromClient,
   getRootSpan,
   handleCallbackErrors,
+  spanToJSON,
 } from '@sentry/core';
 import type { Client, Scope } from '@sentry/types';
 import { continueTraceAsRemoteSpan, getSamplingDecision, makeTraceState } from './propagator';
@@ -46,7 +47,10 @@ export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span:
     return handleCallbackErrors(
       () => callback(span),
       () => {
-        span.setStatus({ code: SpanStatusCode.ERROR });
+        // Only set the span status to ERROR when there wasn't any status set before, in order to avoid stomping useful span statuses
+        if (spanToJSON(span).status === undefined) {
+          span.setStatus({ code: SpanStatusCode.ERROR });
+        }
       },
       () => span.end(),
     );
@@ -82,7 +86,10 @@ export function startSpanManual<T>(
     return handleCallbackErrors(
       () => callback(span, () => span.end()),
       () => {
-        span.setStatus({ code: SpanStatusCode.ERROR });
+        // Only set the span status to ERROR when there wasn't any status set before, in order to avoid stomping useful span statuses
+        if (spanToJSON(span).status === undefined) {
+          span.setStatus({ code: SpanStatusCode.ERROR });
+        }
       },
     );
   });