Merge remote-tracking branch 'origin/develop' into lforst-deprecate-hub-constructor

Author: lforst

.craft.yml

@@ -132,9 +132,6 @@ targets:
     includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
 
   ## 8. Deprecated packages we still release (but no packages depend on them anymore)
-  - name: npm
-    id: '@sentry/hub'
-    includeNames: /^sentry-hub-\d.*\.tgz$/
   - name: npm
     id: '@sentry/tracing'
     includeNames: /^sentry-tracing-\d.*\.tgz$/

MIGRATION.md

@@ -11,6 +11,10 @@ enum. If you were using the `Severity` enum, you should replace it with the `Sev
 The `Offline` integration has been removed in favor of the offline transport wrapper:
 http://docs.sentry.io/platforms/javascript/configuration/transports/#offline-caching
 
+## Other changes
+
+- Remove `spanStatusfromHttpCode` in favour of `getSpanStatusFromHttpCode` (#10361)
+
 # Deprecations in 7.x
 
 You can use the **Experimental** [@sentry/migr8](https://www.npmjs.com/package/@sentry/migr8) to automatically update

dev-packages/browser-integration-tests/utils/generatePlugin.ts

@@ -115,7 +115,7 @@ export const LOADER_CONFIGS: Record<string, { options: Record<string, unknown>;
  * When using compiled versions of the tracing and browser packages, their aliases look for example like
  *     '@sentry/browser': 'path/to/sentry-javascript/packages/browser/esm/index.js'
  * and all other monorepo packages' aliases look for example like
- *     '@sentry/hub': 'path/to/sentry-javascript/packages/hub'
+ *     '@sentry/react': 'path/to/sentry-javascript/packages/react'
  *
  * When using bundled versions of the tracing and browser packages, all aliases look for example like
  *     '@sentry/browser': false

dev-packages/e2e-tests/test-applications/generic-ts3.8/index.ts

@@ -3,8 +3,6 @@ import * as _SentryBrowser from '@sentry/browser';
 // biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryCore from '@sentry/core';
 // biome-ignore lint/nursery/noUnusedImports:
-import * as _SentryHub from '@sentry/hub';
-// biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryIntegrations from '@sentry/integrations';
 // biome-ignore lint/nursery/noUnusedImports:
 import * as _SentryNode from '@sentry/node';

dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json

@@ -15,7 +15,6 @@
   "dependencies": {
     "@sentry/browser": "latest || *",
     "@sentry/core": "latest || *",
-    "@sentry/hub": "latest || *",
     "@sentry/integrations": "latest || *",
     "@sentry/node": "latest || *",
     "@sentry/opentelemetry-node": "latest || *",

dev-packages/e2e-tests/verdaccio-config/config.yaml

@@ -86,12 +86,6 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/hub':
-    access: $all
-    publish: $all
-    unpublish: $all
-    # proxy: npmjs # Don't proxy for E2E tests!
-
   '@sentry/integrations':
     access: $all
     publish: $all

dev-packages/rollup-utils/plugins/bundlePlugins.mjs

@@ -157,7 +157,6 @@ export function makeTSPlugin(jsVersion) {
       paths: {
         '@sentry/browser': ['../browser/src'],
         '@sentry/core': ['../core/src'],
-        '@sentry/hub': ['../hub/src'],
         '@sentry/types': ['../types/src'],
         '@sentry/utils': ['../utils/src'],
         '@sentry-internal/integration-shims': ['../integration-shims/src'],

package.json

@@ -57,7 +57,6 @@
     "packages/eslint-plugin-sdk",
     "packages/feedback",
     "packages/gatsby",
-    "packages/hub",
     "packages/integrations",
     "packages/integration-shims",
     "packages/nextjs",

packages/astro/src/index.server.ts

@@ -46,8 +46,6 @@ export {
   setTag,
   setTags,
   setUser,
-  // eslint-disable-next-line deprecation/deprecation
-  spanStatusfromHttpCode,
   getSpanStatusFromHttpCode,
   setHttpStatus,
   // eslint-disable-next-line deprecation/deprecation
@@ -68,8 +66,6 @@ export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
   extractRequestData,
-  // eslint-disable-next-line deprecation/deprecation
-  deepReadDirSync,
   Integrations,
   consoleIntegration,
   onUncaughtExceptionIntegration,

packages/browser/src/exports.ts

@@ -109,4 +109,4 @@ export { linkedErrorsIntegration } from './integrations/linkederrors';
 export { browserApiErrorsIntegration } from './integrations/trycatch';
 
 // eslint-disable-next-line deprecation/deprecation
-export { GlobalHandlers, TryCatch, Breadcrumbs, LinkedErrors, HttpContext, Dedupe } from './integrations';
+export { TryCatch, Breadcrumbs, LinkedErrors, HttpContext, Dedupe } from './integrations';

packages/browser/src/index.ts

@@ -71,8 +71,6 @@ export {
   extractTraceparentData,
   // eslint-disable-next-line deprecation/deprecation
   getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  spanStatusfromHttpCode,
   getSpanStatusFromHttpCode,
   setHttpStatus,
   // eslint-disable-next-line deprecation/deprecation

packages/browser/src/integrations/globalhandlers.ts

@@ -1,19 +1,9 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { captureEvent, convertIntegrationFnToClass, defineIntegration, getClient } from '@sentry/core';
-import type {
-  Client,
-  Event,
-  Integration,
-  IntegrationClass,
-  IntegrationFn,
-  Primitive,
-  StackParser,
-} from '@sentry/types';
+import { captureEvent, defineIntegration, getClient } from '@sentry/core';
+import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/types';
 import {
   addGlobalErrorInstrumentationHandler,
   addGlobalUnhandledRejectionInstrumentationHandler,
   getLocationHref,
-  isErrorEvent,
   isPrimitive,
   isString,
   logger,
@@ -57,18 +47,6 @@ const _globalHandlersIntegration = ((options: Partial<GlobalHandlersIntegrations
 
 export const globalHandlersIntegration = defineIntegration(_globalHandlersIntegration);
 
-/**
- * Global handlers.
- * @deprecated Use `globalHandlersIntegration()` instead.
- */
-// eslint-disable-next-line deprecation/deprecation
-export const GlobalHandlers = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  globalHandlersIntegration,
-) as IntegrationClass<Integration & { setup: (client: Client) => void }> & {
-  new (options?: Partial<GlobalHandlersIntegrations>): Integration;
-};
-
 function _installGlobalOnErrorHandler(client: Client): void {
   addGlobalErrorInstrumentationHandler(data => {
     const { stackParser, attachStacktrace } = getOptions();
@@ -79,15 +57,12 @@ function _installGlobalOnErrorHandler(client: Client): void {
 
     const { msg, url, line, column, error } = data;
 
-    const event =
-      error === undefined && isString(msg)
-        ? _eventFromIncompleteOnError(msg, url, line, column)
-        : _enhanceEventWithInitialFrame(
-            eventFromUnknownInput(stackParser, error || msg, undefined, attachStacktrace, false),
-            url,
-            line,
-            column,
-          );
+    const event = _enhanceEventWithInitialFrame(
+      eventFromUnknownInput(stackParser, error || msg, undefined, attachStacktrace, false),
+      url,
+      line,
+      column,
+    );
 
     event.level = 'error';
 
@@ -132,24 +107,23 @@ function _getUnhandledRejectionError(error: unknown): unknown {
     return error;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const e = error as any;
-
   // dig the object of the rejection out of known event types
   try {
+    type ErrorWithReason = { reason: unknown };
     // PromiseRejectionEvents store the object of the rejection under 'reason'
     // see https://developer.mozilla.org/en-US/docs/Web/API/PromiseRejectionEvent
-    if ('reason' in e) {
-      return e.reason;
+    if ('reason' in (error as ErrorWithReason)) {
+      return (error as ErrorWithReason).reason;
     }
 
+    type CustomEventWithDetail = { detail: { reason: unknown } };
     // something, somewhere, (likely a browser extension) effectively casts PromiseRejectionEvents
     // to CustomEvents, moving the `promise` and `reason` attributes of the PRE into
     // the CustomEvent's `detail` attribute, since they're not part of CustomEvent's spec
     // see https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent and
     // https://github.com/getsentry/sentry-javascript/issues/2380
-    else if ('detail' in e && 'reason' in e.detail) {
-      return e.detail.reason;
+    if ('detail' in (error as CustomEventWithDetail) && 'reason' in (error as CustomEventWithDetail).detail) {
+      return (error as CustomEventWithDetail).detail.reason;
     }
   } catch {} // eslint-disable-line no-empty
 
@@ -176,38 +150,6 @@ function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
   };
 }
 
-/**
- * This function creates a stack from an old, error-less onerror handler.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _eventFromIncompleteOnError(msg: any, url: any, line: any, column: any): Event {
-  const ERROR_TYPES_RE =
-    /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/i;
-
-  // If 'message' is ErrorEvent, get real message from inside
-  let message = isErrorEvent(msg) ? msg.message : msg;
-  let name = 'Error';
-
-  const groups = message.match(ERROR_TYPES_RE);
-  if (groups) {
-    name = groups[1];
-    message = groups[2];
-  }
-
-  const event = {
-    exception: {
-      values: [
-        {
-          type: name,
-          value: message,
-        },
-      ],
-    },
-  };
-
-  return _enhanceEventWithInitialFrame(event, url, line, column);
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function _enhanceEventWithInitialFrame(event: Event, url: any, line: any, column: any): Event {
   // event.exception

packages/browser/src/integrations/index.ts

@@ -1,5 +1,4 @@
 /* eslint-disable deprecation/deprecation */
-export { GlobalHandlers } from './globalhandlers';
 export { TryCatch } from './trycatch';
 export { Breadcrumbs } from './breadcrumbs';
 export { LinkedErrors } from './linkederrors';

packages/bun/src/index.ts

@@ -64,8 +64,6 @@ export {
   setTag,
   setTags,
   setUser,
-  // eslint-disable-next-line deprecation/deprecation
-  spanStatusfromHttpCode,
   getSpanStatusFromHttpCode,
   setHttpStatus,
   // eslint-disable-next-line deprecation/deprecation
@@ -89,8 +87,6 @@ export {
 } from '@sentry/core';
 export type { SpanStatusType } from '@sentry/core';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  deepReadDirSync,
   // eslint-disable-next-line deprecation/deprecation
   enableAnrDetection,
   // eslint-disable-next-line deprecation/deprecation

packages/core/src/tracing/index.ts

@@ -9,8 +9,6 @@ export { extractTraceparentData, getActiveTransaction } from './utils';
 export { SpanStatus } from './spanstatus';
 export {
   setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  spanStatusfromHttpCode,
   getSpanStatusFromHttpCode,
 } from './spanstatus';
 export type { SpanStatusType } from './spanstatus';

packages/core/src/tracing/spanstatus.ts

@@ -123,17 +123,6 @@ export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatusType {
   return 'unknown_error';
 }
 
-/**
- * Converts a HTTP status code into a {@link SpanStatusType}.
- *
- * @deprecated Use {@link spanStatusFromHttpCode} instead.
- * This export will be removed in v8 as the signature contains a typo.
- *
- * @param httpStatus The HTTP response status code.
- * @returns The span status or unknown_error.
- */
-export const spanStatusfromHttpCode = getSpanStatusFromHttpCode;
-
 /**
  * Sets the Http status attributes on the current span based on the http code.
  * Additionally, the span's status is updated, depending on the http code.