getsentry · AbhiPrasad · Feb 12, 2024 · Feb 9, 2024 · Feb 12, 2024 · Feb 12, 2024
diff --git a/...kages/e2e-tests/test-applications/nextjs-app-dir/pages/api/async-context-edge-endpoint.ts b/...kages/e2e-tests/test-applications/nextjs-app-dir/pages/api/async-context-edge-endpoint.ts
@@ -5,17 +5,17 @@ export const config = {
 };
 
 export default async function handler() {
-  // Without `runWithAsyncContext` and a working async context strategy the two spans created by `Sentry.trace()` would be nested.
+  // Without `runWithAsyncContext` and a working async context strategy the two spans created by `Sentry.startSpan()` would be nested.
 
   const outerSpanPromise = Sentry.runWithAsyncContext(() => {
-    return Sentry.trace({ name: 'outer-span' }, () => {
+    return Sentry.startSpan({ name: 'outer-span' }, () => {
       return new Promise<void>(resolve => setTimeout(resolve, 300));
     });
   });
 
   setTimeout(() => {
     Sentry.runWithAsyncContext(() => {
-      return Sentry.trace({ name: 'inner-span' }, () => {
+      return Sentry.startSpan({ name: 'inner-span' }, () => {
         return new Promise<void>(resolve => setTimeout(resolve, 100));
       });
     });

diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -11,11 +11,6 @@ const NODE_EXPORTS_IGNORE = [
   'default',
   // Probably generated by transpilation, no need to require it
   '__esModule',
-  // this function was deprecated almost immediately after it was introduced
-  // due to a name change (startSpan). No need to re-export it IMHO.
-  'startActiveSpan',
-  // this was never meant for external use (and documented as such)
-  'trace',
   // These Node exports were only made for type definition fixes (see #10339)
   'Undici',
   'Http',

diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
@@ -46,8 +46,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   autoDiscoverNodePerformanceMonitoringIntegrations,
@@ -78,8 +76,6 @@ export {
   setMeasurement,
   getActiveSpan,
   startSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startInactiveSpan,
   startSpanManual,
   continueTrace,

diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
@@ -74,8 +74,6 @@ export {
   getActiveTransaction,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   makeMultiplexedTransport,
   // eslint-disable-next-line deprecation/deprecation
   ModuleMetadata,

diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
@@ -62,8 +62,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   captureCheckIn,

diff --git a/packages/core/src/tracing/index.ts b/packages/core/src/tracing/index.ts
@@ -13,13 +13,9 @@ export {
 } from './spanstatus';
 export type { SpanStatusType } from './spanstatus';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   getActiveSpan,
   startSpan,
   startInactiveSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startSpanManual,
   continueTrace,
 } from './trace';

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
@@ -12,55 +12,6 @@ import { handleCallbackErrors } from '../utils/handleCallbackErrors';
 import { hasTracingEnabled } from '../utils/hasTracingEnabled';
 import { spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
 
-/**
- * Wraps a function with a transaction/span and finishes the span after the function is done.
- *
- * Note that if you have not enabled tracing extensions via `addTracingExtensions`
- * or you didn't set `tracesSampleRate`, this function will not generate spans
- * and the `span` returned from the callback will be undefined.
- *
- * This function is meant to be used internally and may break at any time. Use at your own risk.
- *
- * @internal
- * @private
- *
- * @deprecated Use `startSpan` instead.
- */
-export function trace<T>(
-  context: TransactionContext,
-  callback: (span?: Span) => T,
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  onError: (error: unknown, span?: Span) => void = () => {},
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  afterFinish: () => void = () => {},
-): T {
-  // eslint-disable-next-line deprecation/deprecation
-  const hub = getCurrentHub();
-  const scope = getCurrentScope();
-  // eslint-disable-next-line deprecation/deprecation
-  const parentSpan = scope.getSpan();
-
-  const ctx = normalizeContext(context);
-  const activeSpan = createChildSpanOrTransaction(hub, parentSpan, ctx);
-
-  // eslint-disable-next-line deprecation/deprecation
-  scope.setSpan(activeSpan);
-
-  return handleCallbackErrors(
-    () => callback(activeSpan),
-    error => {
-      activeSpan && activeSpan.setStatus('internal_error');
-      onError(error, activeSpan);
-    },
-    () => {
-      activeSpan && activeSpan.end();
-      // eslint-disable-next-line deprecation/deprecation
-      scope.setSpan(parentSpan);
-      afterFinish();
-    },
-  );
-}
-
 /**
  * Wraps a function with a transaction/span and finishes the span after the function is done.
  * The created span is the active span and will be used as parent by other spans created inside the function
@@ -105,11 +56,6 @@ export function startSpan<T>(context: StartSpanOptions, callback: (span: Span |
   });
 }
 
-/**
- * @deprecated Use {@link startSpan} instead.
- */
-export const startActiveSpan = startSpan;
-
 /**
  * Similar to `Sentry.startSpan`. Wraps a function with a transaction/span, but does not finish the span
  * after the function is done automatically. You'll have to call `span.end()` manually.

diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
@@ -61,8 +61,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   captureCheckIn,

diff --git a/packages/node-experimental/README.md b/packages/node-experimental/README.md
@@ -59,10 +59,10 @@ You can manual instrument using the following APIs:
 ```js
 const Sentry = require('@sentry/node-experimental');
 
-Sentry.startActiveSpan({ description: 'outer' }, function (span) {
+Sentry.startSpan({ description: 'outer' }, function (span) {
   span.setData(customData);
   doSomethingSlow();
-  Sentry.startActiveSpan({ description: 'inner' }, function() {
+  Sentry.startSpan({ description: 'inner' }, function() {
     // inner span is a child of outer span
     doSomethingVerySlow();
     // inner span is auto-ended when this callback ends
@@ -72,13 +72,13 @@ Sentry.startActiveSpan({ description: 'outer' }, function (span) {
 ```
 
 You can also create spans without marking them as the active span.
-Note that for most scenarios, we recommend the `startActiveSpan` syntax.
+Note that for most scenarios, we recommend the `startSpan` syntax.
 
 ```js
 const Sentry = require('@sentry/node-experimental');
 
 // This will _not_ be put on the scope/set as active, so no other spans will be attached to it
-const span = Sentry.startSpan({ description: 'non-active span' });
+const span = Sentry.startInactiveSpan({ description: 'non-active span' });
 
 doSomethingSlow();
 

diff --git a/packages/node-experimental/src/index.ts b/packages/node-experimental/src/index.ts
@@ -74,8 +74,6 @@ export {
   SDK_VERSION,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   captureCheckIn,
   withMonitor,
   hapiErrorPlugin,

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -61,17 +61,13 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   captureCheckIn,
   withMonitor,
   setMeasurement,
   getActiveSpan,
   startSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startInactiveSpan,
   startSpanManual,
   continueTrace,

diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts
@@ -50,8 +50,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   autoDiscoverNodePerformanceMonitoringIntegrations,

diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts
@@ -70,8 +70,6 @@ export {
   setMeasurement,
   getActiveSpan,
   startSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startInactiveSpan,
   startSpanManual,
   continueTrace,

diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
@@ -44,8 +44,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   autoDiscoverNodePerformanceMonitoringIntegrations,
@@ -76,8 +74,6 @@ export {
   setMeasurement,
   getActiveSpan,
   startSpan,
-  // eslint-disable-next-line deprecation/deprecation
-  startActiveSpan,
   startInactiveSpan,
   startSpanManual,
   continueTrace,

diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
@@ -61,8 +61,6 @@ export {
   setUser,
   getSpanStatusFromHttpCode,
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  trace,
   withScope,
   withIsolationScope,
   captureCheckIn,