chore: Dedupe @sentry/core imports (#14529)

I noticed we have a whole bunch of files that have multiple imports from
`@sentry/core`, so I went over all of those I could find and ran VSCode
auto-import-ordering to clean this up. Would be nice to have this taken
care of by eslint/biome, but somehow this does not seem to work... :(

This for sure does not capture everything, but a good amount of
duplication at least.

Author: mydea

packages/angular/src/sdk.ts

@@ -4,17 +4,18 @@ import {
   breadcrumbsIntegration,
   globalHandlersIntegration,
   httpContextIntegration,
+  init as browserInit,
   linkedErrorsIntegration,
+  setContext,
 } from '@sentry/browser';
-import { init as browserInit, setContext } from '@sentry/browser';
+import type { Client, Integration } from '@sentry/core';
 import {
   applySdkMetadata,
   dedupeIntegration,
   functionToStringIntegration,
   inboundFiltersIntegration,
+  logger,
 } from '@sentry/core';
-import { logger } from '@sentry/core';
-import type { Client, Integration } from '@sentry/core';
 
 import { IS_DEBUG_BUILD } from './flags';
 

packages/aws-serverless/src/sdk.ts

@@ -2,8 +2,8 @@ import { existsSync } from 'fs';
 import { hostname } from 'os';
 import { basename, resolve } from 'path';
 import { types } from 'util';
-import { logger } from '@sentry/core';
 import type { Integration, Options, Scope, SdkMetadata, Span } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, logger } from '@sentry/core';
 import type { NodeClient, NodeOptions } from '@sentry/node';
 import {
   SDK_VERSION,
@@ -19,9 +19,6 @@ import {
 } from '@sentry/node';
 import type { Context, Handler } from 'aws-lambda';
 import { performance } from 'perf_hooks';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-
 import { DEBUG_BUILD } from './debug-build';
 import { awsIntegration } from './integration/aws';
 import { awsLambdaIntegration } from './integration/awslambda';

packages/browser-utils/src/instrument/dom.ts

@@ -1,5 +1,4 @@
 import type { HandlerDataDom } from '@sentry/core';
-
 import { addHandler, addNonEnumerableProperty, fill, maybeInstrument, triggerHandlers, uuid4 } from '@sentry/core';
 import { WINDOW } from '../types';
 

packages/browser-utils/src/instrument/xhr.ts

@@ -1,5 +1,4 @@
 import type { HandlerDataXhr, SentryWrappedXMLHttpRequest } from '@sentry/core';
-
 import { addHandler, isString, maybeInstrument, timestampInSeconds, triggerHandlers } from '@sentry/core';
 import { WINDOW } from '../types';
 

packages/browser-utils/src/metrics/browserMetrics.ts

@@ -1,10 +1,15 @@
 /* eslint-disable max-lines */
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan } from '@sentry/core';
-import { setMeasurement } from '@sentry/core';
-import { browserPerformanceTimeOrigin, getComponentName, htmlTreeAsString, parseUrl } from '@sentry/core';
 import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sentry/core';
-
-import { spanToJSON } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  browserPerformanceTimeOrigin,
+  getActiveSpan,
+  getComponentName,
+  htmlTreeAsString,
+  parseUrl,
+  setMeasurement,
+  spanToJSON,
+} from '@sentry/core';
 import { WINDOW } from '../types';
 import { trackClsAsStandaloneSpan } from './cls';
 import {
@@ -228,7 +233,7 @@ export function startTrackingInteractions(): void {
   });
 }
 
-export { startTrackingINP, registerInpInteractionListener } from './inp';
+export { registerInpInteractionListener, startTrackingINP } from './inp';
 
 /**
  * Starts tracking the Cumulative Layout Shift on the current page and collects the value and last entry

packages/browser-utils/src/metrics/inp.ts

@@ -1,16 +1,18 @@
+import type { Span, SpanAttributes } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
   SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
   SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  browserPerformanceTimeOrigin,
+  dropUndefinedKeys,
   getActiveSpan,
   getCurrentScope,
   getRootSpan,
+  htmlTreeAsString,
   spanToJSON,
 } from '@sentry/core';
-import { browserPerformanceTimeOrigin, dropUndefinedKeys, htmlTreeAsString } from '@sentry/core';
-import type { Span, SpanAttributes } from '@sentry/core';
 import {
   addInpInstrumentationHandler,
   addPerformanceInstrumentationHandler,

packages/browser-utils/src/metrics/utils.ts

@@ -1,6 +1,5 @@
-import type { SentrySpan } from '@sentry/core';
+import type { Integration, SentrySpan, Span, SpanAttributes, SpanTimeInput, StartSpanOptions } from '@sentry/core';
 import { getClient, getCurrentScope, spanToJSON, startInactiveSpan, withActiveSpan } from '@sentry/core';
-import type { Integration, Span, SpanAttributes, SpanTimeInput, StartSpanOptions } from '@sentry/core';
 import { WINDOW } from '../types';
 
 /**

packages/browser/src/client.ts

@@ -1,7 +1,3 @@
-import type { Scope } from '@sentry/core';
-import { applySdkMetadata } from '@sentry/core';
-import { BaseClient } from '@sentry/core';
-import { getSDKSource, logger } from '@sentry/core';
 import type {
   BrowserClientProfilingOptions,
   BrowserClientReplayOptions,
@@ -10,10 +6,11 @@ import type {
   EventHint,
   Options,
   ParameterizedString,
+  Scope,
   SeverityLevel,
   UserFeedback,
 } from '@sentry/core';
-
+import { BaseClient, applySdkMetadata, getSDKSource, logger } from '@sentry/core';
 import { DEBUG_BUILD } from './debug-build';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';

packages/browser/src/eventbuilder.ts

@@ -1,8 +1,17 @@
-import { getClient } from '@sentry/core';
+import type {
+  Event,
+  EventHint,
+  Exception,
+  ParameterizedString,
+  SeverityLevel,
+  StackFrame,
+  StackParser,
+} from '@sentry/core';
 import {
   addExceptionMechanism,
   addExceptionTypeValue,
   extractExceptionKeysForMessage,
+  getClient,
   isDOMError,
   isDOMException,
   isError,
@@ -13,15 +22,6 @@ import {
   normalizeToSize,
   resolvedSyncPromise,
 } from '@sentry/core';
-import type {
-  Event,
-  EventHint,
-  Exception,
-  ParameterizedString,
-  SeverityLevel,
-  StackFrame,
-  StackParser,
-} from '@sentry/core';
 
 type Prototype = { constructor: (...args: unknown[]) => unknown };
 

packages/browser/src/helpers.ts

@@ -1,13 +1,14 @@
-import { captureException, withScope } from '@sentry/core';
+import type { Mechanism, WrappedFunction } from '@sentry/core';
 import {
   GLOBAL_OBJ,
   addExceptionMechanism,
   addExceptionTypeValue,
   addNonEnumerableProperty,
+  captureException,
   getOriginalFunction,
   markFunctionWrapped,
+  withScope,
 } from '@sentry/core';
-import type { Mechanism, WrappedFunction } from '@sentry/core';
 
 export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;