diff --git a/packages/core/src/api.ts b/packages/core/src/api.ts index 2aea96fd825b..842e6f35be2d 100644 --- a/packages/core/src/api.ts +++ b/packages/core/src/api.ts @@ -1,6 +1,6 @@ import type { ReportDialogOptions } from './report-dialog'; -import type { DsnComponents, DsnLike } from './types-hoist/dsn'; -import type { SdkInfo } from './types-hoist/sdkinfo'; +import type { DsnComponents, DsnLike } from './types/dsn'; +import type { SdkInfo } from './types/sdkinfo'; import { dsnToString, makeDsn } from './utils/dsn'; export const SENTRY_API_VERSION = '7'; diff --git a/packages/core/src/attributes.ts b/packages/core/src/attributes.ts index 2a365e93f37d..7693bec46101 100644 --- a/packages/core/src/attributes.ts +++ b/packages/core/src/attributes.ts @@ -1,5 +1,5 @@ -import type { DurationUnit, FractionUnit, InformationUnit } from './types-hoist/measurement'; -import type { Primitive } from './types-hoist/misc'; +import type { DurationUnit, FractionUnit, InformationUnit } from './types/measurement'; +import type { Primitive } from './types/misc'; import { isPrimitive } from './utils/is'; export type RawAttributes = T & ValidatedAttributes; diff --git a/packages/core/src/breadcrumbs.ts b/packages/core/src/breadcrumbs.ts index d6e15fcd0b02..d511c6f5801f 100644 --- a/packages/core/src/breadcrumbs.ts +++ b/packages/core/src/breadcrumbs.ts @@ -1,5 +1,5 @@ import { getClient, getIsolationScope } from './currentScopes'; -import type { Breadcrumb, BreadcrumbHint } from './types-hoist/breadcrumb'; +import type { Breadcrumb, BreadcrumbHint } from './types/breadcrumb'; import { consoleSandbox } from './utils/debug-logger'; import { dateTimestampInSeconds } from './utils/time'; diff --git a/packages/core/src/browser-exports.ts b/packages/core/src/browser-exports.ts index 6750899da1ed..42cf373a125a 100644 --- a/packages/core/src/browser-exports.ts +++ b/packages/core/src/browser-exports.ts @@ -5,12 +5,12 @@ */ export { getComponentName, getLocationHref, htmlTreeAsString } from './utils/browser'; export { supportsDOMError, supportsHistory, supportsNativeFetch, supportsReportingObserver } from './utils/supports'; -export type { XhrBreadcrumbData, XhrBreadcrumbHint } from './types-hoist/breadcrumb'; +export type { XhrBreadcrumbData, XhrBreadcrumbHint } from './types/breadcrumb'; export type { HandlerDataXhr, HandlerDataDom, HandlerDataHistory, SentryXhrData, SentryWrappedXMLHttpRequest, -} from './types-hoist/instrument'; -export type { BrowserClientReplayOptions, BrowserClientProfilingOptions } from './types-hoist/browseroptions'; +} from './types/instrument'; +export type { BrowserClientReplayOptions, BrowserClientProfilingOptions } from './types/browseroptions'; diff --git a/packages/core/src/carrier.ts b/packages/core/src/carrier.ts index 992c30681924..70905e69ab94 100644 --- a/packages/core/src/carrier.ts +++ b/packages/core/src/carrier.ts @@ -2,8 +2,8 @@ import type { AsyncContextStack } from './asyncContext/stackStrategy'; import type { AsyncContextStrategy } from './asyncContext/types'; import type { Client } from './client'; import type { Scope } from './scope'; -import type { SerializedLog } from './types-hoist/log'; -import type { SerializedMetric } from './types-hoist/metric'; +import type { SerializedLog } from './types/log'; +import type { SerializedMetric } from './types/metric'; import { SDK_VERSION } from './utils/version'; import { GLOBAL_OBJ } from './utils/worldwide'; diff --git a/packages/core/src/checkin.ts b/packages/core/src/checkin.ts index 7037c9ebadb2..e00c1045b7d0 100644 --- a/packages/core/src/checkin.ts +++ b/packages/core/src/checkin.ts @@ -1,7 +1,7 @@ -import type { SerializedCheckIn } from './types-hoist/checkin'; -import type { DsnComponents } from './types-hoist/dsn'; -import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types-hoist/envelope'; -import type { SdkMetadata } from './types-hoist/sdkmetadata'; +import type { SerializedCheckIn } from './types/checkin'; +import type { DsnComponents } from './types/dsn'; +import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types/envelope'; +import type { SdkMetadata } from './types/sdkmetadata'; import { dsnToString } from './utils/dsn'; import { createEnvelope } from './utils/envelope'; diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts index dc56b6f22a3c..e5d42afcbb6f 100644 --- a/packages/core/src/client.ts +++ b/packages/core/src/client.ts @@ -14,29 +14,29 @@ import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingCon import { isStreamedBeforeSendSpanCallback } from './tracing/spans/beforeSendSpan'; import { extractGenAiSpansFromEvent } from './tracing/spans/extractGenAiSpans'; import { DEFAULT_TRANSPORT_BUFFER_SIZE } from './transports/base'; -import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types-hoist/breadcrumb'; -import type { CheckIn, MonitorConfig } from './types-hoist/checkin'; -import type { EventDropReason, Outcome } from './types-hoist/clientreport'; -import type { DataCategory } from './types-hoist/datacategory'; -import type { DsnComponents } from './types-hoist/dsn'; -import type { DynamicSamplingContext, Envelope } from './types-hoist/envelope'; -import type { ErrorEvent, Event, EventHint, EventType, TransactionEvent } from './types-hoist/event'; -import type { EventProcessor } from './types-hoist/eventprocessor'; -import type { FeedbackEvent } from './types-hoist/feedback'; -import type { Integration } from './types-hoist/integration'; -import type { Log } from './types-hoist/log'; -import type { Metric } from './types-hoist/metric'; -import type { Primitive } from './types-hoist/misc'; -import type { ClientOptions } from './types-hoist/options'; -import type { ParameterizedString } from './types-hoist/parameterize'; -import type { ReplayEndEvent, ReplayStartEvent } from './types-hoist/replay'; -import type { RequestEventData } from './types-hoist/request'; -import type { SdkMetadata } from './types-hoist/sdkmetadata'; -import type { Session, SessionAggregates } from './types-hoist/session'; -import type { SeverityLevel } from './types-hoist/severity'; -import type { Span, SpanAttributes, SpanContextData, SpanJSON, StreamedSpanJSON } from './types-hoist/span'; -import type { StartSpanOptions } from './types-hoist/startSpanOptions'; -import type { Transport, TransportMakeRequestResponse } from './types-hoist/transport'; +import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types/breadcrumb'; +import type { CheckIn, MonitorConfig } from './types/checkin'; +import type { EventDropReason, Outcome } from './types/clientreport'; +import type { DataCategory } from './types/datacategory'; +import type { DsnComponents } from './types/dsn'; +import type { DynamicSamplingContext, Envelope } from './types/envelope'; +import type { ErrorEvent, Event, EventHint, EventType, TransactionEvent } from './types/event'; +import type { EventProcessor } from './types/eventprocessor'; +import type { FeedbackEvent } from './types/feedback'; +import type { Integration } from './types/integration'; +import type { Log } from './types/log'; +import type { Metric } from './types/metric'; +import type { Primitive } from './types/misc'; +import type { ClientOptions } from './types/options'; +import type { ParameterizedString } from './types/parameterize'; +import type { ReplayEndEvent, ReplayStartEvent } from './types/replay'; +import type { RequestEventData } from './types/request'; +import type { SdkMetadata } from './types/sdkmetadata'; +import type { Session, SessionAggregates } from './types/session'; +import type { SeverityLevel } from './types/severity'; +import type { Span, SpanAttributes, SpanContextData, SpanJSON, StreamedSpanJSON } from './types/span'; +import type { StartSpanOptions } from './types/startSpanOptions'; +import type { Transport, TransportMakeRequestResponse } from './types/transport'; import { createClientReportEnvelope } from './utils/clientreport'; import { debug } from './utils/debug-logger'; import { dsnToString, makeDsn } from './utils/dsn'; diff --git a/packages/core/src/currentScopes.ts b/packages/core/src/currentScopes.ts index a88aed55c971..b66f3fac6e66 100644 --- a/packages/core/src/currentScopes.ts +++ b/packages/core/src/currentScopes.ts @@ -2,7 +2,7 @@ import { getAsyncContextStrategy } from './asyncContext'; import { getGlobalSingleton, getMainCarrier } from './carrier'; import type { Client } from './client'; import { Scope } from './scope'; -import type { TraceContext } from './types-hoist/context'; +import type { TraceContext } from './types/context'; import { generateSpanId } from './utils/propagationContext'; let _externalPropagationContextProvider: (() => { traceId: string; spanId: string } | undefined) | undefined; diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts index 6b7b251c542c..15b0d4ba576a 100644 --- a/packages/core/src/envelope.ts +++ b/packages/core/src/envelope.ts @@ -2,8 +2,8 @@ import type { Client } from './client'; import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext'; import type { SentrySpan } from './tracing/sentrySpan'; import { isStreamedBeforeSendSpanCallback } from './tracing/spans/beforeSendSpan'; -import type { LegacyCSPReport } from './types-hoist/csp'; -import type { DsnComponents } from './types-hoist/dsn'; +import type { LegacyCSPReport } from './types/csp'; +import type { DsnComponents } from './types/dsn'; import type { DynamicSamplingContext, EventEnvelope, @@ -14,11 +14,11 @@ import type { SessionItem, SpanEnvelope, SpanItem, -} from './types-hoist/envelope'; -import type { Event } from './types-hoist/event'; -import type { SdkInfo } from './types-hoist/sdkinfo'; -import type { SdkMetadata } from './types-hoist/sdkmetadata'; -import type { Session, SessionAggregates } from './types-hoist/session'; +} from './types/envelope'; +import type { Event } from './types/event'; +import type { SdkInfo } from './types/sdkinfo'; +import type { SdkMetadata } from './types/sdkmetadata'; +import type { Session, SessionAggregates } from './types/session'; import { dsnToString } from './utils/dsn'; import { createEnvelope, diff --git a/packages/core/src/eventProcessors.ts b/packages/core/src/eventProcessors.ts index ca41e5ee2a03..99a15781e06c 100644 --- a/packages/core/src/eventProcessors.ts +++ b/packages/core/src/eventProcessors.ts @@ -1,6 +1,6 @@ import { DEBUG_BUILD } from './debug-build'; -import type { Event, EventHint } from './types-hoist/event'; -import type { EventProcessor } from './types-hoist/eventprocessor'; +import type { Event, EventHint } from './types/event'; +import type { EventProcessor } from './types/eventprocessor'; import { debug } from './utils/debug-logger'; import { isThenable } from './utils/is'; import { rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise'; diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts index 7af14befc185..a5534cd9b5ba 100644 --- a/packages/core/src/exports.ts +++ b/packages/core/src/exports.ts @@ -3,14 +3,14 @@ import { DEBUG_BUILD } from './debug-build'; import type { CaptureContext } from './scope'; import { closeSession, makeSession, updateSession } from './session'; import { startNewTrace } from './tracing/trace'; -import type { CheckIn, FinishedCheckIn, MonitorConfig } from './types-hoist/checkin'; -import type { Event, EventHint } from './types-hoist/event'; -import type { EventProcessor } from './types-hoist/eventprocessor'; -import type { Extra, Extras } from './types-hoist/extra'; -import type { Primitive } from './types-hoist/misc'; -import type { Session, SessionContext } from './types-hoist/session'; -import type { SeverityLevel } from './types-hoist/severity'; -import type { User } from './types-hoist/user'; +import type { CheckIn, FinishedCheckIn, MonitorConfig } from './types/checkin'; +import type { Event, EventHint } from './types/event'; +import type { EventProcessor } from './types/eventprocessor'; +import type { Extra, Extras } from './types/extra'; +import type { Primitive } from './types/misc'; +import type { Session, SessionContext } from './types/session'; +import type { SeverityLevel } from './types/severity'; +import type { User } from './types/user'; import { debug } from './utils/debug-logger'; import { isThenable } from './utils/is'; import { uuid4 } from './utils/misc'; diff --git a/packages/core/src/feedback.ts b/packages/core/src/feedback.ts index ec0d0b58b71a..e4dfe9511623 100644 --- a/packages/core/src/feedback.ts +++ b/packages/core/src/feedback.ts @@ -1,6 +1,6 @@ import { getClient, getCurrentScope } from './currentScopes'; -import type { EventHint } from './types-hoist/event'; -import type { FeedbackEvent, SendFeedbackParams } from './types-hoist/feedback'; +import type { EventHint } from './types/event'; +import type { FeedbackEvent, SendFeedbackParams } from './types/feedback'; /** * Send user feedback to Sentry. diff --git a/packages/core/src/fetch.ts b/packages/core/src/fetch.ts index a64a98255fa9..d28fc670fd8d 100644 --- a/packages/core/src/fetch.ts +++ b/packages/core/src/fetch.ts @@ -3,10 +3,10 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from ' import { setHttpStatus, SPAN_STATUS_ERROR, startInactiveSpan } from './tracing'; import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan'; import { hasSpanStreamingEnabled } from './tracing/spans/hasSpanStreamingEnabled'; -import type { FetchBreadcrumbHint } from './types-hoist/breadcrumb'; -import type { HandlerDataFetch } from './types-hoist/instrument'; -import type { ResponseHookInfo } from './types-hoist/request'; -import type { Span, SpanAttributes, SpanOrigin } from './types-hoist/span'; +import type { FetchBreadcrumbHint } from './types/breadcrumb'; +import type { HandlerDataFetch } from './types/instrument'; +import type { ResponseHookInfo } from './types/request'; +import type { Span, SpanAttributes, SpanOrigin } from './types/span'; import { SENTRY_BAGGAGE_KEY_PREFIX } from './utils/baggage'; import { hasSpansEnabled } from './utils/hasSpansEnabled'; import { isInstanceOf, isRequest } from './utils/is'; diff --git a/packages/core/src/instrument/console.ts b/packages/core/src/instrument/console.ts index 737e9fd907fa..5cfef86732c4 100644 --- a/packages/core/src/instrument/console.ts +++ b/packages/core/src/instrument/console.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/ban-types */ import { DEBUG_BUILD } from '../debug-build'; -import type { ConsoleLevel, HandlerDataConsole } from '../types-hoist/instrument'; +import type { ConsoleLevel, HandlerDataConsole } from '../types/instrument'; import { CONSOLE_LEVELS, originalConsoleMethods } from '../utils/debug-logger'; import { fill } from '../utils/object'; import { stringMatchesSomePattern } from '../utils/string'; diff --git a/packages/core/src/instrument/fetch.ts b/packages/core/src/instrument/fetch.ts index a3165cfbc13a..a8333ad0a995 100644 --- a/packages/core/src/instrument/fetch.ts +++ b/packages/core/src/instrument/fetch.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { getClient } from '../currentScopes'; -import type { HandlerDataFetch } from '../types-hoist/instrument'; -import type { WebFetchHeaders } from '../types-hoist/webfetchapi'; +import type { HandlerDataFetch } from '../types/instrument'; +import type { WebFetchHeaders } from '../types/webfetchapi'; import { isError, isRequest } from '../utils/is'; import { addNonEnumerableProperty, fill } from '../utils/object'; import { supportsNativeFetch } from '../utils/supports'; diff --git a/packages/core/src/instrument/globalError.ts b/packages/core/src/instrument/globalError.ts index 39e00ed816c4..ce285ce8960b 100644 --- a/packages/core/src/instrument/globalError.ts +++ b/packages/core/src/instrument/globalError.ts @@ -1,4 +1,4 @@ -import type { HandlerDataError } from '../types-hoist/instrument'; +import type { HandlerDataError } from '../types/instrument'; import { GLOBAL_OBJ } from '../utils/worldwide'; import { addHandler, maybeInstrument, triggerHandlers } from './handlers'; diff --git a/packages/core/src/instrument/globalUnhandledRejection.ts b/packages/core/src/instrument/globalUnhandledRejection.ts index 230146ae8646..9bbbe4d80972 100644 --- a/packages/core/src/instrument/globalUnhandledRejection.ts +++ b/packages/core/src/instrument/globalUnhandledRejection.ts @@ -1,4 +1,4 @@ -import type { HandlerDataUnhandledRejection } from '../types-hoist/instrument'; +import type { HandlerDataUnhandledRejection } from '../types/instrument'; import { GLOBAL_OBJ } from '../utils/worldwide'; import { addHandler, maybeInstrument, triggerHandlers } from './handlers'; diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts index be8e2179bdf0..32662c14bfe6 100644 --- a/packages/core/src/integration.ts +++ b/packages/core/src/integration.ts @@ -1,10 +1,10 @@ import type { Client } from './client'; import { getClient } from './currentScopes'; import { DEBUG_BUILD } from './debug-build'; -import type { Event, EventHint } from './types-hoist/event'; -import type { Integration, IntegrationFn } from './types-hoist/integration'; -import type { CoreOptions } from './types-hoist/options'; -import type { StreamedSpanJSON } from './types-hoist/span'; +import type { Event, EventHint } from './types/event'; +import type { Integration, IntegrationFn } from './types/integration'; +import type { CoreOptions } from './types/options'; +import type { StreamedSpanJSON } from './types/span'; import { debug } from './utils/debug-logger'; export const installedIntegrations: string[] = []; diff --git a/packages/core/src/integrations/captureconsole.ts b/packages/core/src/integrations/captureconsole.ts index 4c28e2c74a54..50ff2c4debe8 100644 --- a/packages/core/src/integrations/captureconsole.ts +++ b/packages/core/src/integrations/captureconsole.ts @@ -3,7 +3,7 @@ import { captureException } from '../exports'; import { addConsoleInstrumentationHandler } from '../instrument/console'; import { defineIntegration } from '../integration'; import type { CaptureContext } from '../scope'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { IntegrationFn } from '../types/integration'; import { CONSOLE_LEVELS } from '../utils/debug-logger'; import { addExceptionMechanism } from '../utils/misc'; import { severityLevelFromString } from '../utils/severity'; diff --git a/packages/core/src/integrations/consola.ts b/packages/core/src/integrations/consola.ts index 158d2430d4a1..a5b7d44a3b33 100644 --- a/packages/core/src/integrations/consola.ts +++ b/packages/core/src/integrations/consola.ts @@ -2,7 +2,7 @@ import type { Client } from '../client'; import { getClient } from '../currentScopes'; import { _INTERNAL_captureLog } from '../logs/internal'; import { createConsoleTemplateAttributes, formatConsoleArgs, hasConsoleSubstitutions } from '../logs/utils'; -import type { LogSeverityLevel } from '../types-hoist/log'; +import type { LogSeverityLevel } from '../types/log'; import { isPlainObject } from '../utils/is'; import { normalize } from '../utils/normalize'; diff --git a/packages/core/src/integrations/console.ts b/packages/core/src/integrations/console.ts index 21e1ee53d328..34675c34d261 100644 --- a/packages/core/src/integrations/console.ts +++ b/packages/core/src/integrations/console.ts @@ -2,7 +2,7 @@ import { addBreadcrumb } from '../breadcrumbs'; import { getClient } from '../currentScopes'; import { addConsoleInstrumentationFilter, addConsoleInstrumentationHandler } from '../instrument/console'; import { defineIntegration } from '../integration'; -import type { ConsoleLevel } from '../types-hoist/instrument'; +import type { ConsoleLevel } from '../types/instrument'; import { CONSOLE_LEVELS } from '../utils/debug-logger'; import { severityLevelFromString } from '../utils/severity'; import { safeJoin } from '../utils/string'; diff --git a/packages/core/src/integrations/conversationId.ts b/packages/core/src/integrations/conversationId.ts index 445e3327419b..ae71d67f7dda 100644 --- a/packages/core/src/integrations/conversationId.ts +++ b/packages/core/src/integrations/conversationId.ts @@ -2,8 +2,8 @@ import type { Client } from '../client'; import { getCurrentScope, getIsolationScope } from '../currentScopes'; import { defineIntegration } from '../integration'; import { GEN_AI_CONVERSATION_ID_ATTRIBUTE } from '../semanticAttributes'; -import type { IntegrationFn } from '../types-hoist/integration'; -import type { Span } from '../types-hoist/span'; +import type { IntegrationFn } from '../types/integration'; +import type { Span } from '../types/span'; import { spanToJSON } from '../utils/spanUtils'; const INTEGRATION_NAME = 'ConversationId'; diff --git a/packages/core/src/integrations/dedupe.ts b/packages/core/src/integrations/dedupe.ts index 4379c8f6ff73..f28b83d21d36 100644 --- a/packages/core/src/integrations/dedupe.ts +++ b/packages/core/src/integrations/dedupe.ts @@ -1,9 +1,9 @@ import { DEBUG_BUILD } from '../debug-build'; import { defineIntegration } from '../integration'; -import type { Event } from '../types-hoist/event'; -import type { Exception } from '../types-hoist/exception'; -import type { IntegrationFn } from '../types-hoist/integration'; -import type { StackFrame } from '../types-hoist/stackframe'; +import type { Event } from '../types/event'; +import type { Exception } from '../types/exception'; +import type { IntegrationFn } from '../types/integration'; +import type { StackFrame } from '../types/stackframe'; import { debug } from '../utils/debug-logger'; import { getFramesFromEvent } from '../utils/stacktrace'; diff --git a/packages/core/src/integrations/eventFilters.ts b/packages/core/src/integrations/eventFilters.ts index b801cab91fae..1f2a78a42359 100644 --- a/packages/core/src/integrations/eventFilters.ts +++ b/packages/core/src/integrations/eventFilters.ts @@ -1,8 +1,8 @@ import { DEBUG_BUILD } from '../debug-build'; import { defineIntegration } from '../integration'; -import type { Event } from '../types-hoist/event'; -import type { IntegrationFn } from '../types-hoist/integration'; -import type { StackFrame } from '../types-hoist/stackframe'; +import type { Event } from '../types/event'; +import type { IntegrationFn } from '../types/integration'; +import type { StackFrame } from '../types/stackframe'; import { debug } from '../utils/debug-logger'; import { getPossibleEventMessages } from '../utils/eventUtils'; import { getEventDescription } from '../utils/misc'; diff --git a/packages/core/src/integrations/express/patch-layer.ts b/packages/core/src/integrations/express/patch-layer.ts index 3114cbafb320..6a026afa67f8 100644 --- a/packages/core/src/integrations/express/patch-layer.ts +++ b/packages/core/src/integrations/express/patch-layer.ts @@ -31,7 +31,7 @@ import { DEBUG_BUILD } from '../../debug-build'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR, startSpanManual, withActiveSpan } from '../../tracing'; import { debug } from '../../utils/debug-logger'; -import type { SpanAttributes } from '../../types-hoist/span'; +import type { SpanAttributes } from '../../types/span'; import { getActiveSpan } from '../../utils/spanUtils'; import { getStoredLayers, storeLayer } from './request-layer-store'; import { diff --git a/packages/core/src/integrations/express/types.ts b/packages/core/src/integrations/express/types.ts index f2ed5eed6013..dc5fe252a820 100644 --- a/packages/core/src/integrations/express/types.ts +++ b/packages/core/src/integrations/express/types.ts @@ -27,8 +27,8 @@ * limitations under the License. */ -import type { RequestEventData } from '../../types-hoist/request'; -import type { SpanAttributes } from '../../types-hoist/span'; +import type { RequestEventData } from '../../types/request'; +import type { SpanAttributes } from '../../types/span'; export const ATTR_EXPRESS_NAME = 'express.name'; export const ATTR_HTTP_ROUTE = 'http.route'; diff --git a/packages/core/src/integrations/express/utils.ts b/packages/core/src/integrations/express/utils.ts index af22a6ea1d97..55a3325ad172 100644 --- a/packages/core/src/integrations/express/utils.ts +++ b/packages/core/src/integrations/express/utils.ts @@ -27,7 +27,7 @@ * limitations under the License. */ -import type { SpanAttributes } from '../../types-hoist/span'; +import type { SpanAttributes } from '../../types/span'; import { getStoredLayers } from './request-layer-store'; import type { ExpressIntegrationOptions, diff --git a/packages/core/src/integrations/extraerrordata.ts b/packages/core/src/integrations/extraerrordata.ts index 8afde618af36..5d90db89adff 100644 --- a/packages/core/src/integrations/extraerrordata.ts +++ b/packages/core/src/integrations/extraerrordata.ts @@ -1,9 +1,9 @@ import { DEBUG_BUILD } from '../debug-build'; import { defineIntegration } from '../integration'; -import type { Contexts } from '../types-hoist/context'; -import type { ExtendedError } from '../types-hoist/error'; -import type { Event, EventHint } from '../types-hoist/event'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { Contexts } from '../types/context'; +import type { ExtendedError } from '../types/error'; +import type { Event, EventHint } from '../types/event'; +import type { IntegrationFn } from '../types/integration'; import { debug } from '../utils/debug-logger'; import { isError, isPlainObject } from '../utils/is'; import { normalize } from '../utils/normalize'; diff --git a/packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts b/packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts index fddc1944ceab..d83eb579fa4d 100644 --- a/packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts +++ b/packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts @@ -1,7 +1,7 @@ import { type Client } from '../../client'; import { defineIntegration } from '../../integration'; -import { type Event, type EventHint } from '../../types-hoist/event'; -import { type Integration, type IntegrationFn } from '../../types-hoist/integration'; +import { type Event, type EventHint } from '../../types/event'; +import { type Integration, type IntegrationFn } from '../../types/integration'; import { _INTERNAL_addFeatureFlagToActiveSpan, _INTERNAL_copyFlagsFromScopeToEvent, diff --git a/packages/core/src/integrations/featureFlags/growthbook.ts b/packages/core/src/integrations/featureFlags/growthbook.ts index eeb2b25341e9..ec417df4eda1 100644 --- a/packages/core/src/integrations/featureFlags/growthbook.ts +++ b/packages/core/src/integrations/featureFlags/growthbook.ts @@ -1,7 +1,7 @@ import type { Client } from '../../client'; import { defineIntegration } from '../../integration'; -import type { Event, EventHint } from '../../types-hoist/event'; -import type { IntegrationFn } from '../../types-hoist/integration'; +import type { Event, EventHint } from '../../types/event'; +import type { IntegrationFn } from '../../types/integration'; import { _INTERNAL_addFeatureFlagToActiveSpan, _INTERNAL_copyFlagsFromScopeToEvent, diff --git a/packages/core/src/integrations/functiontostring.ts b/packages/core/src/integrations/functiontostring.ts index 5426e8291cb6..6bbf59d91183 100644 --- a/packages/core/src/integrations/functiontostring.ts +++ b/packages/core/src/integrations/functiontostring.ts @@ -1,8 +1,8 @@ import type { Client } from '../client'; import { getClient } from '../currentScopes'; import { defineIntegration } from '../integration'; -import type { IntegrationFn } from '../types-hoist/integration'; -import type { WrappedFunction } from '../types-hoist/wrappedfunction'; +import type { IntegrationFn } from '../types/integration'; +import type { WrappedFunction } from '../types/wrappedfunction'; import { getOriginalFunction } from '../utils/object'; let originalFunctionToString: () => void; diff --git a/packages/core/src/integrations/http/client-subscriptions.ts b/packages/core/src/integrations/http/client-subscriptions.ts index 0bece51e441f..71d78873dbb2 100644 --- a/packages/core/src/integrations/http/client-subscriptions.ts +++ b/packages/core/src/integrations/http/client-subscriptions.ts @@ -13,7 +13,7 @@ * calling the handlers with the relevant data at the appropriate time. */ -import type { SpanStatus } from '../../types-hoist/spanStatus'; +import type { SpanStatus } from '../../types/spanStatus'; import { addOutgoingRequestBreadcrumb } from './add-outgoing-request-breadcrumb'; import { getSpanStatusFromHttpCode, diff --git a/packages/core/src/integrations/http/get-outgoing-span-data.ts b/packages/core/src/integrations/http/get-outgoing-span-data.ts index 2d1d5bae37c2..8092bec8c5bf 100644 --- a/packages/core/src/integrations/http/get-outgoing-span-data.ts +++ b/packages/core/src/integrations/http/get-outgoing-span-data.ts @@ -1,9 +1,9 @@ -import type { Span, SpanAttributes } from '../../types-hoist/span'; +import type { Span, SpanAttributes } from '../../types/span'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes'; import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url'; import type { HttpClientRequest, HttpIncomingMessage } from './types'; import { getRequestUrlFromClientRequest } from './get-request-url'; -import type { StartSpanOptions } from '../../types-hoist/startSpanOptions'; +import type { StartSpanOptions } from '../../types/startSpanOptions'; /** * Build the initial span name and attributes for an outgoing HTTP request. diff --git a/packages/core/src/integrations/http/record-request-session.ts b/packages/core/src/integrations/http/record-request-session.ts index 1307e0168542..dfda6580cf16 100644 --- a/packages/core/src/integrations/http/record-request-session.ts +++ b/packages/core/src/integrations/http/record-request-session.ts @@ -3,7 +3,7 @@ import { debug } from '../../utils/debug-logger'; import { DEBUG_BUILD } from '../../debug-build'; import type { Scope } from '../../scope'; import type { HttpServerResponse } from './types'; -import type { AggregationCounts } from '../../types-hoist/session'; +import type { AggregationCounts } from '../../types/session'; import { safeUnref } from '../../utils/timer'; const clientToRequestSessionAggregatesMap = new WeakMap< diff --git a/packages/core/src/integrations/http/server-subscription.ts b/packages/core/src/integrations/http/server-subscription.ts index 3b1202ebec7b..6d2aa67d01ef 100644 --- a/packages/core/src/integrations/http/server-subscription.ts +++ b/packages/core/src/integrations/http/server-subscription.ts @@ -37,8 +37,8 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '../../semanticAttributes'; import { safeMathRandom } from '../../utils/randomSafeContext'; -import type { SpanAttributes } from '../../types-hoist/span'; -import type { SpanStatus } from '../../types-hoist/spanStatus'; +import type { SpanAttributes } from '../../types/span'; +import type { SpanStatus } from '../../types/spanStatus'; // Tree-shakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean; diff --git a/packages/core/src/integrations/http/types.ts b/packages/core/src/integrations/http/types.ts index bfcfbd1e3113..22538fb2dd84 100644 --- a/packages/core/src/integrations/http/types.ts +++ b/packages/core/src/integrations/http/types.ts @@ -26,8 +26,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { RequestEventData } from '../../types-hoist/request'; -import type { Span } from '../../types-hoist/span'; +import type { RequestEventData } from '../../types/request'; +import type { Span } from '../../types/span'; /** Minimal interface for a Node.js http.ClientRequest */ export interface HttpClientRequest { diff --git a/packages/core/src/integrations/linkederrors.ts b/packages/core/src/integrations/linkederrors.ts index a45837be7548..722688f92c23 100644 --- a/packages/core/src/integrations/linkederrors.ts +++ b/packages/core/src/integrations/linkederrors.ts @@ -1,5 +1,5 @@ import { defineIntegration } from '../integration'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { IntegrationFn } from '../types/integration'; import { applyAggregateErrorsToEvent } from '../utils/aggregate-errors'; import { exceptionFromError } from '../utils/eventbuilder'; diff --git a/packages/core/src/integrations/mcp-server/correlation.ts b/packages/core/src/integrations/mcp-server/correlation.ts index a831a822039c..c527a34cd5a2 100644 --- a/packages/core/src/integrations/mcp-server/correlation.ts +++ b/packages/core/src/integrations/mcp-server/correlation.ts @@ -11,7 +11,7 @@ */ import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; import { MCP_PROTOCOL_VERSION_ATTRIBUTE } from './attributes'; import { extractPromptResultAttributes, extractToolResultAttributes } from './resultExtraction'; import { buildServerAttributesFromInfo, extractSessionDataFromInitializeResponse } from './sessionExtraction'; diff --git a/packages/core/src/integrations/mcp-server/piiFiltering.ts b/packages/core/src/integrations/mcp-server/piiFiltering.ts index f8715a383f00..cfc5f365e976 100644 --- a/packages/core/src/integrations/mcp-server/piiFiltering.ts +++ b/packages/core/src/integrations/mcp-server/piiFiltering.ts @@ -5,7 +5,7 @@ * Input/output data (request arguments, tool/prompt results) is controlled * separately via recordInputs/recordOutputs options. */ -import type { SpanAttributeValue } from '../../types-hoist/span'; +import type { SpanAttributeValue } from '../../types/span'; import { CLIENT_ADDRESS_ATTRIBUTE, CLIENT_PORT_ATTRIBUTE, MCP_RESOURCE_URI_ATTRIBUTE } from './attributes'; /** diff --git a/packages/core/src/integrations/mcp-server/types.ts b/packages/core/src/integrations/mcp-server/types.ts index e6fd873fa4fa..9706ddcf3b54 100644 --- a/packages/core/src/integrations/mcp-server/types.ts +++ b/packages/core/src/integrations/mcp-server/types.ts @@ -1,4 +1,4 @@ -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; /** Types for MCP server instrumentation */ diff --git a/packages/core/src/integrations/moduleMetadata.ts b/packages/core/src/integrations/moduleMetadata.ts index 1bbbbdfb9624..381b9b949492 100644 --- a/packages/core/src/integrations/moduleMetadata.ts +++ b/packages/core/src/integrations/moduleMetadata.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '../integration'; import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata'; -import type { EventItem } from '../types-hoist/envelope'; +import type { EventItem } from '../types/envelope'; import { forEachEnvelopeItem } from '../utils/envelope'; /** diff --git a/packages/core/src/integrations/postgresjs.ts b/packages/core/src/integrations/postgresjs.ts index da1a7cee17c6..bb45aedbc4b0 100644 --- a/packages/core/src/integrations/postgresjs.ts +++ b/packages/core/src/integrations/postgresjs.ts @@ -5,7 +5,7 @@ import { DEBUG_BUILD } from '../debug-build'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes'; import { SPAN_STATUS_ERROR, startSpanManual } from '../tracing'; -import type { Span } from '../types-hoist/span'; +import type { Span } from '../types/span'; import { debug } from '../utils/debug-logger'; import { getActiveSpan } from '../utils/spanUtils'; diff --git a/packages/core/src/integrations/requestdata.ts b/packages/core/src/integrations/requestdata.ts index 7c462954e075..c155f03600d0 100644 --- a/packages/core/src/integrations/requestdata.ts +++ b/packages/core/src/integrations/requestdata.ts @@ -1,10 +1,10 @@ import { getIsolationScope } from '../currentScopes'; import { defineIntegration } from '../integration'; import { SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS } from '../semanticAttributes'; -import type { Event } from '../types-hoist/event'; -import type { IntegrationFn } from '../types-hoist/integration'; -import type { QueryParams, RequestEventData } from '../types-hoist/request'; -import type { StreamedSpanJSON } from '../types-hoist/span'; +import type { Event } from '../types/event'; +import type { IntegrationFn } from '../types/integration'; +import type { QueryParams, RequestEventData } from '../types/request'; +import type { StreamedSpanJSON } from '../types/span'; import { parseCookie } from '../utils/cookie'; import { httpHeadersToSpanAttributes } from '../utils/request'; import { getClientIPAddress, ipHeaderNames } from '../vendor/getIpAddress'; diff --git a/packages/core/src/integrations/rewriteframes.ts b/packages/core/src/integrations/rewriteframes.ts index 555fb492ce10..d14e970d82c7 100644 --- a/packages/core/src/integrations/rewriteframes.ts +++ b/packages/core/src/integrations/rewriteframes.ts @@ -1,7 +1,7 @@ import { defineIntegration } from '../integration'; -import type { Event } from '../types-hoist/event'; -import type { StackFrame } from '../types-hoist/stackframe'; -import type { Stacktrace } from '../types-hoist/stacktrace'; +import type { Event } from '../types/event'; +import type { StackFrame } from '../types/stackframe'; +import type { Stacktrace } from '../types/stacktrace'; import { basename, relative } from '../utils/path'; import { GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/integrations/spanStreaming.ts b/packages/core/src/integrations/spanStreaming.ts index 541be6b7f5e9..f7710dc573fa 100644 --- a/packages/core/src/integrations/spanStreaming.ts +++ b/packages/core/src/integrations/spanStreaming.ts @@ -1,4 +1,4 @@ -import type { IntegrationFn } from '../types-hoist/integration'; +import type { IntegrationFn } from '../types/integration'; import { DEBUG_BUILD } from '../debug-build'; import { defineIntegration } from '../integration'; import { isStreamedBeforeSendSpanCallback } from '../tracing/spans/beforeSendSpan'; diff --git a/packages/core/src/integrations/supabase.ts b/packages/core/src/integrations/supabase.ts index 14427c0ee3b7..107e59f12e46 100644 --- a/packages/core/src/integrations/supabase.ts +++ b/packages/core/src/integrations/supabase.ts @@ -10,7 +10,7 @@ import { captureException } from '../exports'; import { defineIntegration } from '../integration'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes'; import { setHttpStatus, SPAN_STATUS_ERROR, SPAN_STATUS_OK, startSpan } from '../tracing'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { IntegrationFn } from '../types/integration'; import { debug } from '../utils/debug-logger'; import { isPlainObject } from '../utils/is'; import { addExceptionMechanism } from '../utils/misc'; diff --git a/packages/core/src/integrations/third-party-errors-filter.ts b/packages/core/src/integrations/third-party-errors-filter.ts index 2a942f622775..7b68b2fc9dc4 100644 --- a/packages/core/src/integrations/third-party-errors-filter.ts +++ b/packages/core/src/integrations/third-party-errors-filter.ts @@ -1,8 +1,8 @@ import { defineIntegration } from '../integration'; import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata'; -import type { EventItem } from '../types-hoist/envelope'; -import type { Event } from '../types-hoist/event'; -import type { StackFrame } from '../types-hoist/stackframe'; +import type { EventItem } from '../types/envelope'; +import type { Event } from '../types/event'; +import type { StackFrame } from '../types/stackframe'; import { forEachEnvelopeItem } from '../utils/envelope'; import { getFramesFromEvent } from '../utils/stacktrace'; import { GLOBAL_OBJ } from '../utils/worldwide'; diff --git a/packages/core/src/integrations/zoderrors.ts b/packages/core/src/integrations/zoderrors.ts index 50c9c9e0237e..5cd59e160ebf 100644 --- a/packages/core/src/integrations/zoderrors.ts +++ b/packages/core/src/integrations/zoderrors.ts @@ -1,6 +1,6 @@ import { defineIntegration } from '../integration'; -import type { Event, EventHint } from '../types-hoist/event'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { Event, EventHint } from '../types/event'; +import type { IntegrationFn } from '../types/integration'; import { isError } from '../utils/is'; import { truncate } from '../utils/string'; diff --git a/packages/core/src/logs/console-integration.ts b/packages/core/src/logs/console-integration.ts index e16016a1154a..2a8b8943f79f 100644 --- a/packages/core/src/logs/console-integration.ts +++ b/packages/core/src/logs/console-integration.ts @@ -3,8 +3,8 @@ import { DEBUG_BUILD } from '../debug-build'; import { addConsoleInstrumentationHandler } from '../instrument/console'; import { defineIntegration } from '../integration'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes'; -import type { ConsoleLevel } from '../types-hoist/instrument'; -import type { IntegrationFn } from '../types-hoist/integration'; +import type { ConsoleLevel } from '../types/instrument'; +import type { IntegrationFn } from '../types/integration'; import { CONSOLE_LEVELS, debug } from '../utils/debug-logger'; import { _INTERNAL_captureLog } from './internal'; import { createConsoleTemplateAttributes, formatConsoleArgs, hasConsoleSubstitutions } from './utils'; diff --git a/packages/core/src/logs/constants.ts b/packages/core/src/logs/constants.ts index b26f64c82006..3cda24ba13e4 100644 --- a/packages/core/src/logs/constants.ts +++ b/packages/core/src/logs/constants.ts @@ -1,4 +1,4 @@ -import type { LogSeverityLevel } from '../types-hoist/log'; +import type { LogSeverityLevel } from '../types/log'; /** * Maps a log severity level to a log severity number. diff --git a/packages/core/src/logs/envelope.ts b/packages/core/src/logs/envelope.ts index 3e30a5680316..12a32cfb330c 100644 --- a/packages/core/src/logs/envelope.ts +++ b/packages/core/src/logs/envelope.ts @@ -1,7 +1,7 @@ -import type { DsnComponents } from '../types-hoist/dsn'; -import type { LogContainerItem, LogEnvelope } from '../types-hoist/envelope'; -import type { SerializedLog } from '../types-hoist/log'; -import type { SdkMetadata } from '../types-hoist/sdkmetadata'; +import type { DsnComponents } from '../types/dsn'; +import type { LogContainerItem, LogEnvelope } from '../types/envelope'; +import type { SerializedLog } from '../types/log'; +import type { SdkMetadata } from '../types/sdkmetadata'; import { dsnToString } from '../utils/dsn'; import { createEnvelope } from '../utils/envelope'; import { isBrowser } from '../utils/isBrowser'; diff --git a/packages/core/src/logs/internal.ts b/packages/core/src/logs/internal.ts index c1eff9f50fcf..340302d451a0 100644 --- a/packages/core/src/logs/internal.ts +++ b/packages/core/src/logs/internal.ts @@ -3,8 +3,8 @@ import { getGlobalSingleton } from '../carrier'; import type { Client } from '../client'; import { getClient, getCurrentScope, getIsolationScope } from '../currentScopes'; import { DEBUG_BUILD } from '../debug-build'; -import type { Integration } from '../types-hoist/integration'; -import type { Log, SerializedLog } from '../types-hoist/log'; +import type { Integration } from '../types/integration'; +import type { Log, SerializedLog } from '../types/log'; import { consoleSandbox, debug } from '../utils/debug-logger'; import { isParameterizedString } from '../utils/is'; import { getCombinedScopeData } from '../utils/scopeData'; diff --git a/packages/core/src/logs/public-api.ts b/packages/core/src/logs/public-api.ts index 27507ab3dfe7..540ede61da79 100644 --- a/packages/core/src/logs/public-api.ts +++ b/packages/core/src/logs/public-api.ts @@ -1,6 +1,6 @@ import type { Scope } from '../scope'; -import type { Log, LogSeverityLevel } from '../types-hoist/log'; -import type { ParameterizedString } from '../types-hoist/parameterize'; +import type { Log, LogSeverityLevel } from '../types/log'; +import type { ParameterizedString } from '../types/parameterize'; import { _INTERNAL_captureLog } from './internal'; /** diff --git a/packages/core/src/metadata.ts b/packages/core/src/metadata.ts index 54ee4a1e1eb4..bedde5626ee5 100644 --- a/packages/core/src/metadata.ts +++ b/packages/core/src/metadata.ts @@ -1,5 +1,5 @@ -import type { Event } from './types-hoist/event'; -import type { StackParser } from './types-hoist/stacktrace'; +import type { Event } from './types/event'; +import type { StackParser } from './types/stacktrace'; import { GLOBAL_OBJ } from './utils/worldwide'; /** Keys are source filename/url, values are metadata objects. */ diff --git a/packages/core/src/metrics/envelope.ts b/packages/core/src/metrics/envelope.ts index 565b957c4f6d..32d33fc2b509 100644 --- a/packages/core/src/metrics/envelope.ts +++ b/packages/core/src/metrics/envelope.ts @@ -1,7 +1,7 @@ -import type { DsnComponents } from '../types-hoist/dsn'; -import type { MetricContainerItem, MetricEnvelope } from '../types-hoist/envelope'; -import type { SerializedMetric } from '../types-hoist/metric'; -import type { SdkMetadata } from '../types-hoist/sdkmetadata'; +import type { DsnComponents } from '../types/dsn'; +import type { MetricContainerItem, MetricEnvelope } from '../types/envelope'; +import type { SerializedMetric } from '../types/metric'; +import type { SdkMetadata } from '../types/sdkmetadata'; import { dsnToString } from '../utils/dsn'; import { createEnvelope } from '../utils/envelope'; import { isBrowser } from '../utils/isBrowser'; diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts index 26cc11fc0422..69f9ad03795f 100644 --- a/packages/core/src/metrics/internal.ts +++ b/packages/core/src/metrics/internal.ts @@ -4,9 +4,9 @@ import type { Client } from '../client'; import { getClient, getCurrentScope, getIsolationScope } from '../currentScopes'; import { DEBUG_BUILD } from '../debug-build'; import type { Scope } from '../scope'; -import type { Integration } from '../types-hoist/integration'; -import type { Metric, SerializedMetric } from '../types-hoist/metric'; -import type { User } from '../types-hoist/user'; +import type { Integration } from '../types/integration'; +import type { Metric, SerializedMetric } from '../types/metric'; +import type { User } from '../types/user'; import { debug } from '../utils/debug-logger'; import { getCombinedScopeData } from '../utils/scopeData'; import { _getSpanForScope } from '../utils/spanOnScope'; diff --git a/packages/core/src/metrics/public-api.ts b/packages/core/src/metrics/public-api.ts index 2982c10ffcf7..d962ad2a7f65 100644 --- a/packages/core/src/metrics/public-api.ts +++ b/packages/core/src/metrics/public-api.ts @@ -1,5 +1,5 @@ import type { Scope } from '../scope'; -import type { Metric, MetricType } from '../types-hoist/metric'; +import type { Metric, MetricType } from '../types/metric'; import { _INTERNAL_captureMetric } from './internal'; /** diff --git a/packages/core/src/profiling.ts b/packages/core/src/profiling.ts index e2e2c34e38cc..772ba777e735 100644 --- a/packages/core/src/profiling.ts +++ b/packages/core/src/profiling.ts @@ -1,6 +1,6 @@ import { getClient } from './currentScopes'; import { DEBUG_BUILD } from './debug-build'; -import type { Profiler, ProfilingIntegration } from './types-hoist/profiling'; +import type { Profiler, ProfilingIntegration } from './types/profiling'; import { debug } from './utils/debug-logger'; function isProfilingIntegrationWithProfiler( diff --git a/packages/core/src/report-dialog.ts b/packages/core/src/report-dialog.ts index fb91aec441b2..a679604e5d0b 100644 --- a/packages/core/src/report-dialog.ts +++ b/packages/core/src/report-dialog.ts @@ -1,4 +1,4 @@ -import type { DsnLike } from './types-hoist/dsn'; +import type { DsnLike } from './types/dsn'; /** * All properties the report dialog supports diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts index bd2c11b0fa4d..9359032da996 100644 --- a/packages/core/src/scope.ts +++ b/packages/core/src/scope.ts @@ -3,20 +3,20 @@ import type { AttributeObject, RawAttribute, RawAttributes } from './attributes' import type { Client } from './client'; import { DEBUG_BUILD } from './debug-build'; import { updateSession } from './session'; -import type { Attachment } from './types-hoist/attachment'; -import type { Breadcrumb } from './types-hoist/breadcrumb'; -import type { Context, Contexts } from './types-hoist/context'; -import type { DynamicSamplingContext } from './types-hoist/envelope'; -import type { Event, EventHint } from './types-hoist/event'; -import type { EventProcessor } from './types-hoist/eventprocessor'; -import type { Extra, Extras } from './types-hoist/extra'; -import type { Primitive } from './types-hoist/misc'; -import type { RequestEventData } from './types-hoist/request'; -import type { Session } from './types-hoist/session'; -import type { SeverityLevel } from './types-hoist/severity'; -import type { Span } from './types-hoist/span'; -import type { PropagationContext } from './types-hoist/tracing'; -import type { User } from './types-hoist/user'; +import type { Attachment } from './types/attachment'; +import type { Breadcrumb } from './types/breadcrumb'; +import type { Context, Contexts } from './types/context'; +import type { DynamicSamplingContext } from './types/envelope'; +import type { Event, EventHint } from './types/event'; +import type { EventProcessor } from './types/eventprocessor'; +import type { Extra, Extras } from './types/extra'; +import type { Primitive } from './types/misc'; +import type { RequestEventData } from './types/request'; +import type { Session } from './types/session'; +import type { SeverityLevel } from './types/severity'; +import type { Span } from './types/span'; +import type { PropagationContext } from './types/tracing'; +import type { User } from './types/user'; import { debug } from './utils/debug-logger'; import { isPlainObject } from './utils/is'; import { merge } from './utils/merge'; diff --git a/packages/core/src/sdk.ts b/packages/core/src/sdk.ts index bc96e90e9ed8..e7f20432b91a 100644 --- a/packages/core/src/sdk.ts +++ b/packages/core/src/sdk.ts @@ -1,7 +1,7 @@ import type { Client } from './client'; import { getCurrentScope } from './currentScopes'; import { DEBUG_BUILD } from './debug-build'; -import type { ClientOptions } from './types-hoist/options'; +import type { ClientOptions } from './types/options'; import { consoleSandbox, debug } from './utils/debug-logger'; /** A class object that can instantiate Client objects. */ diff --git a/packages/core/src/server-exports.ts b/packages/core/src/server-exports.ts index d9d5aa1eda1e..1a19fa2902cc 100644 --- a/packages/core/src/server-exports.ts +++ b/packages/core/src/server-exports.ts @@ -6,7 +6,7 @@ export type { ServerRuntimeClientOptions } from './server-runtime-client'; export { ServerRuntimeClient } from './server-runtime-client'; -export type { ServerRuntimeOptions } from './types-hoist/options'; +export type { ServerRuntimeOptions } from './types/options'; export { trpcMiddleware } from './trpc'; export { wrapMcpServerWithSentry } from './integrations/mcp-server'; export { isNodeEnv, loadModule } from './utils/node'; diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts index da697c682436..d969f3580114 100644 --- a/packages/core/src/server-runtime-client.ts +++ b/packages/core/src/server-runtime-client.ts @@ -6,12 +6,12 @@ import type { Scope } from './scope'; import { registerSpanErrorInstrumentation } from './tracing'; import { DEFAULT_TRANSPORT_BUFFER_SIZE } from './transports/base'; import { addUserAgentToTransportHeaders } from './transports/userAgent'; -import type { CheckIn, MonitorConfig, SerializedCheckIn } from './types-hoist/checkin'; -import type { Event, EventHint } from './types-hoist/event'; -import type { ClientOptions } from './types-hoist/options'; -import type { ParameterizedString } from './types-hoist/parameterize'; -import type { SeverityLevel } from './types-hoist/severity'; -import type { BaseTransportOptions, Transport } from './types-hoist/transport'; +import type { CheckIn, MonitorConfig, SerializedCheckIn } from './types/checkin'; +import type { Event, EventHint } from './types/event'; +import type { ClientOptions } from './types/options'; +import type { ParameterizedString } from './types/parameterize'; +import type { SeverityLevel } from './types/severity'; +import type { BaseTransportOptions, Transport } from './types/transport'; import { debug } from './utils/debug-logger'; import { eventFromMessage, eventFromUnknownInput } from './utils/eventbuilder'; import { uuid4 } from './utils/misc'; diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts index 492378279288..aebb79158db0 100644 --- a/packages/core/src/session.ts +++ b/packages/core/src/session.ts @@ -1,4 +1,4 @@ -import type { SerializedSession, Session, SessionContext, SessionStatus } from './types-hoist/session'; +import type { SerializedSession, Session, SessionContext, SessionStatus } from './types/session'; import { uuid4 } from './utils/misc'; import { timestampInSeconds } from './utils/time'; diff --git a/packages/core/src/shared-exports.ts b/packages/core/src/shared-exports.ts index c0da1b7e1824..fa5e490f8b18 100644 --- a/packages/core/src/shared-exports.ts +++ b/packages/core/src/shared-exports.ts @@ -347,9 +347,9 @@ export { SDK_VERSION } from './utils/version'; export { getDebugImagesForResources, getFilenameToDebugIdMap } from './utils/debug-ids'; export { getFilenameToMetadataMap } from './metadata'; export { escapeStringForRegex } from './vendor/escapeStringForRegex'; -export type { Attachment } from './types-hoist/attachment'; -export type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbData, FetchBreadcrumbHint } from './types-hoist/breadcrumb'; -export type { ClientReport, Outcome, EventDropReason } from './types-hoist/clientreport'; +export type { Attachment } from './types/attachment'; +export type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbData, FetchBreadcrumbHint } from './types/breadcrumb'; +export type { ClientReport, Outcome, EventDropReason } from './types/clientreport'; export type { Context, Contexts, @@ -360,10 +360,10 @@ export type { TraceContext, CloudResourceContext, MissingInstrumentationContext, -} from './types-hoist/context'; -export type { DataCategory } from './types-hoist/datacategory'; -export type { DsnComponents, DsnLike, DsnProtocol } from './types-hoist/dsn'; -export type { DebugImage, DebugMeta } from './types-hoist/debugMeta'; +} from './types/context'; +export type { DataCategory } from './types/datacategory'; +export type { DsnComponents, DsnLike, DsnProtocol } from './types/dsn'; +export type { DebugImage, DebugMeta } from './types/debugMeta'; export type { AttachmentItem, BaseEnvelopeHeaders, @@ -394,19 +394,19 @@ export type { SpanItem, LogEnvelope, MetricEnvelope, -} from './types-hoist/envelope'; -export type { ExtendedError } from './types-hoist/error'; -export type { Event, EventHint, EventType, ErrorEvent, TransactionEvent } from './types-hoist/event'; -export type { EventProcessor } from './types-hoist/eventprocessor'; -export type { Exception } from './types-hoist/exception'; -export type { Extra, Extras } from './types-hoist/extra'; -export type { Integration, IntegrationFn } from './types-hoist/integration'; -export type { Mechanism } from './types-hoist/mechanism'; -export type { ExtractedNodeRequestData, HttpHeaderValue, Primitive, WorkerLocation } from './types-hoist/misc'; -export type { CollectBehavior, DataCollection, HttpBodyCollectionTarget } from './types-hoist/datacollection'; -export type { ClientOptions, CoreOptions as Options } from './types-hoist/options'; -export type { Package } from './types-hoist/package'; -export type { PolymorphicEvent, PolymorphicRequest } from './types-hoist/polymorphics'; +} from './types/envelope'; +export type { ExtendedError } from './types/error'; +export type { Event, EventHint, EventType, ErrorEvent, TransactionEvent } from './types/event'; +export type { EventProcessor } from './types/eventprocessor'; +export type { Exception } from './types/exception'; +export type { Extra, Extras } from './types/extra'; +export type { Integration, IntegrationFn } from './types/integration'; +export type { Mechanism } from './types/mechanism'; +export type { ExtractedNodeRequestData, HttpHeaderValue, Primitive, WorkerLocation } from './types/misc'; +export type { CollectBehavior, DataCollection, HttpBodyCollectionTarget } from './types/datacollection'; +export type { ClientOptions, CoreOptions as Options } from './types/options'; +export type { Package } from './types/package'; +export type { PolymorphicEvent, PolymorphicRequest } from './types/polymorphics'; export type { ThreadId, FrameId, @@ -418,7 +418,7 @@ export type { ContinuousThreadCpuProfile, Profile, ProfileChunk, -} from './types-hoist/profiling'; +} from './types/profiling'; export type { ReplayEndEvent, ReplayEvent, @@ -426,7 +426,7 @@ export type { ReplayRecordingMode, ReplayStartEvent, ReplayStopReason, -} from './types-hoist/replay'; +} from './types/replay'; export type { FeedbackErrorCode, FeedbackErrorMessages, @@ -438,17 +438,17 @@ export type { SendFeedback, SendFeedbackParams, UserFeedback, -} from './types-hoist/feedback'; +} from './types/feedback'; export type { QueryParams, RequestEventData, RequestHookInfo, ResponseHookInfo, SanitizedRequestData, -} from './types-hoist/request'; -export type { Runtime } from './types-hoist/runtime'; -export type { SdkInfo } from './types-hoist/sdkinfo'; -export type { SdkMetadata } from './types-hoist/sdkmetadata'; +} from './types/request'; +export type { Runtime } from './types/runtime'; +export type { SdkInfo } from './types/sdkinfo'; +export type { SdkMetadata } from './types/sdkmetadata'; export type { SessionAggregates, AggregationCounts, @@ -456,8 +456,8 @@ export type { SessionContext, SessionStatus, SerializedSession, -} from './types-hoist/session'; -export type { SeverityLevel } from './types-hoist/severity'; +} from './types/session'; +export type { SeverityLevel } from './types/severity'; export type { Span, SentrySpanArguments, @@ -471,10 +471,10 @@ export type { SerializedStreamedSpan, SerializedStreamedSpanContainer, StreamedSpanJSON, -} from './types-hoist/span'; -export type { SpanStatus } from './types-hoist/spanStatus'; -export type { Log, LogSeverityLevel } from './types-hoist/log'; -export type { SpanLink } from './types-hoist/link'; +} from './types/span'; +export type { SpanStatus } from './types/spanStatus'; +export type { Log, LogSeverityLevel } from './types/log'; +export type { SpanLink } from './types/link'; export type { Metric, MetricType, @@ -482,18 +482,14 @@ export type { SerializedMetricContainer, // eslint-disable-next-line deprecation/deprecation SerializedMetricAttributeValue, -} from './types-hoist/metric'; -export type { TimedEvent } from './types-hoist/timedEvent'; -export type { StackFrame } from './types-hoist/stackframe'; -export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './types-hoist/stacktrace'; -export type { PropagationContext, TracePropagationTargets, SerializedTraceData } from './types-hoist/tracing'; -export type { StartSpanOptions } from './types-hoist/startSpanOptions'; -export type { TraceparentData, TransactionSource } from './types-hoist/transaction'; -export type { - TracesSamplerSamplingContext, - CustomSamplingContext, - SamplingContext, -} from './types-hoist/samplingcontext'; +} from './types/metric'; +export type { TimedEvent } from './types/timedEvent'; +export type { StackFrame } from './types/stackframe'; +export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './types/stacktrace'; +export type { PropagationContext, TracePropagationTargets, SerializedTraceData } from './types/tracing'; +export type { StartSpanOptions } from './types/startSpanOptions'; +export type { TraceparentData, TransactionSource } from './types/transaction'; +export type { TracesSamplerSamplingContext, CustomSamplingContext, SamplingContext } from './types/samplingcontext'; export type { DurationUnit, InformationUnit, @@ -501,8 +497,8 @@ export type { MeasurementUnit, NoneUnit, Measurements, -} from './types-hoist/measurement'; -export type { Thread } from './types-hoist/thread'; +} from './types/measurement'; +export type { Thread } from './types/thread'; export type { Transport, TransportRequest, @@ -510,29 +506,23 @@ export type { InternalBaseTransportOptions, BaseTransportOptions, TransportRequestExecutor, -} from './types-hoist/transport'; -export type { User } from './types-hoist/user'; -export type { WebFetchHeaders, WebFetchRequest } from './types-hoist/webfetchapi'; -export type { WrappedFunction } from './types-hoist/wrappedfunction'; +} from './types/transport'; +export type { User } from './types/user'; +export type { WebFetchHeaders, WebFetchRequest } from './types/webfetchapi'; +export type { WrappedFunction } from './types/wrappedfunction'; export type { HandlerDataFetch, HandlerDataConsole, HandlerDataError, HandlerDataUnhandledRejection, ConsoleLevel, -} from './types-hoist/instrument'; -export type { - CheckIn, - MonitorConfig, - FinishedCheckIn, - InProgressCheckIn, - SerializedCheckIn, -} from './types-hoist/checkin'; -export type { ParameterizedString } from './types-hoist/parameterize'; -export type { ContinuousProfiler, ProfilingIntegration, Profiler } from './types-hoist/profiling'; -export type { ViewHierarchyData, ViewHierarchyWindow } from './types-hoist/view-hierarchy'; -export type { LegacyCSPReport } from './types-hoist/csp'; -export type { SerializedLog, SerializedLogContainer } from './types-hoist/log'; +} from './types/instrument'; +export type { CheckIn, MonitorConfig, FinishedCheckIn, InProgressCheckIn, SerializedCheckIn } from './types/checkin'; +export type { ParameterizedString } from './types/parameterize'; +export type { ContinuousProfiler, ProfilingIntegration, Profiler } from './types/profiling'; +export type { ViewHierarchyData, ViewHierarchyWindow } from './types/view-hierarchy'; +export type { LegacyCSPReport } from './types/csp'; +export type { SerializedLog, SerializedLogContainer } from './types/log'; export type { BuildTimeOptionsBase, UnstableVitePluginOptions, diff --git a/packages/core/src/tracing/ai/utils.ts b/packages/core/src/tracing/ai/utils.ts index 05502b249efb..31d11d4d84c4 100644 --- a/packages/core/src/tracing/ai/utils.ts +++ b/packages/core/src/tracing/ai/utils.ts @@ -4,7 +4,7 @@ import { captureException } from '../../exports'; import { getClient } from '../../currentScopes'; import { hasSpanStreamingEnabled } from '../spans/hasSpanStreamingEnabled'; -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; import { isThenable } from '../../utils/is'; import { GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, diff --git a/packages/core/src/tracing/anthropic-ai/index.ts b/packages/core/src/tracing/anthropic-ai/index.ts index a32dccccbc67..d42adf6b4f38 100644 --- a/packages/core/src/tracing/anthropic-ai/index.ts +++ b/packages/core/src/tracing/anthropic-ai/index.ts @@ -2,7 +2,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR } from '../../tracing'; import { startSpan, startSpanManual } from '../../tracing/trace'; -import type { Span, SpanAttributeValue } from '../../types-hoist/span'; +import type { Span, SpanAttributeValue } from '../../types/span'; import { GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_PROMPT_ATTRIBUTE, diff --git a/packages/core/src/tracing/anthropic-ai/streaming.ts b/packages/core/src/tracing/anthropic-ai/streaming.ts index 6e649b32253a..d8bc8d3fad2e 100644 --- a/packages/core/src/tracing/anthropic-ai/streaming.ts +++ b/packages/core/src/tracing/anthropic-ai/streaming.ts @@ -1,6 +1,6 @@ import { captureException } from '../../exports'; import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; import { endStreamSpan } from '../ai/utils'; import type { AnthropicAiStreamingEvent } from './types'; import { mapAnthropicErrorToStatusMessage } from './utils'; diff --git a/packages/core/src/tracing/anthropic-ai/utils.ts b/packages/core/src/tracing/anthropic-ai/utils.ts index 20e2ff15bafb..df1e28105d74 100644 --- a/packages/core/src/tracing/anthropic-ai/utils.ts +++ b/packages/core/src/tracing/anthropic-ai/utils.ts @@ -1,7 +1,7 @@ import { captureException } from '../../exports'; import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span } from '../../types-hoist/span'; -import type { SpanStatusType } from '../../types-hoist/spanStatus'; +import type { Span } from '../../types/span'; +import type { SpanStatusType } from '../../types/spanStatus'; import { GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts index 7cf79e53d07b..134d4c2d5da3 100644 --- a/packages/core/src/tracing/dynamicSamplingContext.ts +++ b/packages/core/src/tracing/dynamicSamplingContext.ts @@ -7,8 +7,8 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '../semanticAttributes'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; -import type { Span } from '../types-hoist/span'; +import type { DynamicSamplingContext } from '../types/envelope'; +import type { Span } from '../types/span'; import { baggageHeaderToDynamicSamplingContext, dynamicSamplingContextToSentryBaggageHeader } from '../utils/baggage'; import { extractOrgIdFromClient } from '../utils/dsn'; import { hasSpansEnabled } from '../utils/hasSpansEnabled'; diff --git a/packages/core/src/tracing/google-genai/index.ts b/packages/core/src/tracing/google-genai/index.ts index 7d5f6023f271..de066e132230 100644 --- a/packages/core/src/tracing/google-genai/index.ts +++ b/packages/core/src/tracing/google-genai/index.ts @@ -3,7 +3,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR } from '../../tracing'; import { startSpan, startSpanManual } from '../../tracing/trace'; -import type { Span, SpanAttributeValue } from '../../types-hoist/span'; +import type { Span, SpanAttributeValue } from '../../types/span'; import { handleCallbackErrors } from '../../utils/handleCallbackErrors'; import { GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, diff --git a/packages/core/src/tracing/google-genai/streaming.ts b/packages/core/src/tracing/google-genai/streaming.ts index 4a308d922eb9..d44d678753be 100644 --- a/packages/core/src/tracing/google-genai/streaming.ts +++ b/packages/core/src/tracing/google-genai/streaming.ts @@ -1,6 +1,6 @@ import { captureException } from '../../exports'; import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; import { endStreamSpan } from '../ai/utils'; import type { GoogleGenAIResponse } from './types'; diff --git a/packages/core/src/tracing/idleSpan.ts b/packages/core/src/tracing/idleSpan.ts index 884a8bb05497..22ba70b81a65 100644 --- a/packages/core/src/tracing/idleSpan.ts +++ b/packages/core/src/tracing/idleSpan.ts @@ -1,9 +1,9 @@ import { getClient, getCurrentScope } from '../currentScopes'; import { DEBUG_BUILD } from '../debug-build'; import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; -import type { Span } from '../types-hoist/span'; -import type { StartSpanOptions } from '../types-hoist/startSpanOptions'; +import type { DynamicSamplingContext } from '../types/envelope'; +import type { Span } from '../types/span'; +import type { StartSpanOptions } from '../types/startSpanOptions'; import { debug } from '../utils/debug-logger'; import { hasSpansEnabled } from '../utils/hasSpansEnabled'; import { shouldIgnoreSpan } from '../utils/should-ignore-span'; diff --git a/packages/core/src/tracing/langchain/embeddings.ts b/packages/core/src/tracing/langchain/embeddings.ts index b1afb94b9f17..64cda4e413c3 100644 --- a/packages/core/src/tracing/langchain/embeddings.ts +++ b/packages/core/src/tracing/langchain/embeddings.ts @@ -1,7 +1,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { startSpan } from '../../tracing/trace'; -import type { SpanAttributeValue } from '../../types-hoist/span'; +import type { SpanAttributeValue } from '../../types/span'; import { GEN_AI_EMBEDDINGS_OPERATION_ATTRIBUTE, GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, diff --git a/packages/core/src/tracing/langchain/index.ts b/packages/core/src/tracing/langchain/index.ts index 8ccce0f0a183..621ae76acdd5 100644 --- a/packages/core/src/tracing/langchain/index.ts +++ b/packages/core/src/tracing/langchain/index.ts @@ -3,7 +3,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR } from '../../tracing'; import { startSpanManual } from '../../tracing/trace'; -import type { Span, SpanAttributeValue } from '../../types-hoist/span'; +import type { Span, SpanAttributeValue } from '../../types/span'; import { GEN_AI_OPERATION_NAME_ATTRIBUTE, GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, diff --git a/packages/core/src/tracing/langchain/utils.ts b/packages/core/src/tracing/langchain/utils.ts index 34be8ba753bb..24f551047f87 100644 --- a/packages/core/src/tracing/langchain/utils.ts +++ b/packages/core/src/tracing/langchain/utils.ts @@ -1,5 +1,5 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; -import type { SpanAttributeValue } from '../../types-hoist/span'; +import type { SpanAttributeValue } from '../../types/span'; import { GEN_AI_AGENT_NAME_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ATTRIBUTE, diff --git a/packages/core/src/tracing/langgraph/utils.ts b/packages/core/src/tracing/langgraph/utils.ts index 8770cbbd629b..de4d559769ca 100644 --- a/packages/core/src/tracing/langgraph/utils.ts +++ b/packages/core/src/tracing/langgraph/utils.ts @@ -1,7 +1,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span, SpanAttributes } from '../../types-hoist/span'; +import type { Span, SpanAttributes } from '../../types/span'; import { GEN_AI_AGENT_NAME_ATTRIBUTE, GEN_AI_EXECUTE_TOOL_OPERATION_ATTRIBUTE, diff --git a/packages/core/src/tracing/logSpans.ts b/packages/core/src/tracing/logSpans.ts index f3bcb02e497c..6c880c8a03d9 100644 --- a/packages/core/src/tracing/logSpans.ts +++ b/packages/core/src/tracing/logSpans.ts @@ -1,5 +1,5 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { Span } from '../types-hoist/span'; +import type { Span } from '../types/span'; import { debug } from '../utils/debug-logger'; import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/measurement.ts b/packages/core/src/tracing/measurement.ts index bf9a02e88ba0..5de8523d2e8c 100644 --- a/packages/core/src/tracing/measurement.ts +++ b/packages/core/src/tracing/measurement.ts @@ -3,8 +3,8 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT, SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE, } from '../semanticAttributes'; -import type { Measurements, MeasurementUnit } from '../types-hoist/measurement'; -import type { TimedEvent } from '../types-hoist/timedEvent'; +import type { Measurements, MeasurementUnit } from '../types/measurement'; +import type { TimedEvent } from '../types/timedEvent'; import { debug } from '../utils/debug-logger'; import { getActiveSpan, getRootSpan } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/openai/index.ts b/packages/core/src/tracing/openai/index.ts index 820128050b12..ad51f41a4f4b 100644 --- a/packages/core/src/tracing/openai/index.ts +++ b/packages/core/src/tracing/openai/index.ts @@ -3,7 +3,7 @@ import { captureException } from '../../exports'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { SPAN_STATUS_ERROR } from '../../tracing'; import { startSpan, startSpanManual } from '../../tracing/trace'; -import type { Span, SpanAttributeValue } from '../../types-hoist/span'; +import type { Span, SpanAttributeValue } from '../../types/span'; import { debug } from '../../utils/debug-logger'; import { GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, diff --git a/packages/core/src/tracing/openai/streaming.ts b/packages/core/src/tracing/openai/streaming.ts index d51c47cad228..9fbdacd1e8c9 100644 --- a/packages/core/src/tracing/openai/streaming.ts +++ b/packages/core/src/tracing/openai/streaming.ts @@ -1,6 +1,6 @@ import { captureException } from '../../exports'; import { SPAN_STATUS_ERROR } from '../../tracing'; -import type { Span } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; import { endStreamSpan } from '../ai/utils'; import { RESPONSE_EVENT_TYPES } from './constants'; import type { diff --git a/packages/core/src/tracing/openai/utils.ts b/packages/core/src/tracing/openai/utils.ts index ded7b3ff0e3b..d83593ecb645 100644 --- a/packages/core/src/tracing/openai/utils.ts +++ b/packages/core/src/tracing/openai/utils.ts @@ -1,5 +1,5 @@ -import type { Span } from '../../types-hoist/span'; -import type { SpanAttributeValue } from '../../types-hoist/span'; +import type { Span } from '../../types/span'; +import type { SpanAttributeValue } from '../../types/span'; import { GEN_AI_CONVERSATION_ID_ATTRIBUTE, GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE, diff --git a/packages/core/src/tracing/sampling.ts b/packages/core/src/tracing/sampling.ts index 54cfdab59766..efc743238107 100644 --- a/packages/core/src/tracing/sampling.ts +++ b/packages/core/src/tracing/sampling.ts @@ -1,6 +1,6 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { CoreOptions } from '../types-hoist/options'; -import type { SamplingContext } from '../types-hoist/samplingcontext'; +import type { CoreOptions } from '../types/options'; +import type { SamplingContext } from '../types/samplingcontext'; import { debug } from '../utils/debug-logger'; import { hasSpansEnabled } from '../utils/hasSpansEnabled'; import { parseSampleRate } from '../utils/parseSampleRate'; diff --git a/packages/core/src/tracing/sentryNonRecordingSpan.ts b/packages/core/src/tracing/sentryNonRecordingSpan.ts index c1f01182b248..4c4c1064eedb 100644 --- a/packages/core/src/tracing/sentryNonRecordingSpan.ts +++ b/packages/core/src/tracing/sentryNonRecordingSpan.ts @@ -1,4 +1,4 @@ -import type { EventDropReason } from '../types-hoist/clientreport'; +import type { EventDropReason } from '../types/clientreport'; import type { SentrySpanArguments, Span, @@ -6,8 +6,8 @@ import type { SpanAttributeValue, SpanContextData, SpanTimeInput, -} from '../types-hoist/span'; -import type { SpanStatus } from '../types-hoist/spanStatus'; +} from '../types/span'; +import type { SpanStatus } from '../types/spanStatus'; import { generateSpanId, generateTraceId } from '../utils/propagationContext'; import { TRACE_FLAG_NONE } from '../utils/spanUtils'; diff --git a/packages/core/src/tracing/sentrySpan.ts b/packages/core/src/tracing/sentrySpan.ts index 92c4617f29c2..84c78e73356d 100644 --- a/packages/core/src/tracing/sentrySpan.ts +++ b/packages/core/src/tracing/sentrySpan.ts @@ -10,9 +10,9 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '../semanticAttributes'; -import type { SpanEnvelope } from '../types-hoist/envelope'; -import type { TransactionEvent } from '../types-hoist/event'; -import type { SpanLink } from '../types-hoist/link'; +import type { SpanEnvelope } from '../types/envelope'; +import type { TransactionEvent } from '../types/event'; +import type { SpanLink } from '../types/link'; import type { SentrySpanArguments, Span, @@ -23,9 +23,9 @@ import type { SpanOrigin, SpanTimeInput, StreamedSpanJSON, -} from '../types-hoist/span'; -import type { SpanStatus } from '../types-hoist/spanStatus'; -import type { TimedEvent } from '../types-hoist/timedEvent'; +} from '../types/span'; +import type { SpanStatus } from '../types/spanStatus'; +import type { TimedEvent } from '../types/timedEvent'; import { debug } from '../utils/debug-logger'; import { generateSpanId, generateTraceId } from '../utils/propagationContext'; import { diff --git a/packages/core/src/tracing/spans/beforeSendSpan.ts b/packages/core/src/tracing/spans/beforeSendSpan.ts index 28b1849c7779..57797e5daead 100644 --- a/packages/core/src/tracing/spans/beforeSendSpan.ts +++ b/packages/core/src/tracing/spans/beforeSendSpan.ts @@ -1,6 +1,6 @@ -import type { CoreOptions } from '../../types-hoist/options'; -import type { BeforeSendStreamedSpanCallback } from '../../types-hoist/options'; -import type { StreamedSpanJSON } from '../../types-hoist/span'; +import type { CoreOptions } from '../../types/options'; +import type { BeforeSendStreamedSpanCallback } from '../../types/options'; +import type { StreamedSpanJSON } from '../../types/span'; import { addNonEnumerableProperty } from '../../utils/object'; type StaticBeforeSendSpanCallback = CoreOptions['beforeSendSpan']; diff --git a/packages/core/src/tracing/spans/captureSpan.ts b/packages/core/src/tracing/spans/captureSpan.ts index 5c327cb934c5..ad2cdd510a7e 100644 --- a/packages/core/src/tracing/spans/captureSpan.ts +++ b/packages/core/src/tracing/spans/captureSpan.ts @@ -17,7 +17,7 @@ import { SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS, SEMANTIC_ATTRIBUTE_USER_USERNAME, } from '../../semanticAttributes'; -import type { SerializedStreamedSpan, Span, StreamedSpanJSON } from '../../types-hoist/span'; +import type { SerializedStreamedSpan, Span, StreamedSpanJSON } from '../../types/span'; import { getCombinedScopeData } from '../../utils/scopeData'; import { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from '../../utils/url'; import { diff --git a/packages/core/src/tracing/spans/envelope.ts b/packages/core/src/tracing/spans/envelope.ts index 57714fdf8117..1be30768aa9c 100644 --- a/packages/core/src/tracing/spans/envelope.ts +++ b/packages/core/src/tracing/spans/envelope.ts @@ -1,6 +1,6 @@ import type { Client } from '../../client'; -import type { DynamicSamplingContext, SpanContainerItem, StreamedSpanEnvelope } from '../../types-hoist/envelope'; -import type { SerializedStreamedSpan } from '../../types-hoist/span'; +import type { DynamicSamplingContext, SpanContainerItem, StreamedSpanEnvelope } from '../../types/envelope'; +import type { SerializedStreamedSpan } from '../../types/span'; import { dsnToString } from '../../utils/dsn'; import { createEnvelope, getSdkMetadataForEnvelopeHeader } from '../../utils/envelope'; import { isBrowser } from '../../utils/isBrowser'; diff --git a/packages/core/src/tracing/spans/estimateSize.ts b/packages/core/src/tracing/spans/estimateSize.ts index 7d5781862d62..b00c61e2c0ff 100644 --- a/packages/core/src/tracing/spans/estimateSize.ts +++ b/packages/core/src/tracing/spans/estimateSize.ts @@ -1,5 +1,5 @@ import { estimateTypedAttributesSizeInBytes } from '../../attributes'; -import type { SerializedStreamedSpan } from '../../types-hoist/span'; +import type { SerializedStreamedSpan } from '../../types/span'; /** * Estimates the serialized byte size of a {@link SerializedStreamedSpan}. diff --git a/packages/core/src/tracing/spans/extractGenAiSpans.ts b/packages/core/src/tracing/spans/extractGenAiSpans.ts index 42c47804728a..979677a4c27e 100644 --- a/packages/core/src/tracing/spans/extractGenAiSpans.ts +++ b/packages/core/src/tracing/spans/extractGenAiSpans.ts @@ -1,6 +1,6 @@ import type { Client } from '../../client'; -import type { SpanContainerItem } from '../../types-hoist/envelope'; -import type { Event } from '../../types-hoist/event'; +import type { SpanContainerItem } from '../../types/envelope'; +import type { Event } from '../../types/event'; import { isBrowser } from '../../utils/isBrowser'; import { hasSpanStreamingEnabled } from './hasSpanStreamingEnabled'; import { spanJsonToSerializedStreamedSpan } from './spanJsonToStreamedSpan'; diff --git a/packages/core/src/tracing/spans/scopeContextAttributes.ts b/packages/core/src/tracing/spans/scopeContextAttributes.ts index 1ac4196cef9b..c7267625b8bc 100644 --- a/packages/core/src/tracing/spans/scopeContextAttributes.ts +++ b/packages/core/src/tracing/spans/scopeContextAttributes.ts @@ -1,4 +1,4 @@ -import type { Contexts } from '../../types-hoist/context'; +import type { Contexts } from '../../types/context'; /** * Convert known scope contexts set by SDK integrations to span attributes. diff --git a/packages/core/src/tracing/spans/spanBuffer.ts b/packages/core/src/tracing/spans/spanBuffer.ts index cd011df5ac49..3066ae3b2790 100644 --- a/packages/core/src/tracing/spans/spanBuffer.ts +++ b/packages/core/src/tracing/spans/spanBuffer.ts @@ -1,6 +1,6 @@ import type { Client } from '../../client'; import { DEBUG_BUILD } from '../../debug-build'; -import type { SerializedStreamedSpan } from '../../types-hoist/span'; +import type { SerializedStreamedSpan } from '../../types/span'; import { debug } from '../../utils/debug-logger'; import { safeUnref } from '../../utils/timer'; import { getDynamicSamplingContextFromSpan } from '../dynamicSamplingContext'; diff --git a/packages/core/src/tracing/spans/spanJsonToStreamedSpan.ts b/packages/core/src/tracing/spans/spanJsonToStreamedSpan.ts index 4dfd6c5202b9..de664b802138 100644 --- a/packages/core/src/tracing/spans/spanJsonToStreamedSpan.ts +++ b/packages/core/src/tracing/spans/spanJsonToStreamedSpan.ts @@ -1,5 +1,5 @@ import type { RawAttributes } from '../../attributes'; -import type { SerializedStreamedSpan, SpanJSON, StreamedSpanJSON } from '../../types-hoist/span'; +import type { SerializedStreamedSpan, SpanJSON, StreamedSpanJSON } from '../../types/span'; import { streamedSpanJsonToSerializedSpan } from '../../utils/spanUtils'; /** diff --git a/packages/core/src/tracing/spanstatus.ts b/packages/core/src/tracing/spanstatus.ts index 176e201178de..60074a60f44f 100644 --- a/packages/core/src/tracing/spanstatus.ts +++ b/packages/core/src/tracing/spanstatus.ts @@ -1,5 +1,5 @@ -import type { Span } from '../types-hoist/span'; -import type { SpanStatus } from '../types-hoist/spanStatus'; +import type { Span } from '../types/span'; +import type { SpanStatus } from '../types/spanStatus'; export const SPAN_STATUS_UNSET = 0; export const SPAN_STATUS_OK = 1; diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts index 297687d40dcc..3134c58309b1 100644 --- a/packages/core/src/tracing/trace.ts +++ b/packages/core/src/tracing/trace.ts @@ -11,10 +11,10 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, } from '../semanticAttributes'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; -import type { ClientOptions } from '../types-hoist/options'; -import type { SentrySpanArguments, Span, SpanTimeInput } from '../types-hoist/span'; -import type { StartSpanOptions } from '../types-hoist/startSpanOptions'; +import type { DynamicSamplingContext } from '../types/envelope'; +import type { ClientOptions } from '../types/options'; +import type { SentrySpanArguments, Span, SpanTimeInput } from '../types/span'; +import type { StartSpanOptions } from '../types/startSpanOptions'; import { baggageHeaderToDynamicSamplingContext } from '../utils/baggage'; import { debug } from '../utils/debug-logger'; import { handleCallbackErrors } from '../utils/handleCallbackErrors'; diff --git a/packages/core/src/tracing/utils.ts b/packages/core/src/tracing/utils.ts index 04274c3d2352..0c0417a71a90 100644 --- a/packages/core/src/tracing/utils.ts +++ b/packages/core/src/tracing/utils.ts @@ -1,5 +1,5 @@ import type { Scope } from '../scope'; -import type { Span } from '../types-hoist/span'; +import type { Span } from '../types/span'; import { addNonEnumerableProperty } from '../utils/object'; import { derefWeakRef, makeWeakRef, type MaybeWeakRef } from '../utils/weakRef'; diff --git a/packages/core/src/tracing/vercel-ai/index.ts b/packages/core/src/tracing/vercel-ai/index.ts index 4abdb0af5eae..f45cfdc7a6ed 100644 --- a/packages/core/src/tracing/vercel-ai/index.ts +++ b/packages/core/src/tracing/vercel-ai/index.ts @@ -3,8 +3,8 @@ import type { Client } from '../../client'; import { getClient } from '../../currentScopes'; import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes'; import { shouldEnableTruncation } from '../ai/utils'; -import type { Event } from '../../types-hoist/event'; -import type { Span, SpanAttributes, SpanAttributeValue, SpanJSON, StreamedSpanJSON } from '../../types-hoist/span'; +import type { Event } from '../../types/event'; +import type { Span, SpanAttributes, SpanAttributeValue, SpanJSON, StreamedSpanJSON } from '../../types/span'; import { spanToJSON } from '../../utils/spanUtils'; import { GEN_AI_EMBEDDINGS_INPUT_ATTRIBUTE, diff --git a/packages/core/src/tracing/vercel-ai/utils.ts b/packages/core/src/tracing/vercel-ai/utils.ts index 61153eae608b..215ddf54a40a 100644 --- a/packages/core/src/tracing/vercel-ai/utils.ts +++ b/packages/core/src/tracing/vercel-ai/utils.ts @@ -1,5 +1,5 @@ -import type { TraceContext } from '../../types-hoist/context'; -import type { Span, SpanAttributes, SpanJSON } from '../../types-hoist/span'; +import type { TraceContext } from '../../types/context'; +import type { Span, SpanAttributes, SpanJSON } from '../../types/span'; import { GEN_AI_INPUT_MESSAGES_ATTRIBUTE, GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, diff --git a/packages/core/src/transports/base.ts b/packages/core/src/transports/base.ts index a4da7545d5c6..45553115fa64 100644 --- a/packages/core/src/transports/base.ts +++ b/packages/core/src/transports/base.ts @@ -1,12 +1,12 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { EventDropReason } from '../types-hoist/clientreport'; -import type { Envelope, EnvelopeItem } from '../types-hoist/envelope'; +import type { EventDropReason } from '../types/clientreport'; +import type { Envelope, EnvelopeItem } from '../types/envelope'; import type { InternalBaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequestExecutor, -} from '../types-hoist/transport'; +} from '../types/transport'; import { debug } from '../utils/debug-logger'; import { createEnvelope, diff --git a/packages/core/src/transports/multiplexed.ts b/packages/core/src/transports/multiplexed.ts index 41426b4a5d5a..01fe213093ed 100644 --- a/packages/core/src/transports/multiplexed.ts +++ b/packages/core/src/transports/multiplexed.ts @@ -1,7 +1,7 @@ import { getEnvelopeEndpointWithUrlEncodedAuth } from '../api'; -import type { Envelope, EnvelopeItemType, EventItem } from '../types-hoist/envelope'; -import type { Event } from '../types-hoist/event'; -import type { BaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist/transport'; +import type { Envelope, EnvelopeItemType, EventItem } from '../types/envelope'; +import type { Event } from '../types/event'; +import type { BaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types/transport'; import { dsnFromString } from '../utils/dsn'; import { createEnvelope, forEachEnvelopeItem } from '../utils/envelope'; diff --git a/packages/core/src/transports/offline.ts b/packages/core/src/transports/offline.ts index b799bf691efb..c21d3dd4a7fb 100644 --- a/packages/core/src/transports/offline.ts +++ b/packages/core/src/transports/offline.ts @@ -1,6 +1,6 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { Envelope } from '../types-hoist/envelope'; -import type { InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist/transport'; +import type { Envelope } from '../types/envelope'; +import type { InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types/transport'; import { debug } from '../utils/debug-logger'; import { envelopeContainsItemType } from '../utils/envelope'; import { parseRetryAfterHeader } from '../utils/ratelimit'; diff --git a/packages/core/src/transports/userAgent.ts b/packages/core/src/transports/userAgent.ts index 5508640a855c..0e119a9b9183 100644 --- a/packages/core/src/transports/userAgent.ts +++ b/packages/core/src/transports/userAgent.ts @@ -1,4 +1,4 @@ -import type { ClientOptions } from '../types-hoist/options'; +import type { ClientOptions } from '../types/options'; /** * Takes the SDK metadata and adds the user-agent header to the transport options. diff --git a/packages/core/src/types-hoist/attachment.ts b/packages/core/src/types/attachment.ts similarity index 100% rename from packages/core/src/types-hoist/attachment.ts rename to packages/core/src/types/attachment.ts diff --git a/packages/core/src/types-hoist/breadcrumb.ts b/packages/core/src/types/breadcrumb.ts similarity index 100% rename from packages/core/src/types-hoist/breadcrumb.ts rename to packages/core/src/types/breadcrumb.ts diff --git a/packages/core/src/types-hoist/browseroptions.ts b/packages/core/src/types/browseroptions.ts similarity index 100% rename from packages/core/src/types-hoist/browseroptions.ts rename to packages/core/src/types/browseroptions.ts diff --git a/packages/core/src/types-hoist/checkin.ts b/packages/core/src/types/checkin.ts similarity index 100% rename from packages/core/src/types-hoist/checkin.ts rename to packages/core/src/types/checkin.ts diff --git a/packages/core/src/types-hoist/clientreport.ts b/packages/core/src/types/clientreport.ts similarity index 100% rename from packages/core/src/types-hoist/clientreport.ts rename to packages/core/src/types/clientreport.ts diff --git a/packages/core/src/types-hoist/context.ts b/packages/core/src/types/context.ts similarity index 100% rename from packages/core/src/types-hoist/context.ts rename to packages/core/src/types/context.ts diff --git a/packages/core/src/types-hoist/csp.ts b/packages/core/src/types/csp.ts similarity index 100% rename from packages/core/src/types-hoist/csp.ts rename to packages/core/src/types/csp.ts diff --git a/packages/core/src/types-hoist/datacategory.ts b/packages/core/src/types/datacategory.ts similarity index 100% rename from packages/core/src/types-hoist/datacategory.ts rename to packages/core/src/types/datacategory.ts diff --git a/packages/core/src/types-hoist/datacollection.ts b/packages/core/src/types/datacollection.ts similarity index 100% rename from packages/core/src/types-hoist/datacollection.ts rename to packages/core/src/types/datacollection.ts diff --git a/packages/core/src/types-hoist/debugMeta.ts b/packages/core/src/types/debugMeta.ts similarity index 100% rename from packages/core/src/types-hoist/debugMeta.ts rename to packages/core/src/types/debugMeta.ts diff --git a/packages/core/src/types-hoist/dsn.ts b/packages/core/src/types/dsn.ts similarity index 100% rename from packages/core/src/types-hoist/dsn.ts rename to packages/core/src/types/dsn.ts diff --git a/packages/core/src/types-hoist/envelope.ts b/packages/core/src/types/envelope.ts similarity index 100% rename from packages/core/src/types-hoist/envelope.ts rename to packages/core/src/types/envelope.ts diff --git a/packages/core/src/types-hoist/error.ts b/packages/core/src/types/error.ts similarity index 100% rename from packages/core/src/types-hoist/error.ts rename to packages/core/src/types/error.ts diff --git a/packages/core/src/types-hoist/event.ts b/packages/core/src/types/event.ts similarity index 100% rename from packages/core/src/types-hoist/event.ts rename to packages/core/src/types/event.ts diff --git a/packages/core/src/types-hoist/eventprocessor.ts b/packages/core/src/types/eventprocessor.ts similarity index 100% rename from packages/core/src/types-hoist/eventprocessor.ts rename to packages/core/src/types/eventprocessor.ts diff --git a/packages/core/src/types-hoist/exception.ts b/packages/core/src/types/exception.ts similarity index 100% rename from packages/core/src/types-hoist/exception.ts rename to packages/core/src/types/exception.ts diff --git a/packages/core/src/types-hoist/extra.ts b/packages/core/src/types/extra.ts similarity index 100% rename from packages/core/src/types-hoist/extra.ts rename to packages/core/src/types/extra.ts diff --git a/packages/core/src/types-hoist/feedback/config.ts b/packages/core/src/types/feedback/config.ts similarity index 100% rename from packages/core/src/types-hoist/feedback/config.ts rename to packages/core/src/types/feedback/config.ts diff --git a/packages/core/src/types-hoist/feedback/form.ts b/packages/core/src/types/feedback/form.ts similarity index 100% rename from packages/core/src/types-hoist/feedback/form.ts rename to packages/core/src/types/feedback/form.ts diff --git a/packages/core/src/types-hoist/feedback/index.ts b/packages/core/src/types/feedback/index.ts similarity index 100% rename from packages/core/src/types-hoist/feedback/index.ts rename to packages/core/src/types/feedback/index.ts diff --git a/packages/core/src/types-hoist/feedback/sendFeedback.ts b/packages/core/src/types/feedback/sendFeedback.ts similarity index 100% rename from packages/core/src/types-hoist/feedback/sendFeedback.ts rename to packages/core/src/types/feedback/sendFeedback.ts diff --git a/packages/core/src/types-hoist/feedback/theme.ts b/packages/core/src/types/feedback/theme.ts similarity index 100% rename from packages/core/src/types-hoist/feedback/theme.ts rename to packages/core/src/types/feedback/theme.ts diff --git a/packages/core/src/types-hoist/instrument.ts b/packages/core/src/types/instrument.ts similarity index 100% rename from packages/core/src/types-hoist/instrument.ts rename to packages/core/src/types/instrument.ts diff --git a/packages/core/src/types-hoist/integration.ts b/packages/core/src/types/integration.ts similarity index 100% rename from packages/core/src/types-hoist/integration.ts rename to packages/core/src/types/integration.ts diff --git a/packages/core/src/types-hoist/link.ts b/packages/core/src/types/link.ts similarity index 100% rename from packages/core/src/types-hoist/link.ts rename to packages/core/src/types/link.ts diff --git a/packages/core/src/types-hoist/log.ts b/packages/core/src/types/log.ts similarity index 100% rename from packages/core/src/types-hoist/log.ts rename to packages/core/src/types/log.ts diff --git a/packages/core/src/types-hoist/measurement.ts b/packages/core/src/types/measurement.ts similarity index 100% rename from packages/core/src/types-hoist/measurement.ts rename to packages/core/src/types/measurement.ts diff --git a/packages/core/src/types-hoist/mechanism.ts b/packages/core/src/types/mechanism.ts similarity index 100% rename from packages/core/src/types-hoist/mechanism.ts rename to packages/core/src/types/mechanism.ts diff --git a/packages/core/src/types-hoist/metric.ts b/packages/core/src/types/metric.ts similarity index 100% rename from packages/core/src/types-hoist/metric.ts rename to packages/core/src/types/metric.ts diff --git a/packages/core/src/types-hoist/misc.ts b/packages/core/src/types/misc.ts similarity index 100% rename from packages/core/src/types-hoist/misc.ts rename to packages/core/src/types/misc.ts diff --git a/packages/core/src/types-hoist/opentelemetry.ts b/packages/core/src/types/opentelemetry.ts similarity index 100% rename from packages/core/src/types-hoist/opentelemetry.ts rename to packages/core/src/types/opentelemetry.ts diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types/options.ts similarity index 100% rename from packages/core/src/types-hoist/options.ts rename to packages/core/src/types/options.ts diff --git a/packages/core/src/types-hoist/package.ts b/packages/core/src/types/package.ts similarity index 100% rename from packages/core/src/types-hoist/package.ts rename to packages/core/src/types/package.ts diff --git a/packages/core/src/types-hoist/parameterize.ts b/packages/core/src/types/parameterize.ts similarity index 100% rename from packages/core/src/types-hoist/parameterize.ts rename to packages/core/src/types/parameterize.ts diff --git a/packages/core/src/types-hoist/polymorphics.ts b/packages/core/src/types/polymorphics.ts similarity index 100% rename from packages/core/src/types-hoist/polymorphics.ts rename to packages/core/src/types/polymorphics.ts diff --git a/packages/core/src/types-hoist/profiling.ts b/packages/core/src/types/profiling.ts similarity index 100% rename from packages/core/src/types-hoist/profiling.ts rename to packages/core/src/types/profiling.ts diff --git a/packages/core/src/types-hoist/replay.ts b/packages/core/src/types/replay.ts similarity index 100% rename from packages/core/src/types-hoist/replay.ts rename to packages/core/src/types/replay.ts diff --git a/packages/core/src/types-hoist/request.ts b/packages/core/src/types/request.ts similarity index 100% rename from packages/core/src/types-hoist/request.ts rename to packages/core/src/types/request.ts diff --git a/packages/core/src/types-hoist/runtime.ts b/packages/core/src/types/runtime.ts similarity index 100% rename from packages/core/src/types-hoist/runtime.ts rename to packages/core/src/types/runtime.ts diff --git a/packages/core/src/types-hoist/samplingcontext.ts b/packages/core/src/types/samplingcontext.ts similarity index 96% rename from packages/core/src/types-hoist/samplingcontext.ts rename to packages/core/src/types/samplingcontext.ts index 2ae787c5397d..a46d9efaba67 100644 --- a/packages/core/src/types-hoist/samplingcontext.ts +++ b/packages/core/src/types/samplingcontext.ts @@ -1,4 +1,4 @@ -import type { RequestEventData } from '../types-hoist/request'; +import type { RequestEventData } from '../types/request'; import type { WorkerLocation } from './misc'; import type { SpanAttributes } from './span'; diff --git a/packages/core/src/types-hoist/sdkinfo.ts b/packages/core/src/types/sdkinfo.ts similarity index 100% rename from packages/core/src/types-hoist/sdkinfo.ts rename to packages/core/src/types/sdkinfo.ts diff --git a/packages/core/src/types-hoist/sdkmetadata.ts b/packages/core/src/types/sdkmetadata.ts similarity index 100% rename from packages/core/src/types-hoist/sdkmetadata.ts rename to packages/core/src/types/sdkmetadata.ts diff --git a/packages/core/src/types-hoist/session.ts b/packages/core/src/types/session.ts similarity index 100% rename from packages/core/src/types-hoist/session.ts rename to packages/core/src/types/session.ts diff --git a/packages/core/src/types-hoist/severity.ts b/packages/core/src/types/severity.ts similarity index 100% rename from packages/core/src/types-hoist/severity.ts rename to packages/core/src/types/severity.ts diff --git a/packages/core/src/types-hoist/span.ts b/packages/core/src/types/span.ts similarity index 100% rename from packages/core/src/types-hoist/span.ts rename to packages/core/src/types/span.ts diff --git a/packages/core/src/types-hoist/spanStatus.ts b/packages/core/src/types/spanStatus.ts similarity index 100% rename from packages/core/src/types-hoist/spanStatus.ts rename to packages/core/src/types/spanStatus.ts diff --git a/packages/core/src/types-hoist/stackframe.ts b/packages/core/src/types/stackframe.ts similarity index 100% rename from packages/core/src/types-hoist/stackframe.ts rename to packages/core/src/types/stackframe.ts diff --git a/packages/core/src/types-hoist/stacktrace.ts b/packages/core/src/types/stacktrace.ts similarity index 100% rename from packages/core/src/types-hoist/stacktrace.ts rename to packages/core/src/types/stacktrace.ts diff --git a/packages/core/src/types-hoist/startSpanOptions.ts b/packages/core/src/types/startSpanOptions.ts similarity index 100% rename from packages/core/src/types-hoist/startSpanOptions.ts rename to packages/core/src/types/startSpanOptions.ts diff --git a/packages/core/src/types-hoist/thread.ts b/packages/core/src/types/thread.ts similarity index 100% rename from packages/core/src/types-hoist/thread.ts rename to packages/core/src/types/thread.ts diff --git a/packages/core/src/types-hoist/timedEvent.ts b/packages/core/src/types/timedEvent.ts similarity index 100% rename from packages/core/src/types-hoist/timedEvent.ts rename to packages/core/src/types/timedEvent.ts diff --git a/packages/core/src/types-hoist/tracing.ts b/packages/core/src/types/tracing.ts similarity index 100% rename from packages/core/src/types-hoist/tracing.ts rename to packages/core/src/types/tracing.ts diff --git a/packages/core/src/types-hoist/transaction.ts b/packages/core/src/types/transaction.ts similarity index 100% rename from packages/core/src/types-hoist/transaction.ts rename to packages/core/src/types/transaction.ts diff --git a/packages/core/src/types-hoist/transport.ts b/packages/core/src/types/transport.ts similarity index 100% rename from packages/core/src/types-hoist/transport.ts rename to packages/core/src/types/transport.ts diff --git a/packages/core/src/types-hoist/user.ts b/packages/core/src/types/user.ts similarity index 100% rename from packages/core/src/types-hoist/user.ts rename to packages/core/src/types/user.ts diff --git a/packages/core/src/types-hoist/view-hierarchy.ts b/packages/core/src/types/view-hierarchy.ts similarity index 100% rename from packages/core/src/types-hoist/view-hierarchy.ts rename to packages/core/src/types/view-hierarchy.ts diff --git a/packages/core/src/types-hoist/vue.ts b/packages/core/src/types/vue.ts similarity index 100% rename from packages/core/src/types-hoist/vue.ts rename to packages/core/src/types/vue.ts diff --git a/packages/core/src/types-hoist/webfetchapi.ts b/packages/core/src/types/webfetchapi.ts similarity index 100% rename from packages/core/src/types-hoist/webfetchapi.ts rename to packages/core/src/types/webfetchapi.ts diff --git a/packages/core/src/types-hoist/wrappedfunction.ts b/packages/core/src/types/wrappedfunction.ts similarity index 100% rename from packages/core/src/types-hoist/wrappedfunction.ts rename to packages/core/src/types/wrappedfunction.ts diff --git a/packages/core/src/utils/aggregate-errors.ts b/packages/core/src/utils/aggregate-errors.ts index 40f6ab479e8c..048570cb1f05 100644 --- a/packages/core/src/utils/aggregate-errors.ts +++ b/packages/core/src/utils/aggregate-errors.ts @@ -1,7 +1,7 @@ -import type { ExtendedError } from '../types-hoist/error'; -import type { Event, EventHint } from '../types-hoist/event'; -import type { Exception } from '../types-hoist/exception'; -import type { StackParser } from '../types-hoist/stacktrace'; +import type { ExtendedError } from '../types/error'; +import type { Event, EventHint } from '../types/event'; +import type { Exception } from '../types/exception'; +import type { StackParser } from '../types/stacktrace'; import { isInstanceOf } from './is'; /** diff --git a/packages/core/src/utils/anr.ts b/packages/core/src/utils/anr.ts index 0c1e6a08b4bb..ad6db13a1bf9 100644 --- a/packages/core/src/utils/anr.ts +++ b/packages/core/src/utils/anr.ts @@ -1,4 +1,4 @@ -import type { StackFrame } from '../types-hoist/stackframe'; +import type { StackFrame } from '../types/stackframe'; import { filenameIsInApp } from './node-stack-trace'; import { UNKNOWN_FUNCTION } from './stacktrace'; diff --git a/packages/core/src/utils/baggage.ts b/packages/core/src/utils/baggage.ts index 20b3aa65a81c..1abd89b57ba3 100644 --- a/packages/core/src/utils/baggage.ts +++ b/packages/core/src/utils/baggage.ts @@ -1,5 +1,5 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; +import type { DynamicSamplingContext } from '../types/envelope'; import { debug } from './debug-logger'; import { isString } from './is'; diff --git a/packages/core/src/utils/breadcrumb-log-level.ts b/packages/core/src/utils/breadcrumb-log-level.ts index 0c7e301aadcc..959e55b15e90 100644 --- a/packages/core/src/utils/breadcrumb-log-level.ts +++ b/packages/core/src/utils/breadcrumb-log-level.ts @@ -1,4 +1,4 @@ -import type { SeverityLevel } from '../types-hoist/severity'; +import type { SeverityLevel } from '../types/severity'; /** * Determine a breadcrumb's log level (only `warning` or `error`) based on an HTTP status code. diff --git a/packages/core/src/utils/clientreport.ts b/packages/core/src/utils/clientreport.ts index 9be11e9fae20..57b2419242c9 100644 --- a/packages/core/src/utils/clientreport.ts +++ b/packages/core/src/utils/clientreport.ts @@ -1,5 +1,5 @@ -import type { ClientReport } from '../types-hoist/clientreport'; -import type { ClientReportEnvelope, ClientReportItem } from '../types-hoist/envelope'; +import type { ClientReport } from '../types/clientreport'; +import type { ClientReportEnvelope, ClientReportItem } from '../types/envelope'; import { createEnvelope } from './envelope'; import { dateTimestampInSeconds } from './time'; diff --git a/packages/core/src/utils/data-collection/defaultPiiToCollectionOptions.ts b/packages/core/src/utils/data-collection/defaultPiiToCollectionOptions.ts index 1007b6ae88db..0d5922f0fe21 100644 --- a/packages/core/src/utils/data-collection/defaultPiiToCollectionOptions.ts +++ b/packages/core/src/utils/data-collection/defaultPiiToCollectionOptions.ts @@ -1,5 +1,5 @@ import { PII_HEADER_SNIPPETS } from './filtering-snippets'; -import type { DataCollection } from '../../types-hoist/datacollection'; +import type { DataCollection } from '../../types/datacollection'; /** * Helper function that maps the `sendDefaultPii` boolean flag to the corresponding `DataCollection` configuration. diff --git a/packages/core/src/utils/debug-ids.ts b/packages/core/src/utils/debug-ids.ts index ea45a8fb2e6c..c9c7e85b4456 100644 --- a/packages/core/src/utils/debug-ids.ts +++ b/packages/core/src/utils/debug-ids.ts @@ -1,5 +1,5 @@ -import type { DebugImage } from '../types-hoist/debugMeta'; -import type { StackParser } from '../types-hoist/stacktrace'; +import type { DebugImage } from '../types/debugMeta'; +import type { StackParser } from '../types/stacktrace'; import { normalizeStackTracePath } from './stacktrace'; import { GLOBAL_OBJ } from './worldwide'; diff --git a/packages/core/src/utils/debug-logger.ts b/packages/core/src/utils/debug-logger.ts index 6f52020986a4..8792f536ee0a 100644 --- a/packages/core/src/utils/debug-logger.ts +++ b/packages/core/src/utils/debug-logger.ts @@ -1,6 +1,6 @@ import { getGlobalSingleton } from '../carrier'; import { DEBUG_BUILD } from '../debug-build'; -import type { ConsoleLevel } from '../types-hoist/instrument'; +import type { ConsoleLevel } from '../types/instrument'; import { GLOBAL_OBJ } from './worldwide'; export interface SentryDebugLogger { diff --git a/packages/core/src/utils/dsn.ts b/packages/core/src/utils/dsn.ts index 1a6b6c8130af..205b135e7cc5 100644 --- a/packages/core/src/utils/dsn.ts +++ b/packages/core/src/utils/dsn.ts @@ -1,6 +1,6 @@ import type { Client } from '../client'; import { DEBUG_BUILD } from '../debug-build'; -import type { DsnComponents, DsnLike, DsnProtocol } from '../types-hoist/dsn'; +import type { DsnComponents, DsnLike, DsnProtocol } from '../types/dsn'; import { consoleSandbox, debug } from './debug-logger'; /** Regular expression used to extract org ID from a DSN host. */ diff --git a/packages/core/src/utils/envelope.ts b/packages/core/src/utils/envelope.ts index 276e46460a9f..19239dc31bc3 100644 --- a/packages/core/src/utils/envelope.ts +++ b/packages/core/src/utils/envelope.ts @@ -1,7 +1,7 @@ import { getSentryCarrier } from '../carrier'; -import type { Attachment } from '../types-hoist/attachment'; -import type { DataCategory } from '../types-hoist/datacategory'; -import type { DsnComponents } from '../types-hoist/dsn'; +import type { Attachment } from '../types/attachment'; +import type { DataCategory } from '../types/datacategory'; +import type { DsnComponents } from '../types/dsn'; import type { AttachmentItem, BaseEnvelopeHeaders, @@ -10,11 +10,11 @@ import type { EnvelopeItemType, EventEnvelopeHeaders, SpanItem, -} from '../types-hoist/envelope'; -import type { Event } from '../types-hoist/event'; -import type { SdkInfo } from '../types-hoist/sdkinfo'; -import type { SdkMetadata } from '../types-hoist/sdkmetadata'; -import type { SpanJSON } from '../types-hoist/span'; +} from '../types/envelope'; +import type { Event } from '../types/event'; +import type { SdkInfo } from '../types/sdkinfo'; +import type { SdkMetadata } from '../types/sdkmetadata'; +import type { SpanJSON } from '../types/span'; import { dsnToString } from './dsn'; import { normalize } from './normalize'; import { GLOBAL_OBJ } from './worldwide'; diff --git a/packages/core/src/utils/error.ts b/packages/core/src/utils/error.ts index 3fb6b1ef9291..788b4d086e31 100644 --- a/packages/core/src/utils/error.ts +++ b/packages/core/src/utils/error.ts @@ -1,4 +1,4 @@ -import type { ConsoleLevel } from '../types-hoist/instrument'; +import type { ConsoleLevel } from '../types/instrument'; /** * An error emitted by Sentry SDKs and related utilities. diff --git a/packages/core/src/utils/eventUtils.ts b/packages/core/src/utils/eventUtils.ts index 4391e63f72f8..6414957b55e0 100644 --- a/packages/core/src/utils/eventUtils.ts +++ b/packages/core/src/utils/eventUtils.ts @@ -1,4 +1,4 @@ -import type { Event } from '../types-hoist/event'; +import type { Event } from '../types/event'; /** * Get a list of possible event messages from a Sentry event. diff --git a/packages/core/src/utils/eventbuilder.ts b/packages/core/src/utils/eventbuilder.ts index b7edad9b72b9..8c1525ef7e74 100644 --- a/packages/core/src/utils/eventbuilder.ts +++ b/packages/core/src/utils/eventbuilder.ts @@ -1,12 +1,12 @@ import type { Client } from '../client'; -import type { Event, EventHint } from '../types-hoist/event'; -import type { Exception } from '../types-hoist/exception'; -import type { Extras } from '../types-hoist/extra'; -import type { Mechanism } from '../types-hoist/mechanism'; -import type { ParameterizedString } from '../types-hoist/parameterize'; -import type { SeverityLevel } from '../types-hoist/severity'; -import type { StackFrame } from '../types-hoist/stackframe'; -import type { StackParser } from '../types-hoist/stacktrace'; +import type { Event, EventHint } from '../types/event'; +import type { Exception } from '../types/exception'; +import type { Extras } from '../types/extra'; +import type { Mechanism } from '../types/mechanism'; +import type { ParameterizedString } from '../types/parameterize'; +import type { SeverityLevel } from '../types/severity'; +import type { StackFrame } from '../types/stackframe'; +import type { StackParser } from '../types/stacktrace'; import { isError, isErrorEvent, isParameterizedString, isPlainObject } from './is'; import { addExceptionMechanism, addExceptionTypeValue } from './misc'; import { normalizeToSize } from './normalize'; diff --git a/packages/core/src/utils/featureFlags.ts b/packages/core/src/utils/featureFlags.ts index c7551c379d3c..caafe439473c 100644 --- a/packages/core/src/utils/featureFlags.ts +++ b/packages/core/src/utils/featureFlags.ts @@ -1,6 +1,6 @@ import { getCurrentScope } from '../currentScopes'; import { DEBUG_BUILD } from '../debug-build'; -import { type Event } from '../types-hoist/event'; +import { type Event } from '../types/event'; import { debug } from './debug-logger'; import { getActiveSpan, spanToJSON } from './spanUtils'; diff --git a/packages/core/src/utils/hasSpansEnabled.ts b/packages/core/src/utils/hasSpansEnabled.ts index cfa447fd86bd..09f1ee9a2dd4 100644 --- a/packages/core/src/utils/hasSpansEnabled.ts +++ b/packages/core/src/utils/hasSpansEnabled.ts @@ -1,5 +1,5 @@ import { getClient } from '../currentScopes'; -import type { CoreOptions } from '../types-hoist/options'; +import type { CoreOptions } from '../types/options'; // Treeshakable guard to remove all code related to tracing declare const __SENTRY_TRACING__: boolean | undefined; diff --git a/packages/core/src/utils/ipAddress.ts b/packages/core/src/utils/ipAddress.ts index 8c71835c9800..3e8f18e71472 100644 --- a/packages/core/src/utils/ipAddress.ts +++ b/packages/core/src/utils/ipAddress.ts @@ -1,5 +1,5 @@ -import type { Session, SessionAggregates } from '../types-hoist/session'; -import type { User } from '../types-hoist/user'; +import type { Session, SessionAggregates } from '../types/session'; +import type { User } from '../types/user'; // By default, we want to infer the IP address, unless this is explicitly set to `null` // We do this after all other processing is done diff --git a/packages/core/src/utils/is.ts b/packages/core/src/utils/is.ts index 4c8589934800..326a2006bc4e 100644 --- a/packages/core/src/utils/is.ts +++ b/packages/core/src/utils/is.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import type { Primitive } from '../types-hoist/misc'; -import type { ParameterizedString } from '../types-hoist/parameterize'; -import type { PolymorphicEvent } from '../types-hoist/polymorphics'; -import type { VNode, VueViewModel } from '../types-hoist/vue'; +import type { Primitive } from '../types/misc'; +import type { ParameterizedString } from '../types/parameterize'; +import type { PolymorphicEvent } from '../types/polymorphics'; +import type { VNode, VueViewModel } from '../types/vue'; // eslint-disable-next-line @typescript-eslint/unbound-method const objectToString = Object.prototype.toString; diff --git a/packages/core/src/utils/isSentryRequestUrl.ts b/packages/core/src/utils/isSentryRequestUrl.ts index edcb6fe30591..14b147ed4989 100644 --- a/packages/core/src/utils/isSentryRequestUrl.ts +++ b/packages/core/src/utils/isSentryRequestUrl.ts @@ -1,5 +1,5 @@ import type { Client } from '../client'; -import type { DsnComponents } from '../types-hoist/dsn'; +import type { DsnComponents } from '../types/dsn'; import { isURLObjectRelative, parseStringToURLObject } from './url'; /** diff --git a/packages/core/src/utils/meta.ts b/packages/core/src/utils/meta.ts index 89bf7514822f..347664c1972e 100644 --- a/packages/core/src/utils/meta.ts +++ b/packages/core/src/utils/meta.ts @@ -1,4 +1,4 @@ -import type { SerializedTraceData } from '../types-hoist/tracing'; +import type { SerializedTraceData } from '../types/tracing'; import { getTraceData } from './traceData'; /** diff --git a/packages/core/src/utils/misc.ts b/packages/core/src/utils/misc.ts index b68d31a47d28..818f2cd9e0e8 100644 --- a/packages/core/src/utils/misc.ts +++ b/packages/core/src/utils/misc.ts @@ -1,7 +1,7 @@ -import type { Event } from '../types-hoist/event'; -import type { Exception } from '../types-hoist/exception'; -import type { Mechanism } from '../types-hoist/mechanism'; -import type { StackFrame } from '../types-hoist/stackframe'; +import type { Event } from '../types/event'; +import type { Exception } from '../types/exception'; +import type { Mechanism } from '../types/mechanism'; +import type { StackFrame } from '../types/stackframe'; import { addNonEnumerableProperty } from './object'; import { safeMathRandom, withRandomSafeContext } from './randomSafeContext'; import { snipLine } from './string'; diff --git a/packages/core/src/utils/node-stack-trace.ts b/packages/core/src/utils/node-stack-trace.ts index 1dfe24e9f783..3861a84bdeba 100644 --- a/packages/core/src/utils/node-stack-trace.ts +++ b/packages/core/src/utils/node-stack-trace.ts @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -import type { StackLineParser, StackLineParserFn } from '../types-hoist/stacktrace'; +import type { StackLineParser, StackLineParserFn } from '../types/stacktrace'; import { normalizeStackTracePath, UNKNOWN_FUNCTION } from './stacktrace'; export type GetModuleFn = (filename: string | undefined) => string | undefined; diff --git a/packages/core/src/utils/normalize.ts b/packages/core/src/utils/normalize.ts index 117d32b3ae4d..8b012a8563cb 100644 --- a/packages/core/src/utils/normalize.ts +++ b/packages/core/src/utils/normalize.ts @@ -1,4 +1,4 @@ -import type { Primitive } from '../types-hoist/misc'; +import type { Primitive } from '../types/misc'; import { isSyntheticEvent, isVueViewModel } from './is'; import { getNormalizationDepthOverrideHint, hasSkipNormalizationHint } from './normalizationHints'; import { convertToPlainObject } from './object'; diff --git a/packages/core/src/utils/object.ts b/packages/core/src/utils/object.ts index 34d8a267aacf..e20a9d07818b 100644 --- a/packages/core/src/utils/object.ts +++ b/packages/core/src/utils/object.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { DEBUG_BUILD } from '../debug-build'; -import type { WrappedFunction } from '../types-hoist/wrappedfunction'; +import type { WrappedFunction } from '../types/wrappedfunction'; import { htmlTreeAsString } from './browser'; import { debug } from './debug-logger'; import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is'; diff --git a/packages/core/src/utils/parameterize.ts b/packages/core/src/utils/parameterize.ts index e4136356d74c..d6e7a5e853bf 100644 --- a/packages/core/src/utils/parameterize.ts +++ b/packages/core/src/utils/parameterize.ts @@ -1,4 +1,4 @@ -import type { ParameterizedString } from '../types-hoist/parameterize'; +import type { ParameterizedString } from '../types/parameterize'; /** * Tagged template function which returns parameterized representation of the message diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts index 95e244df2092..1522376a22c0 100644 --- a/packages/core/src/utils/prepareEvent.ts +++ b/packages/core/src/utils/prepareEvent.ts @@ -3,9 +3,9 @@ import { DEFAULT_ENVIRONMENT } from '../constants'; import { notifyEventProcessors } from '../eventProcessors'; import type { CaptureContext, ScopeContext } from '../scope'; import { Scope } from '../scope'; -import type { Event, EventHint } from '../types-hoist/event'; -import type { ClientOptions } from '../types-hoist/options'; -import type { StackParser } from '../types-hoist/stacktrace'; +import type { Event, EventHint } from '../types/event'; +import type { ClientOptions } from '../types/options'; +import type { StackParser } from '../types/stacktrace'; import { getFilenameToDebugIdMap } from './debug-ids'; import { addExceptionMechanism, uuid4 } from './misc'; import { normalize } from './normalize'; diff --git a/packages/core/src/utils/ratelimit.ts b/packages/core/src/utils/ratelimit.ts index 606969d88858..d97506d9c89b 100644 --- a/packages/core/src/utils/ratelimit.ts +++ b/packages/core/src/utils/ratelimit.ts @@ -1,5 +1,5 @@ -import type { DataCategory } from '../types-hoist/datacategory'; -import type { TransportMakeRequestResponse } from '../types-hoist/transport'; +import type { DataCategory } from '../types/datacategory'; +import type { TransportMakeRequestResponse } from '../types/transport'; import { safeDateNow } from './randomSafeContext'; // Intentionally keeping the key broad, as we don't know for sure what rate limit headers get returned from backend diff --git a/packages/core/src/utils/request.ts b/packages/core/src/utils/request.ts index a3503365cfe8..9e757509e79a 100644 --- a/packages/core/src/utils/request.ts +++ b/packages/core/src/utils/request.ts @@ -1,9 +1,9 @@ /* eslint-disable max-lines-per-function */ import { DEBUG_BUILD } from '../debug-build'; import type { Scope } from '../scope'; -import type { PolymorphicRequest } from '../types-hoist/polymorphics'; -import type { RequestEventData } from '../types-hoist/request'; -import type { WebFetchHeaders, WebFetchRequest } from '../types-hoist/webfetchapi'; +import type { PolymorphicRequest } from '../types/polymorphics'; +import type { RequestEventData } from '../types/request'; +import type { WebFetchHeaders, WebFetchRequest } from '../types/webfetchapi'; import { debug } from './debug-logger'; import { safeUnref } from './timer'; diff --git a/packages/core/src/utils/scopeData.ts b/packages/core/src/utils/scopeData.ts index 6d8f68c747b5..afc7182f554d 100644 --- a/packages/core/src/utils/scopeData.ts +++ b/packages/core/src/utils/scopeData.ts @@ -1,9 +1,9 @@ import { getGlobalScope } from '../currentScopes'; import type { Scope, ScopeData } from '../scope'; import { getDynamicSamplingContextFromSpan } from '../tracing/dynamicSamplingContext'; -import type { Breadcrumb } from '../types-hoist/breadcrumb'; -import type { Event } from '../types-hoist/event'; -import type { Span } from '../types-hoist/span'; +import type { Breadcrumb } from '../types/breadcrumb'; +import type { Event } from '../types/event'; +import type { Span } from '../types/span'; import { merge } from './merge'; import { getRootSpan, spanToJSON, spanToTraceContext } from './spanUtils'; diff --git a/packages/core/src/utils/sdkMetadata.ts b/packages/core/src/utils/sdkMetadata.ts index e7755537551a..6562ea3bb929 100644 --- a/packages/core/src/utils/sdkMetadata.ts +++ b/packages/core/src/utils/sdkMetadata.ts @@ -1,4 +1,4 @@ -import type { CoreOptions } from '../types-hoist/options'; +import type { CoreOptions } from '../types/options'; import { SDK_VERSION } from '../utils/version'; /** diff --git a/packages/core/src/utils/severity.ts b/packages/core/src/utils/severity.ts index 51bc6d580ef8..9663a75ea97f 100644 --- a/packages/core/src/utils/severity.ts +++ b/packages/core/src/utils/severity.ts @@ -1,4 +1,4 @@ -import type { SeverityLevel } from '../types-hoist/severity'; +import type { SeverityLevel } from '../types/severity'; /** * Converts a string-based level into a `SeverityLevel`, normalizing it along the way. diff --git a/packages/core/src/utils/should-ignore-span.ts b/packages/core/src/utils/should-ignore-span.ts index 3113446a0b5d..7b791b4b9801 100644 --- a/packages/core/src/utils/should-ignore-span.ts +++ b/packages/core/src/utils/should-ignore-span.ts @@ -1,6 +1,6 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { ClientOptions, IgnoreSpanAttributeValue } from '../types-hoist/options'; -import type { SpanJSON } from '../types-hoist/span'; +import type { ClientOptions, IgnoreSpanAttributeValue } from '../types/options'; +import type { SpanJSON } from '../types/span'; import { debug } from './debug-logger'; import { isMatchingPattern } from './string'; diff --git a/packages/core/src/utils/spanOnScope.ts b/packages/core/src/utils/spanOnScope.ts index ad18e1687746..0e95d63984fa 100644 --- a/packages/core/src/utils/spanOnScope.ts +++ b/packages/core/src/utils/spanOnScope.ts @@ -1,5 +1,5 @@ import type { Scope } from '../scope'; -import type { Span } from '../types-hoist/span'; +import type { Span } from '../types/span'; import { addNonEnumerableProperty } from '../utils/object'; const SCOPE_SPAN_FIELD = '_sentrySpan'; diff --git a/packages/core/src/utils/spanUtils.ts b/packages/core/src/utils/spanUtils.ts index 88a6bceb6a3e..9f495ef7b30e 100644 --- a/packages/core/src/utils/spanUtils.ts +++ b/packages/core/src/utils/spanUtils.ts @@ -12,8 +12,8 @@ import { import type { SentrySpan } from '../tracing/sentrySpan'; import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus'; import { getCapturedScopesOnSpan } from '../tracing/utils'; -import type { TraceContext } from '../types-hoist/context'; -import type { SpanLink, SpanLinkJSON } from '../types-hoist/link'; +import type { TraceContext } from '../types/context'; +import type { SpanLink, SpanLinkJSON } from '../types/link'; import type { SerializedStreamedSpan, Span, @@ -22,8 +22,8 @@ import type { SpanOrigin, SpanTimeInput, StreamedSpanJSON, -} from '../types-hoist/span'; -import type { SpanStatus } from '../types-hoist/spanStatus'; +} from '../types/span'; +import type { SpanStatus } from '../types/spanStatus'; import { addNonEnumerableProperty } from '../utils/object'; import { generateSpanId } from '../utils/propagationContext'; import { timestampInSeconds } from '../utils/time'; diff --git a/packages/core/src/utils/stacktrace.ts b/packages/core/src/utils/stacktrace.ts index cc79da1cc211..6522dadfd4c8 100644 --- a/packages/core/src/utils/stacktrace.ts +++ b/packages/core/src/utils/stacktrace.ts @@ -1,7 +1,7 @@ -import type { Event } from '../types-hoist/event'; -import type { StackFrame } from '../types-hoist/stackframe'; -import type { StackLineParser, StackParser } from '../types-hoist/stacktrace'; -import type { VNode, VueViewModel } from '../types-hoist/vue'; +import type { Event } from '../types/event'; +import type { StackFrame } from '../types/stackframe'; +import type { StackLineParser, StackParser } from '../types/stacktrace'; +import type { VNode, VueViewModel } from '../types/vue'; const STACKTRACE_FRAME_LIMIT = 50; export const UNKNOWN_FUNCTION = '?'; diff --git a/packages/core/src/utils/trace-info.ts b/packages/core/src/utils/trace-info.ts index d7d0be69ca07..084a311d844d 100644 --- a/packages/core/src/utils/trace-info.ts +++ b/packages/core/src/utils/trace-info.ts @@ -5,8 +5,8 @@ import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan, } from '../tracing/dynamicSamplingContext'; -import type { TraceContext } from '../types-hoist/context'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; +import type { TraceContext } from '../types/context'; +import type { DynamicSamplingContext } from '../types/envelope'; import { getActiveSpan, spanToTraceContext } from './spanUtils'; /** Extract trace information from scope */ diff --git a/packages/core/src/utils/traceData.ts b/packages/core/src/utils/traceData.ts index c19b2560b605..fe39ab539994 100644 --- a/packages/core/src/utils/traceData.ts +++ b/packages/core/src/utils/traceData.ts @@ -5,8 +5,8 @@ import { getClient, getCurrentScope, hasExternalPropagationContext } from '../cu import { isEnabled } from '../exports'; import type { Scope } from '../scope'; import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan } from '../tracing'; -import type { Span } from '../types-hoist/span'; -import type { SerializedTraceData } from '../types-hoist/tracing'; +import type { Span } from '../types/span'; +import type { SerializedTraceData } from '../types/tracing'; import { dynamicSamplingContextToSentryBaggageHeader } from './baggage'; import { debug } from './debug-logger'; import { getActiveSpan, spanToTraceHeader, spanToTraceparentHeader } from './spanUtils'; diff --git a/packages/core/src/utils/tracePropagationTargets.ts b/packages/core/src/utils/tracePropagationTargets.ts index be3b6ce9aed8..aa47e911a997 100644 --- a/packages/core/src/utils/tracePropagationTargets.ts +++ b/packages/core/src/utils/tracePropagationTargets.ts @@ -1,5 +1,5 @@ import { DEBUG_BUILD } from '../debug-build'; -import type { CoreOptions as Options } from '../types-hoist/options'; +import type { CoreOptions as Options } from '../types/options'; import { debug } from './debug-logger'; import type { LRUMap } from './lru'; import { stringMatchesSomePattern } from './string'; diff --git a/packages/core/src/utils/tracing.ts b/packages/core/src/utils/tracing.ts index c3c5e5d91ae1..85b660c2b8b0 100644 --- a/packages/core/src/utils/tracing.ts +++ b/packages/core/src/utils/tracing.ts @@ -1,7 +1,7 @@ import type { Client } from '../client'; -import type { DynamicSamplingContext } from '../types-hoist/envelope'; -import type { PropagationContext } from '../types-hoist/tracing'; -import type { TraceparentData } from '../types-hoist/transaction'; +import type { DynamicSamplingContext } from '../types/envelope'; +import type { PropagationContext } from '../types/tracing'; +import type { TraceparentData } from '../types/transaction'; import { debug } from '../utils/debug-logger'; import { baggageHeaderToDynamicSamplingContext } from './baggage'; import { extractOrgIdFromClient } from './dsn'; diff --git a/packages/core/src/utils/transactionEvent.ts b/packages/core/src/utils/transactionEvent.ts index c6b7a9c044b9..3e55b20977a0 100644 --- a/packages/core/src/utils/transactionEvent.ts +++ b/packages/core/src/utils/transactionEvent.ts @@ -1,6 +1,6 @@ import { SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME, SEMANTIC_ATTRIBUTE_PROFILE_ID } from '../semanticAttributes'; -import type { TransactionEvent } from '../types-hoist/event'; -import type { SpanJSON } from '../types-hoist/span'; +import type { TransactionEvent } from '../types/event'; +import type { SpanJSON } from '../types/span'; /** * Converts a transaction event to a span JSON object. diff --git a/packages/core/src/utils/url.ts b/packages/core/src/utils/url.ts index bf0c17dbc278..ad56bb846b9b 100644 --- a/packages/core/src/utils/url.ts +++ b/packages/core/src/utils/url.ts @@ -4,7 +4,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_URL_FULL, } from '../semanticAttributes'; -import type { SpanAttributes } from '../types-hoist/span'; +import type { SpanAttributes } from '../types/span'; type PartialURL = { host?: string; diff --git a/packages/core/test/lib/api.test.ts b/packages/core/test/lib/api.test.ts index be7dd70dd068..879257eb20c1 100644 --- a/packages/core/test/lib/api.test.ts +++ b/packages/core/test/lib/api.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, test } from 'vitest'; import { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from '../../src/api'; -import type { DsnComponents } from '../../src/types-hoist/dsn'; -import type { SdkInfo } from '../../src/types-hoist/sdkinfo'; +import type { DsnComponents } from '../../src/types/dsn'; +import type { SdkInfo } from '../../src/types/sdkinfo'; import { makeDsn } from '../../src/utils/dsn'; const ingestDsn = 'https://abc@xxxx.ingest.sentry.io:1234/subpath/123'; diff --git a/packages/core/test/lib/checkin.test.ts b/packages/core/test/lib/checkin.test.ts index ace9ada17ab4..268e7d83381b 100644 --- a/packages/core/test/lib/checkin.test.ts +++ b/packages/core/test/lib/checkin.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from 'vitest'; import { createCheckInEnvelope } from '../../src/checkin'; -import type { SerializedCheckIn } from '../../src/types-hoist/checkin'; +import type { SerializedCheckIn } from '../../src/types/checkin'; describe('createCheckInEnvelope', () => { test('creates a check in envelope header', () => { diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts index a8971498cef8..507d6716edfb 100644 --- a/packages/core/test/lib/client.test.ts +++ b/packages/core/test/lib/client.test.ts @@ -18,9 +18,9 @@ import { _INTERNAL_captureLog } from '../../src/logs/internal'; import { _INTERNAL_captureMetric } from '../../src/metrics/internal'; import * as traceModule from '../../src/tracing/trace'; import { DEFAULT_TRANSPORT_BUFFER_SIZE } from '../../src/transports/base'; -import type { Envelope } from '../../src/types-hoist/envelope'; -import type { ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist/event'; -import type { SpanJSON } from '../../src/types-hoist/span'; +import type { Envelope } from '../../src/types/envelope'; +import type { ErrorEvent, Event, TransactionEvent } from '../../src/types/event'; +import type { SpanJSON } from '../../src/types/span'; import * as debugLoggerModule from '../../src/utils/debug-logger'; import * as miscModule from '../../src/utils/misc'; import * as timeModule from '../../src/utils/time'; diff --git a/packages/core/test/lib/envelope.test.ts b/packages/core/test/lib/envelope.test.ts index c5d246973842..d933f48b0587 100644 --- a/packages/core/test/lib/envelope.test.ts +++ b/packages/core/test/lib/envelope.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { DsnComponents } from '../../build/types/types-hoist/dsn'; -import type { DynamicSamplingContext } from '../../build/types/types-hoist/envelope'; +import type { DsnComponents } from '../../build/types/types/dsn'; +import type { DynamicSamplingContext } from '../../build/types/types/envelope'; import type { Client, SdkInfo } from '../../src'; import { getCurrentScope, @@ -11,7 +11,7 @@ import { setCurrentClient, } from '../../src'; import { _enhanceEventWithSdkInfo, createEventEnvelope, createSpanEnvelope } from '../../src/envelope'; -import type { Event } from '../../src/types-hoist/event'; +import type { Event } from '../../src/types/event'; import { getDefaultTestClientOptions, TestClient } from '../mocks/client'; const testDsn: DsnComponents = { protocol: 'https', projectId: 'abc', host: 'testry.io', publicKey: 'pubKey123' }; diff --git a/packages/core/test/lib/feedback.test.ts b/packages/core/test/lib/feedback.test.ts index 306424853354..8b925e29bb2f 100644 --- a/packages/core/test/lib/feedback.test.ts +++ b/packages/core/test/lib/feedback.test.ts @@ -9,7 +9,7 @@ import { withScope, } from '../../src'; import { captureFeedback } from '../../src/feedback'; -import type { Span } from '../../src/types-hoist/span'; +import type { Span } from '../../src/types/span'; import { getDefaultTestClientOptions, TestClient } from '../mocks/client'; describe('captureFeedback', () => { diff --git a/packages/core/test/lib/fetch.test.ts b/packages/core/test/lib/fetch.test.ts index d0274b8efe82..dec7feefec99 100644 --- a/packages/core/test/lib/fetch.test.ts +++ b/packages/core/test/lib/fetch.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import type { HandlerDataFetch } from '../../src'; import { _INTERNAL_getTracingHeadersForFetchRequest, instrumentFetchRequest } from '../../src/fetch'; -import type { Span } from '../../src/types-hoist/span'; +import type { Span } from '../../src/types/span'; const { DEFAULT_SENTRY_TRACE, DEFAULT_BAGGAGE, hasSpansEnabled } = vi.hoisted(() => ({ DEFAULT_SENTRY_TRACE: 'defaultTraceId-defaultSpanId-1', diff --git a/packages/core/test/lib/integration.test.ts b/packages/core/test/lib/integration.test.ts index e5362d669716..ae9de97304c4 100644 --- a/packages/core/test/lib/integration.test.ts +++ b/packages/core/test/lib/integration.test.ts @@ -2,8 +2,8 @@ import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest'; import { getCurrentScope } from '../../src/currentScopes'; import { addIntegration, getIntegrationsToSetup, installedIntegrations, setupIntegration } from '../../src/integration'; import { setCurrentClient } from '../../src/sdk'; -import type { Integration } from '../../src/types-hoist/integration'; -import type { CoreOptions } from '../../src/types-hoist/options'; +import type { Integration } from '../../src/types/integration'; +import type { CoreOptions } from '../../src/types/options'; import { debug } from '../../src/utils/debug-logger'; import { getDefaultTestClientOptions, TestClient } from '../mocks/client'; diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts index 05276271e13c..bd779a13134b 100644 --- a/packages/core/test/lib/integrations/captureconsole.test.ts +++ b/packages/core/test/lib/integrations/captureconsole.test.ts @@ -7,8 +7,8 @@ import * as SentryCore from '../../../src/exports'; import { addConsoleInstrumentationHandler } from '../../../src/instrument/console'; import { resetInstrumentationHandlers } from '../../../src/instrument/handlers'; import { captureConsoleIntegration } from '../../../src/integrations/captureconsole'; -import type { Event } from '../../../src/types-hoist/event'; -import type { ConsoleLevel } from '../../../src/types-hoist/instrument'; +import type { Event } from '../../../src/types/event'; +import type { ConsoleLevel } from '../../../src/types/instrument'; import { CONSOLE_LEVELS, originalConsoleMethods } from '../../../src/utils/debug-logger'; import { GLOBAL_OBJ } from '../../../src/utils/worldwide'; diff --git a/packages/core/test/lib/integrations/dedupe.test.ts b/packages/core/test/lib/integrations/dedupe.test.ts index 97567476a4da..5220d9d045ff 100644 --- a/packages/core/test/lib/integrations/dedupe.test.ts +++ b/packages/core/test/lib/integrations/dedupe.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest'; import { _shouldDropEvent, dedupeIntegration } from '../../../src/integrations/dedupe'; -import type { Event as SentryEvent } from '../../../src/types-hoist/event'; -import type { Exception } from '../../../src/types-hoist/exception'; -import type { StackFrame } from '../../../src/types-hoist/stackframe'; -import type { Stacktrace } from '../../../src/types-hoist/stacktrace'; +import type { Event as SentryEvent } from '../../../src/types/event'; +import type { Exception } from '../../../src/types/exception'; +import type { StackFrame } from '../../../src/types/stackframe'; +import type { Stacktrace } from '../../../src/types/stacktrace'; type EventWithException = SentryEvent & { exception: { diff --git a/packages/core/test/lib/integrations/eventFilters.test.ts b/packages/core/test/lib/integrations/eventFilters.test.ts index a107efe17719..5c7785c77fe4 100644 --- a/packages/core/test/lib/integrations/eventFilters.test.ts +++ b/packages/core/test/lib/integrations/eventFilters.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest'; import type { EventFiltersOptions } from '../../../src/integrations/eventFilters'; import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters'; -import type { Event } from '../../../src/types-hoist/event'; -import type { EventProcessor } from '../../../src/types-hoist/eventprocessor'; -import type { Integration } from '../../../src/types-hoist/integration'; +import type { Event } from '../../../src/types/event'; +import type { EventProcessor } from '../../../src/types/eventprocessor'; +import type { Integration } from '../../../src/types/integration'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; const PUBLIC_DSN = 'https://username@domain/123'; diff --git a/packages/core/test/lib/integrations/express/index.test.ts b/packages/core/test/lib/integrations/express/index.test.ts index 7b6ce83120a7..9d4a78cd3244 100644 --- a/packages/core/test/lib/integrations/express/index.test.ts +++ b/packages/core/test/lib/integrations/express/index.test.ts @@ -21,7 +21,7 @@ import type { ExpressErrorMiddleware, ExpressHandlerOptions, } from '../../../../src/integrations/express/types'; -import type { WrappedFunction } from '../../../../src/types-hoist/wrappedfunction'; +import type { WrappedFunction } from '../../../../src/types/wrappedfunction'; const sdkProcessingMetadata: unknown[] = []; const isolationScope = { diff --git a/packages/core/test/lib/integrations/express/patch-layer.test.ts b/packages/core/test/lib/integrations/express/patch-layer.test.ts index 5b9ba443aa84..3c44bd93836f 100644 --- a/packages/core/test/lib/integrations/express/patch-layer.test.ts +++ b/packages/core/test/lib/integrations/express/patch-layer.test.ts @@ -6,8 +6,8 @@ import { type ExpressResponse, } from '../../../../src/integrations/express/types'; import { getStoredLayers, storeLayer } from '../../../../src/integrations/express/request-layer-store'; -import { type StartSpanOptions } from '../../../../src/types-hoist/startSpanOptions'; -import { type Span } from '../../../../src/types-hoist/span'; +import { type StartSpanOptions } from '../../../../src/types/startSpanOptions'; +import { type Span } from '../../../../src/types/span'; import { EventEmitter } from 'node:events'; import { getOriginalFunction, markFunctionWrapped } from '../../../../src'; diff --git a/packages/core/test/lib/integrations/extraerrordata.test.ts b/packages/core/test/lib/integrations/extraerrordata.test.ts index 95354ea2106f..a3a75b74535b 100644 --- a/packages/core/test/lib/integrations/extraerrordata.test.ts +++ b/packages/core/test/lib/integrations/extraerrordata.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from 'vitest'; import { extraErrorDataIntegration } from '../../../src/integrations/extraerrordata'; -import type { ExtendedError } from '../../../src/types-hoist/error'; -import type { Event } from '../../../src/types-hoist/event'; +import type { ExtendedError } from '../../../src/types/error'; +import type { Event } from '../../../src/types/event'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; const extraErrorData = extraErrorDataIntegration(); diff --git a/packages/core/test/lib/integrations/http/get-outgoing-span-data.test.ts b/packages/core/test/lib/integrations/http/get-outgoing-span-data.test.ts index fa5eddc88f65..fc2527ac7732 100644 --- a/packages/core/test/lib/integrations/http/get-outgoing-span-data.test.ts +++ b/packages/core/test/lib/integrations/http/get-outgoing-span-data.test.ts @@ -4,7 +4,7 @@ import { setIncomingResponseSpanData, } from '../../../../src/integrations/http/get-outgoing-span-data'; import type { HttpClientRequest, HttpIncomingMessage } from '../../../../src/integrations/http/types'; -import type { Span } from '../../../../src/types-hoist/span'; +import type { Span } from '../../../../src/types/span'; function makeMockRequest(overrides: Partial> = {}): HttpClientRequest { return { diff --git a/packages/core/test/lib/integrations/http/server-subscription.test.ts b/packages/core/test/lib/integrations/http/server-subscription.test.ts index 2fcb09ed31a9..6be81c51f210 100644 --- a/packages/core/test/lib/integrations/http/server-subscription.test.ts +++ b/packages/core/test/lib/integrations/http/server-subscription.test.ts @@ -6,7 +6,7 @@ import { getIsolationScope } from '../../../../src/currentScopes'; import { setCurrentClient } from '../../../../src/sdk'; import { HTTP_ON_SERVER_REQUEST } from '../../../../src/integrations/http/constants'; import { getHttpServerSubscriptions } from '../../../../src/integrations/http/server-subscription'; -import type { Event } from '../../../../src/types-hoist/event'; +import type { Event } from '../../../../src/types/event'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; describe('getHttpServerSubscriptions', () => { diff --git a/packages/core/test/lib/integrations/metadata.test.ts b/packages/core/test/lib/integrations/metadata.test.ts index f541df6dd3bf..4063662de9f4 100644 --- a/packages/core/test/lib/integrations/metadata.test.ts +++ b/packages/core/test/lib/integrations/metadata.test.ts @@ -9,7 +9,7 @@ import { parseEnvelope, setCurrentClient, } from '../../../src'; -import type { Event } from '../../../src/types-hoist/event'; +import type { Event } from '../../../src/types/event'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; const stackParser = createStackParser(nodeStackLineParser()); diff --git a/packages/core/test/lib/integrations/requestdata.test.ts b/packages/core/test/lib/integrations/requestdata.test.ts index 7b2dca819ea3..6130350d9740 100644 --- a/packages/core/test/lib/integrations/requestdata.test.ts +++ b/packages/core/test/lib/integrations/requestdata.test.ts @@ -2,8 +2,8 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import type { Client } from '../../../src/client'; import * as currentScopes from '../../../src/currentScopes'; import { requestDataIntegration } from '../../../src/integrations/requestdata'; -import type { Event } from '../../../src/types-hoist/event'; -import type { StreamedSpanJSON } from '../../../src/types-hoist/span'; +import type { Event } from '../../../src/types/event'; +import type { StreamedSpanJSON } from '../../../src/types/span'; import { ipHeaderNames } from '../../../src/vendor/getIpAddress'; function mockClient(sendDefaultPii: boolean | undefined): Client { diff --git a/packages/core/test/lib/integrations/rewriteframes.test.ts b/packages/core/test/lib/integrations/rewriteframes.test.ts index 19784db1bd48..45319ec5258d 100644 --- a/packages/core/test/lib/integrations/rewriteframes.test.ts +++ b/packages/core/test/lib/integrations/rewriteframes.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'; import { generateIteratee, rewriteFramesIntegration } from '../../../src/integrations/rewriteframes'; -import type { Event } from '../../../src/types-hoist/event'; -import type { StackFrame } from '../../../src/types-hoist/stackframe'; +import type { Event } from '../../../src/types/event'; +import type { StackFrame } from '../../../src/types/stackframe'; let rewriteFrames: ReturnType; let exceptionEvent: Event; diff --git a/packages/core/test/lib/integrations/third-party-errors-filter.test.ts b/packages/core/test/lib/integrations/third-party-errors-filter.test.ts index 03ac1c2857b4..7bb5120d2b88 100644 --- a/packages/core/test/lib/integrations/third-party-errors-filter.test.ts +++ b/packages/core/test/lib/integrations/third-party-errors-filter.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import type { Client } from '../../../src/client'; import { thirdPartyErrorFilterIntegration } from '../../../src/integrations/third-party-errors-filter'; import { addMetadataToStackFrames } from '../../../src/metadata'; -import type { Event } from '../../../src/types-hoist/event'; +import type { Event } from '../../../src/types/event'; import { nodeStackLineParser } from '../../../src/utils/node-stack-trace'; import { createStackParser } from '../../../src/utils/stacktrace'; import { GLOBAL_OBJ } from '../../../src/utils/worldwide'; diff --git a/packages/core/test/lib/integrations/zoderrrors.test.ts b/packages/core/test/lib/integrations/zoderrrors.test.ts index 68141d2b4fc9..984636408e5c 100644 --- a/packages/core/test/lib/integrations/zoderrrors.test.ts +++ b/packages/core/test/lib/integrations/zoderrrors.test.ts @@ -6,7 +6,7 @@ import { flattenIssuePath, formatIssueMessage, } from '../../../src/integrations/zoderrors'; -import type { Event, EventHint } from '../../../src/types-hoist/event'; +import type { Event, EventHint } from '../../../src/types/event'; // Simplified type definition interface ZodIssue { diff --git a/packages/core/test/lib/logs/envelope.test.ts b/packages/core/test/lib/logs/envelope.test.ts index 86626364f506..15338780f484 100644 --- a/packages/core/test/lib/logs/envelope.test.ts +++ b/packages/core/test/lib/logs/envelope.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { createLogContainerEnvelopeItem, createLogEnvelope } from '../../../src/logs/envelope'; -import type { DsnComponents } from '../../../src/types-hoist/dsn'; -import type { SerializedLog } from '../../../src/types-hoist/log'; -import type { SdkMetadata } from '../../../src/types-hoist/sdkmetadata'; +import type { DsnComponents } from '../../../src/types/dsn'; +import type { SerializedLog } from '../../../src/types/log'; +import type { SdkMetadata } from '../../../src/types/sdkmetadata'; import * as utilsDsn from '../../../src/utils/dsn'; import * as utilsEnvelope from '../../../src/utils/envelope'; import { isBrowser } from '../../../src/utils/isBrowser'; diff --git a/packages/core/test/lib/logs/internal.test.ts b/packages/core/test/lib/logs/internal.test.ts index 48c93c7cf1d1..c1b69ba41522 100644 --- a/packages/core/test/lib/logs/internal.test.ts +++ b/packages/core/test/lib/logs/internal.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { fmt, Scope } from '../../../src'; import { _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer, _INTERNAL_getLogBuffer } from '../../../src/logs/internal'; -import type { Log } from '../../../src/types-hoist/log'; +import type { Log } from '../../../src/types/log'; import * as loggerModule from '../../../src/utils/debug-logger'; import * as timeModule from '../../../src/utils/time'; import { _INTERNAL_resetSequenceNumber } from '../../../src/utils/timestampSequence'; diff --git a/packages/core/test/lib/metadata.test.ts b/packages/core/test/lib/metadata.test.ts index e312698a6cf8..0036b68657ba 100644 --- a/packages/core/test/lib/metadata.test.ts +++ b/packages/core/test/lib/metadata.test.ts @@ -5,7 +5,7 @@ import { getMetadataForUrl, stripMetadataFromStackFrames, } from '../../src/metadata'; -import type { Event } from '../../src/types-hoist/event'; +import type { Event } from '../../src/types/event'; import { nodeStackLineParser } from '../../src/utils/node-stack-trace'; import { createStackParser } from '../../src/utils/stacktrace'; import { GLOBAL_OBJ } from '../../src/utils/worldwide'; diff --git a/packages/core/test/lib/metrics/envelope.test.ts b/packages/core/test/lib/metrics/envelope.test.ts index 25bf5e61923b..c98e1b8b016a 100644 --- a/packages/core/test/lib/metrics/envelope.test.ts +++ b/packages/core/test/lib/metrics/envelope.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { createMetricContainerEnvelopeItem, createMetricEnvelope } from '../../../src/metrics/envelope'; -import type { DsnComponents } from '../../../src/types-hoist/dsn'; -import type { SerializedMetric } from '../../../src/types-hoist/metric'; -import type { SdkMetadata } from '../../../src/types-hoist/sdkmetadata'; +import type { DsnComponents } from '../../../src/types/dsn'; +import type { SerializedMetric } from '../../../src/types/metric'; +import type { SdkMetadata } from '../../../src/types/sdkmetadata'; import * as utilsDsn from '../../../src/utils/dsn'; import * as utilsEnvelope from '../../../src/utils/envelope'; import { isBrowser } from '../../../src/utils/isBrowser'; diff --git a/packages/core/test/lib/metrics/internal.test.ts b/packages/core/test/lib/metrics/internal.test.ts index 971a7a345883..06d19d5c74a7 100644 --- a/packages/core/test/lib/metrics/internal.test.ts +++ b/packages/core/test/lib/metrics/internal.test.ts @@ -5,7 +5,7 @@ import { _INTERNAL_flushMetricsBuffer, _INTERNAL_getMetricBuffer, } from '../../../src/metrics/internal'; -import type { Metric } from '../../../src/types-hoist/metric'; +import type { Metric } from '../../../src/types/metric'; import * as loggerModule from '../../../src/utils/debug-logger'; import * as timeModule from '../../../src/utils/time'; import { _INTERNAL_resetSequenceNumber } from '../../../src/utils/timestampSequence'; diff --git a/packages/core/test/lib/prepareEvent.test.ts b/packages/core/test/lib/prepareEvent.test.ts index 6472d3680fb0..bb20b030d79e 100644 --- a/packages/core/test/lib/prepareEvent.test.ts +++ b/packages/core/test/lib/prepareEvent.test.ts @@ -2,11 +2,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import type { Client, ScopeContext } from '../../src'; import { createStackParser, getGlobalScope, getIsolationScope, GLOBAL_OBJ } from '../../src'; import { Scope } from '../../src/scope'; -import type { Attachment } from '../../src/types-hoist/attachment'; -import type { Breadcrumb } from '../../src/types-hoist/breadcrumb'; -import type { Event, EventHint } from '../../src/types-hoist/event'; -import type { EventProcessor } from '../../src/types-hoist/eventprocessor'; -import type { ClientOptions } from '../../src/types-hoist/options'; +import type { Attachment } from '../../src/types/attachment'; +import type { Breadcrumb } from '../../src/types/breadcrumb'; +import type { Event, EventHint } from '../../src/types/event'; +import type { EventProcessor } from '../../src/types/eventprocessor'; +import type { ClientOptions } from '../../src/types/options'; import { applyClientOptions, applyDebugIds, diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts index 34b04cf45a77..e89f667ee211 100644 --- a/packages/core/test/lib/scope.test.ts +++ b/packages/core/test/lib/scope.test.ts @@ -8,8 +8,8 @@ import { withScope, } from '../../src/currentScopes'; import { Scope } from '../../src/scope'; -import type { Breadcrumb } from '../../src/types-hoist/breadcrumb'; -import type { Event } from '../../src/types-hoist/event'; +import type { Breadcrumb } from '../../src/types/breadcrumb'; +import type { Event } from '../../src/types/event'; import { uuid4 } from '../../src/utils/misc'; import { applyScopeDataToEvent } from '../../src/utils/scopeData'; import { getDefaultTestClientOptions, TestClient } from '../mocks/client'; diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts index 27bfa29e6a53..588585630621 100644 --- a/packages/core/test/lib/sdk.test.ts +++ b/packages/core/test/lib/sdk.test.ts @@ -4,7 +4,7 @@ import { getCurrentScope } from '../../src/currentScopes'; import { captureCheckIn } from '../../src/exports'; import { installedIntegrations } from '../../src/integration'; import { initAndBind, setCurrentClient } from '../../src/sdk'; -import type { Integration } from '../../src/types-hoist/integration'; +import type { Integration } from '../../src/types/integration'; import { getDefaultTestClientOptions, TestClient } from '../mocks/client'; // eslint-disable-next-line no-var diff --git a/packages/core/test/lib/server-runtime-client.test.ts b/packages/core/test/lib/server-runtime-client.test.ts index 8d7f7fbc48c5..12ae4d625503 100644 --- a/packages/core/test/lib/server-runtime-client.test.ts +++ b/packages/core/test/lib/server-runtime-client.test.ts @@ -3,7 +3,7 @@ import { applySdkMetadata, createTransport, Scope } from '../../src'; import { _INTERNAL_captureMetric, _INTERNAL_getMetricBuffer } from '../../src/metrics/internal'; import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client'; import { ServerRuntimeClient } from '../../src/server-runtime-client'; -import type { Event, EventHint } from '../../src/types-hoist/event'; +import type { Event, EventHint } from '../../src/types/event'; const PUBLIC_DSN = 'https://username@domain/123'; diff --git a/packages/core/test/lib/session.test.ts b/packages/core/test/lib/session.test.ts index 9d6cfe06e426..dfe3a764af16 100644 --- a/packages/core/test/lib/session.test.ts +++ b/packages/core/test/lib/session.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, test } from 'vitest'; import { closeSession, makeSession, updateSession } from '../../src/session'; -import type { SessionContext } from '../../src/types-hoist/session'; +import type { SessionContext } from '../../src/types/session'; import { timestampInSeconds } from '../../src/utils/time'; describe('Session', () => { diff --git a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts index 65fcf5a71c8e..b2bdcd748293 100644 --- a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts +++ b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts @@ -8,8 +8,8 @@ import { import { DEFAULT_ENVIRONMENT } from '../../../src/constants'; import { getDynamicSamplingContextFromSpan, SentrySpan, startInactiveSpan } from '../../../src/tracing'; import { freezeDscOnSpan, getDynamicSamplingContextFromClient } from '../../../src/tracing/dynamicSamplingContext'; -import type { Span, SpanContextData } from '../../../src/types-hoist/span'; -import type { TransactionSource } from '../../../src/types-hoist/transaction'; +import type { Span, SpanContextData } from '../../../src/types/span'; +import type { TransactionSource } from '../../../src/types/transaction'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; describe('getDynamicSamplingContextFromSpan', () => { diff --git a/packages/core/test/lib/tracing/errors.test.ts b/packages/core/test/lib/tracing/errors.test.ts index 128ee9180d54..025f72574594 100644 --- a/packages/core/test/lib/tracing/errors.test.ts +++ b/packages/core/test/lib/tracing/errors.test.ts @@ -3,7 +3,7 @@ import { setCurrentClient, spanToJSON, startInactiveSpan, startSpan } from '../. import * as globalErrorModule from '../../../src/instrument/globalError'; import * as globalUnhandledRejectionModule from '../../../src/instrument/globalUnhandledRejection'; import { _resetErrorsInstrumented, registerSpanErrorInstrumentation } from '../../../src/tracing/errors'; -import type { HandlerDataError, HandlerDataUnhandledRejection } from '../../../src/types-hoist/instrument'; +import type { HandlerDataError, HandlerDataUnhandledRejection } from '../../../src/types/instrument'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; let mockErrorCallback: (data: HandlerDataError) => void = () => {}; diff --git a/packages/core/test/lib/tracing/idleSpan.test.ts b/packages/core/test/lib/tracing/idleSpan.test.ts index 3e930872945d..29aaa63c2bb0 100644 --- a/packages/core/test/lib/tracing/idleSpan.test.ts +++ b/packages/core/test/lib/tracing/idleSpan.test.ts @@ -16,8 +16,8 @@ import { startSpanManual, } from '../../../src'; import { startIdleSpan, TRACING_DEFAULTS } from '../../../src/tracing/idleSpan'; -import type { Event } from '../../../src/types-hoist/event'; -import type { Span } from '../../../src/types-hoist/span'; +import type { Event } from '../../../src/types/event'; +import type { Span } from '../../../src/types/span'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; const dsn = 'https://123@sentry.io/42'; diff --git a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts index 25d8100518d3..1aeec1893908 100644 --- a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts +++ b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; import { SPAN_STATUS_ERROR } from '../../../src/tracing'; import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan'; -import type { Span } from '../../../src/types-hoist/span'; +import type { Span } from '../../../src/types/span'; import { spanIsSampled, spanToJSON, TRACE_FLAG_NONE } from '../../../src/utils/spanUtils'; describe('SentryNonRecordingSpan', () => { diff --git a/packages/core/test/lib/tracing/sentrySpan.test.ts b/packages/core/test/lib/tracing/sentrySpan.test.ts index 57ac2cdf5ba3..76b7186cd28f 100644 --- a/packages/core/test/lib/tracing/sentrySpan.test.ts +++ b/packages/core/test/lib/tracing/sentrySpan.test.ts @@ -4,7 +4,7 @@ import { setCurrentClient } from '../../../src/sdk'; import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../../../src/semanticAttributes'; import { SentrySpan } from '../../../src/tracing/sentrySpan'; import { SPAN_STATUS_ERROR } from '../../../src/tracing/spanstatus'; -import type { SpanJSON } from '../../../src/types-hoist/span'; +import type { SpanJSON } from '../../../src/types/span'; import { spanToJSON, TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils'; import { timestampInSeconds } from '../../../src/utils/time'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; diff --git a/packages/core/test/lib/tracing/spans/envelope.test.ts b/packages/core/test/lib/tracing/spans/envelope.test.ts index 983a7e198b73..eb0ec478c5d7 100644 --- a/packages/core/test/lib/tracing/spans/envelope.test.ts +++ b/packages/core/test/lib/tracing/spans/envelope.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import { createStreamedSpanEnvelope } from '../../../../src/tracing/spans/envelope'; -import type { DynamicSamplingContext } from '../../../../src/types-hoist/envelope'; -import type { SerializedStreamedSpan } from '../../../../src/types-hoist/span'; +import type { DynamicSamplingContext } from '../../../../src/types/envelope'; +import type { SerializedStreamedSpan } from '../../../../src/types/span'; import { isBrowser } from '../../../../src/utils/isBrowser'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; diff --git a/packages/core/test/lib/tracing/spans/estimateSize.test.ts b/packages/core/test/lib/tracing/spans/estimateSize.test.ts index e92b260839f2..367a1856f3b5 100644 --- a/packages/core/test/lib/tracing/spans/estimateSize.test.ts +++ b/packages/core/test/lib/tracing/spans/estimateSize.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { estimateSerializedSpanSizeInBytes } from '../../../../src/tracing/spans/estimateSize'; -import type { SerializedStreamedSpan } from '../../../../src/types-hoist/span'; +import type { SerializedStreamedSpan } from '../../../../src/types/span'; // Produces a realistic trace_id (32 hex chars) and span_id (16 hex chars) const TRACE_ID = 'a1b2c3d4e5f607189a0b1c2d3e4f5060'; diff --git a/packages/core/test/lib/tracing/spans/extractGenAiSpans.test.ts b/packages/core/test/lib/tracing/spans/extractGenAiSpans.test.ts index e3286fb76a97..dd6c8e4773c8 100644 --- a/packages/core/test/lib/tracing/spans/extractGenAiSpans.test.ts +++ b/packages/core/test/lib/tracing/spans/extractGenAiSpans.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import type { Event } from '../../../../src/types-hoist/event'; -import type { SpanJSON } from '../../../../src/types-hoist/span'; +import type { Event } from '../../../../src/types/event'; +import type { SpanJSON } from '../../../../src/types/span'; import { extractGenAiSpansFromEvent } from '../../../../src/tracing/spans/extractGenAiSpans'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; diff --git a/packages/core/test/lib/tracing/spans/spanJsonToStreamedSpan.test.ts b/packages/core/test/lib/tracing/spans/spanJsonToStreamedSpan.test.ts index a42ce3468e65..e274746a594c 100644 --- a/packages/core/test/lib/tracing/spans/spanJsonToStreamedSpan.test.ts +++ b/packages/core/test/lib/tracing/spans/spanJsonToStreamedSpan.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import type { SpanJSON } from '../../../../src/types-hoist/span'; +import type { SpanJSON } from '../../../../src/types/span'; import { spanJsonToSerializedStreamedSpan } from '../../../../src/tracing/spans/spanJsonToStreamedSpan'; function makeSpanJSON(overrides: Partial = {}): SpanJSON { diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts index db449f9a8ede..0d0e652e64aa 100644 --- a/packages/core/test/lib/tracing/trace.test.ts +++ b/packages/core/test/lib/tracing/trace.test.ts @@ -27,9 +27,9 @@ import { } from '../../../src/tracing'; import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan'; import { startNewTrace } from '../../../src/tracing/trace'; -import type { Event } from '../../../src/types-hoist/event'; -import type { Span } from '../../../src/types-hoist/span'; -import type { StartSpanOptions } from '../../../src/types-hoist/startSpanOptions'; +import type { Event } from '../../../src/types/event'; +import type { Span } from '../../../src/types/span'; +import type { StartSpanOptions } from '../../../src/types/startSpanOptions'; import { _setSpanForScope } from '../../../src/utils/spanOnScope'; import { getActiveSpan, getRootSpan, getSpanDescendants, spanIsSampled } from '../../../src/utils/spanUtils'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; diff --git a/packages/core/test/lib/tracing/utils.test.ts b/packages/core/test/lib/tracing/utils.test.ts index 5fe44f4199ea..3f65bd89ef9a 100644 --- a/packages/core/test/lib/tracing/utils.test.ts +++ b/packages/core/test/lib/tracing/utils.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; import { Scope } from '../../../src/scope'; import { getCapturedScopesOnSpan, setCapturedScopesOnSpan } from '../../../src/tracing/utils'; -import type { Span } from '../../../src/types-hoist/span'; +import type { Span } from '../../../src/types/span'; // Mock span object that implements the minimum needed interface function createMockSpan(): Span { diff --git a/packages/core/test/lib/tracing/vercel-ai-cached-tokens.test.ts b/packages/core/test/lib/tracing/vercel-ai-cached-tokens.test.ts index 7e85121b9e92..3ff720959d8e 100644 --- a/packages/core/test/lib/tracing/vercel-ai-cached-tokens.test.ts +++ b/packages/core/test/lib/tracing/vercel-ai-cached-tokens.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { addVercelAiProcessors } from '../../../src/tracing/vercel-ai'; -import type { SpanJSON } from '../../../src/types-hoist/span'; +import type { SpanJSON } from '../../../src/types/span'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; describe('vercel-ai cached tokens', () => { diff --git a/packages/core/test/lib/tracing/vercel-ai-parent-tokens.test.ts b/packages/core/test/lib/tracing/vercel-ai-parent-tokens.test.ts index ff380243b22d..b3541a20787a 100644 --- a/packages/core/test/lib/tracing/vercel-ai-parent-tokens.test.ts +++ b/packages/core/test/lib/tracing/vercel-ai-parent-tokens.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { addVercelAiProcessors } from '../../../src/tracing/vercel-ai'; -import type { SpanJSON } from '../../../src/types-hoist/span'; +import type { SpanJSON } from '../../../src/types/span'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; describe('vercel-ai parent span token attributes', () => { diff --git a/packages/core/test/lib/tracing/vercel-ai-span-status.test.ts b/packages/core/test/lib/tracing/vercel-ai-span-status.test.ts index dbba343eca42..8a7b4302315b 100644 --- a/packages/core/test/lib/tracing/vercel-ai-span-status.test.ts +++ b/packages/core/test/lib/tracing/vercel-ai-span-status.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { addVercelAiProcessors } from '../../../src/tracing/vercel-ai'; -import type { SpanJSON } from '../../../src/types-hoist/span'; +import type { SpanJSON } from '../../../src/types/span'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; describe('vercel-ai span status normalization', () => { diff --git a/packages/core/test/lib/transports/base.test.ts b/packages/core/test/lib/transports/base.test.ts index f1a747a64917..0b761d5d6708 100644 --- a/packages/core/test/lib/transports/base.test.ts +++ b/packages/core/test/lib/transports/base.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest'; import { createTransport } from '../../../src/transports/base'; -import type { ClientReport } from '../../../src/types-hoist/clientreport'; -import type { AttachmentItem, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope'; -import type { TransportMakeRequestResponse } from '../../../src/types-hoist/transport'; +import type { ClientReport } from '../../../src/types/clientreport'; +import type { AttachmentItem, EventEnvelope, EventItem } from '../../../src/types/envelope'; +import type { TransportMakeRequestResponse } from '../../../src/types/transport'; import { createClientReportEnvelope } from '../../../src/utils/clientreport'; import { createEnvelope, serializeEnvelope } from '../../../src/utils/envelope'; import { type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from '../../../src/utils/promisebuffer'; diff --git a/packages/core/test/lib/transports/multiplexed.test.ts b/packages/core/test/lib/transports/multiplexed.test.ts index 105d54b17eea..0b0938e60953 100644 --- a/packages/core/test/lib/transports/multiplexed.test.ts +++ b/packages/core/test/lib/transports/multiplexed.test.ts @@ -9,10 +9,10 @@ import { parseEnvelope, } from '../../../src'; import { eventFromEnvelope, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '../../../src/transports/multiplexed'; -import type { ClientReport } from '../../../src/types-hoist/clientreport'; -import type { Envelope, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope'; -import type { TransactionEvent } from '../../../src/types-hoist/event'; -import type { BaseTransportOptions, Transport } from '../../../src/types-hoist/transport'; +import type { ClientReport } from '../../../src/types/clientreport'; +import type { Envelope, EventEnvelope, EventItem } from '../../../src/types/envelope'; +import type { TransactionEvent } from '../../../src/types/event'; +import type { BaseTransportOptions, Transport } from '../../../src/types/transport'; const DSN1 = 'https://1234@5678.ingest.sentry.io/4321'; const DSN1_URL = getEnvelopeEndpointWithUrlEncodedAuth(dsnFromString(DSN1)!); diff --git a/packages/core/test/lib/transports/offline.test.ts b/packages/core/test/lib/transports/offline.test.ts index d09401367e5d..a43a86a2c409 100644 --- a/packages/core/test/lib/transports/offline.test.ts +++ b/packages/core/test/lib/transports/offline.test.ts @@ -10,10 +10,10 @@ import { } from '../../../src'; import type { CreateOfflineStore, OfflineTransportOptions } from '../../../src/transports/offline'; import { makeOfflineTransport, MIN_DELAY, START_DELAY } from '../../../src/transports/offline'; -import type { ClientReport } from '../../../src/types-hoist/clientreport'; -import type { Envelope, EventEnvelope, EventItem, ReplayEnvelope } from '../../../src/types-hoist/envelope'; -import type { ReplayEvent } from '../../../src/types-hoist/replay'; -import type { InternalBaseTransportOptions, TransportMakeRequestResponse } from '../../../src/types-hoist/transport'; +import type { ClientReport } from '../../../src/types/clientreport'; +import type { Envelope, EventEnvelope, EventItem, ReplayEnvelope } from '../../../src/types/envelope'; +import type { ReplayEvent } from '../../../src/types/replay'; +import type { InternalBaseTransportOptions, TransportMakeRequestResponse } from '../../../src/types/transport'; const ERROR_ENVELOPE = createEnvelope({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [ [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem, diff --git a/packages/core/test/lib/utils/aggregate-errors.test.ts b/packages/core/test/lib/utils/aggregate-errors.test.ts index 9a3e5f31ef5a..ac9e0c4f3bc5 100644 --- a/packages/core/test/lib/utils/aggregate-errors.test.ts +++ b/packages/core/test/lib/utils/aggregate-errors.test.ts @@ -1,8 +1,8 @@ import { describe, expect, test } from 'vitest'; -import type { ExtendedError } from '../../../src/types-hoist/error'; -import type { Event, EventHint } from '../../../src/types-hoist/event'; -import type { Exception } from '../../../src/types-hoist/exception'; -import type { StackParser } from '../../../src/types-hoist/stacktrace'; +import type { ExtendedError } from '../../../src/types/error'; +import type { Event, EventHint } from '../../../src/types/event'; +import type { Exception } from '../../../src/types/exception'; +import type { StackParser } from '../../../src/types/stacktrace'; import { applyAggregateErrorsToEvent } from '../../../src/utils/aggregate-errors'; import { createStackParser } from '../../../src/utils/stacktrace'; diff --git a/packages/core/test/lib/utils/anthropic-utils.test.ts b/packages/core/test/lib/utils/anthropic-utils.test.ts index 8712d1f96407..6880310c2064 100644 --- a/packages/core/test/lib/utils/anthropic-utils.test.ts +++ b/packages/core/test/lib/utils/anthropic-utils.test.ts @@ -4,7 +4,7 @@ import { messagesFromParams, setMessagesAttribute, } from '../../../src/tracing/anthropic-ai/utils'; -import type { Span } from '../../../src/types-hoist/span'; +import type { Span } from '../../../src/types/span'; describe('anthropic-ai-utils', () => { describe('mapAnthropicErrorToStatusMessage', () => { diff --git a/packages/core/test/lib/utils/clientreport.test.ts b/packages/core/test/lib/utils/clientreport.test.ts index 8acc9c9d8dc0..987ace24a672 100644 --- a/packages/core/test/lib/utils/clientreport.test.ts +++ b/packages/core/test/lib/utils/clientreport.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import type { ClientReport } from '../../../src/types-hoist/clientreport'; +import type { ClientReport } from '../../../src/types/clientreport'; import { createClientReportEnvelope } from '../../../src/utils/clientreport'; import { parseEnvelope, serializeEnvelope } from '../../../src/utils/envelope'; diff --git a/packages/core/test/lib/utils/envelope.test.ts b/packages/core/test/lib/utils/envelope.test.ts index 85bff6a662f2..d9e2c5dacf9b 100644 --- a/packages/core/test/lib/utils/envelope.test.ts +++ b/packages/core/test/lib/utils/envelope.test.ts @@ -7,9 +7,9 @@ import { } from '@sentry/core'; import { afterEach, describe, expect, it, test, vi } from 'vitest'; import { getSentryCarrier } from '../../../src/carrier'; -import type { EventEnvelope } from '../../../src/types-hoist/envelope'; -import type { Event } from '../../../src/types-hoist/event'; -import type { SpanAttributes } from '../../../src/types-hoist/span'; +import type { EventEnvelope } from '../../../src/types/envelope'; +import type { Event } from '../../../src/types/event'; +import type { SpanAttributes } from '../../../src/types/span'; import { addItemToEnvelope, createEnvelope, diff --git a/packages/core/test/lib/utils/featureFlags.test.ts b/packages/core/test/lib/utils/featureFlags.test.ts index 534285b4f9f4..e591a00d1304 100644 --- a/packages/core/test/lib/utils/featureFlags.test.ts +++ b/packages/core/test/lib/utils/featureFlags.test.ts @@ -9,7 +9,7 @@ import { } from '../../../src/utils/featureFlags'; import * as currentScopeModule from '../../../src/currentScopes'; -import type { Event } from '../../../src/types-hoist/event'; +import type { Event } from '../../../src/types/event'; describe('flags', () => { describe('insertFlagToScope()', () => { diff --git a/packages/core/test/lib/utils/misc.test.ts b/packages/core/test/lib/utils/misc.test.ts index 885e2dc64b8d..62b37e8a520a 100644 --- a/packages/core/test/lib/utils/misc.test.ts +++ b/packages/core/test/lib/utils/misc.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, test } from 'vitest'; -import type { Event } from '../../../src/types-hoist/event'; -import type { Mechanism } from '../../../src/types-hoist/mechanism'; -import type { StackFrame } from '../../../src/types-hoist/stackframe'; +import type { Event } from '../../../src/types/event'; +import type { Mechanism } from '../../../src/types/mechanism'; +import type { StackFrame } from '../../../src/types/stackframe'; import { addContextToFrame, addExceptionMechanism, diff --git a/packages/core/test/lib/utils/object.test.ts b/packages/core/test/lib/utils/object.test.ts index a2405614f461..dacf40052b59 100644 --- a/packages/core/test/lib/utils/object.test.ts +++ b/packages/core/test/lib/utils/object.test.ts @@ -3,7 +3,7 @@ */ import { describe, expect, it, test, vi } from 'vitest'; -import type { WrappedFunction } from '../../../src/types-hoist/wrappedfunction'; +import type { WrappedFunction } from '../../../src/types/wrappedfunction'; import { addNonEnumerableProperty, dropUndefinedKeys, diff --git a/packages/core/test/lib/utils/parameterize.test.ts b/packages/core/test/lib/utils/parameterize.test.ts index 8d1c0d082431..725fec5d3944 100644 --- a/packages/core/test/lib/utils/parameterize.test.ts +++ b/packages/core/test/lib/utils/parameterize.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'vitest'; -import type { ParameterizedString } from '../../../src/types-hoist/parameterize'; +import type { ParameterizedString } from '../../../src/types/parameterize'; import { parameterize } from '../../../src/utils/parameterize'; describe('parameterize()', () => { diff --git a/packages/core/test/lib/utils/scopeData.test.ts b/packages/core/test/lib/utils/scopeData.test.ts index 50af1179a4c4..951d57162c27 100644 --- a/packages/core/test/lib/utils/scopeData.test.ts +++ b/packages/core/test/lib/utils/scopeData.test.ts @@ -2,10 +2,10 @@ import { describe, expect, it, vi } from 'vitest'; import type { ScopeData } from '../../../src'; import { Scope, startInactiveSpan } from '../../../src'; import * as currentScopes from '../../../src/currentScopes'; -import type { Attachment } from '../../../src/types-hoist/attachment'; -import type { Breadcrumb } from '../../../src/types-hoist/breadcrumb'; -import type { Event, EventType } from '../../../src/types-hoist/event'; -import type { EventProcessor } from '../../../src/types-hoist/eventprocessor'; +import type { Attachment } from '../../../src/types/attachment'; +import type { Breadcrumb } from '../../../src/types/breadcrumb'; +import type { Event, EventType } from '../../../src/types/event'; +import type { EventProcessor } from '../../../src/types/eventprocessor'; import { applyScopeDataToEvent, getCombinedScopeData, diff --git a/packages/core/test/lib/utils/spanUtils.test.ts b/packages/core/test/lib/utils/spanUtils.test.ts index a2f2dbea7aba..f810bb414741 100644 --- a/packages/core/test/lib/utils/spanUtils.test.ts +++ b/packages/core/test/lib/utils/spanUtils.test.ts @@ -16,9 +16,9 @@ import { timestampInSeconds, TRACEPARENT_REGEXP, } from '../../../src'; -import type { SpanLink } from '../../../src/types-hoist/link'; -import type { Span, SpanAttributes, SpanTimeInput, StreamedSpanJSON } from '../../../src/types-hoist/span'; -import type { SpanStatus } from '../../../src/types-hoist/spanStatus'; +import type { SpanLink } from '../../../src/types/link'; +import type { Span, SpanAttributes, SpanTimeInput, StreamedSpanJSON } from '../../../src/types/span'; +import type { SpanStatus } from '../../../src/types/spanStatus'; import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils'; import { getRootSpan, diff --git a/packages/core/test/lib/utils/traceData.test.ts b/packages/core/test/lib/utils/traceData.test.ts index 6baf7a9d7a40..b2101502cb43 100644 --- a/packages/core/test/lib/utils/traceData.test.ts +++ b/packages/core/test/lib/utils/traceData.test.ts @@ -15,7 +15,7 @@ import { } from '../../../src/'; import { getAsyncContextStrategy } from '../../../src/asyncContext'; import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext'; -import type { Span } from '../../../src/types-hoist/span'; +import type { Span } from '../../../src/types/span'; import type { TestClientOptions } from '../../mocks/client'; import { getDefaultTestClientOptions, TestClient } from '../../mocks/client'; diff --git a/packages/core/test/lib/utils/transactionEvent.test.ts b/packages/core/test/lib/utils/transactionEvent.test.ts index 6fdf4e6cb274..1da8843bc1d5 100644 --- a/packages/core/test/lib/utils/transactionEvent.test.ts +++ b/packages/core/test/lib/utils/transactionEvent.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; import { SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME, SEMANTIC_ATTRIBUTE_PROFILE_ID } from '../../../src/semanticAttributes'; -import type { TransactionEvent } from '../../../src/types-hoist/event'; -import type { SpanJSON } from '../../../src/types-hoist/span'; +import type { TransactionEvent } from '../../../src/types/event'; +import type { SpanJSON } from '../../../src/types/span'; import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson, diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts index d7a130bb8b63..a2a863353ffc 100644 --- a/packages/core/test/mocks/client.ts +++ b/packages/core/test/mocks/client.ts @@ -1,13 +1,13 @@ import { Client } from '../../src/client'; import { initAndBind } from '../../src/sdk'; import { createTransport } from '../../src/transports/base'; -import type { Outcome } from '../../src/types-hoist/clientreport'; -import type { Event, EventHint } from '../../src/types-hoist/event'; -import type { Integration } from '../../src/types-hoist/integration'; -import type { ClientOptions } from '../../src/types-hoist/options'; -import type { ParameterizedString } from '../../src/types-hoist/parameterize'; -import type { Session } from '../../src/types-hoist/session'; -import type { SeverityLevel } from '../../src/types-hoist/severity'; +import type { Outcome } from '../../src/types/clientreport'; +import type { Event, EventHint } from '../../src/types/event'; +import type { Integration } from '../../src/types/integration'; +import type { ClientOptions } from '../../src/types/options'; +import type { ParameterizedString } from '../../src/types/parameterize'; +import type { Session } from '../../src/types/session'; +import type { SeverityLevel } from '../../src/types/severity'; import { resolvedSyncPromise } from '../../src/utils/syncpromise'; export function getDefaultTestClientOptions(options: Partial = {}): TestClientOptions { diff --git a/packages/core/test/mocks/integration.ts b/packages/core/test/mocks/integration.ts index f5fc5682265a..cadc61ef3336 100644 --- a/packages/core/test/mocks/integration.ts +++ b/packages/core/test/mocks/integration.ts @@ -1,8 +1,8 @@ import type { Client } from '../../src'; import { getClient, getCurrentScope } from '../../src'; -import type { Event } from '../../src/types-hoist/event'; -import type { EventProcessor } from '../../src/types-hoist/eventprocessor'; -import type { Integration } from '../../src/types-hoist/integration'; +import type { Event } from '../../src/types/event'; +import type { EventProcessor } from '../../src/types/eventprocessor'; +import type { Integration } from '../../src/types/integration'; export class TestIntegration implements Integration { public static id: string = 'TestIntegration'; diff --git a/packages/core/test/mocks/transport.ts b/packages/core/test/mocks/transport.ts index c8ae84f80d64..9efe68567b21 100644 --- a/packages/core/test/mocks/transport.ts +++ b/packages/core/test/mocks/transport.ts @@ -1,5 +1,5 @@ import { createTransport } from '../../src/transports/base'; -import type { Transport } from '../../src/types-hoist/transport'; +import type { Transport } from '../../src/types/transport'; import { SyncPromise } from '../../src/utils/syncpromise'; async function sleep(delay: number): Promise {