From 48e8927ba109ac2164f07c2336548c2d65af5429 Mon Sep 17 00:00:00 2001 From: JPeer264 Date: Wed, 17 Jun 2026 14:59:53 +0200 Subject: [PATCH 1/3] chore: Change deprecation/deprecation to oxlint equivalent --- .oxlintrc.base.json | 6 ++-- packages/angular/src/sdk.ts | 2 +- packages/astro/src/index.server.ts | 6 ++-- packages/astro/src/integration/index.ts | 20 ++++++------ packages/astro/src/integration/types.ts | 4 +-- packages/aws-serverless/src/index.ts | 8 ++--- packages/aws-serverless/src/sdk.ts | 2 +- .../src/getNativeImplementation.ts | 2 +- packages/browser-utils/src/metrics/utils.ts | 2 +- packages/browser/src/client.ts | 2 +- packages/browser/src/eventbuilder.ts | 2 +- packages/browser/src/exports.ts | 2 +- .../browser/src/integrations/httpclient.ts | 2 +- packages/browser/src/profiling/integration.ts | 2 +- packages/browser/src/profiling/utils.ts | 4 +-- packages/browser/src/sdk.ts | 2 +- packages/bun/src/index.ts | 8 ++--- packages/bun/src/sdk.ts | 2 +- packages/cloudflare/src/index.ts | 2 +- packages/cloudflare/src/sdk.ts | 4 +-- packages/core/src/browser-exports.ts | 2 +- packages/core/src/client.ts | 4 +-- packages/core/src/metrics/internal.ts | 4 +-- packages/core/src/shared-exports.ts | 24 +++++++------- packages/core/src/utils/supports.ts | 2 +- packages/core/src/utils/time.ts | 2 +- .../lib/integrations/eventFilters.test.ts | 2 +- packages/core/test/lib/utils/object.test.ts | 4 +-- packages/deno/src/index.ts | 2 +- packages/deno/src/sdk.ts | 2 +- packages/elysia/src/index.ts | 6 ++-- packages/google-cloud-serverless/src/index.ts | 6 ++-- .../utils/dropMiddlewareTunnelRequests.ts | 2 +- .../turbopack/constructTurbopackConfig.ts | 2 +- .../deprecatedWebpackOptions.ts | 2 +- .../getFinalConfigObjectUtils.ts | 4 +-- .../server/enhanceHandleRequestRootSpan.ts | 4 +-- .../nextjs/src/server/handleOnSpanStart.ts | 4 +-- packages/nextjs/src/server/index.ts | 6 ++-- .../nextjs/test/config/withSentry.test.ts | 2 +- packages/node-core/src/index.ts | 4 +-- .../node-core/src/integrations/anr/common.ts | 2 +- .../node-core/src/integrations/anr/index.ts | 6 ++-- .../http/SentryHttpInstrumentation.ts | 4 +-- .../http/httpServerSpansIntegration.ts | 2 +- packages/node-core/src/sdk/index.ts | 2 +- .../node-core/test/transports/http.test.ts | 2 +- .../node-core/test/transports/https.test.ts | 2 +- packages/node/src/index.ts | 6 ++-- .../tracing/fastify/v3/instrumentation.ts | 2 +- packages/nuxt/src/vite/sourceMaps.ts | 32 +++++++++---------- packages/opentelemetry/src/propagator.ts | 2 +- packages/opentelemetry/src/resource.ts | 2 +- packages/opentelemetry/src/sampler.ts | 4 +-- packages/opentelemetry/src/spanExporter.ts | 2 +- .../src/utils/getRequestSpanData.ts | 4 +-- .../src/utils/isSentryRequest.ts | 2 +- packages/opentelemetry/src/utils/mapStatus.ts | 4 +-- .../src/utils/parseSpanDescription.ts | 16 +++++----- packages/opentelemetry/test/resource.test.ts | 4 +-- packages/opentelemetry/test/trace.test.ts | 2 +- .../test/utils/getRequestSpanData.test.ts | 2 +- .../test/utils/mapStatus.test.ts | 2 +- .../test/utils/parseSpanDescription.test.ts | 2 +- .../profiling-node/src/spanProfileUtils.ts | 2 +- packages/react-router/src/server/index.ts | 6 ++-- .../src/server/instrumentation/reactRouter.ts | 2 +- .../src/server/wrapServerAction.ts | 2 +- .../src/server/wrapServerLoader.ts | 2 +- .../src/vite/buildEnd/handleOnBuildEnd.ts | 2 +- packages/remix/src/cloudflare/index.ts | 2 +- packages/remix/src/server/index.ts | 6 ++-- packages/remix/src/vendor/instrumentation.ts | 2 +- packages/solidstart/src/server/index.ts | 6 ++-- .../src/client/browserTracingIntegration.ts | 4 +-- packages/sveltekit/src/server/index.ts | 6 ++-- .../sveltekit/src/vite/sentryVitePlugins.ts | 14 ++++---- packages/sveltekit/src/vite/svelteConfig.ts | 2 +- packages/sveltekit/src/worker/index.ts | 2 +- .../client/browserTracingIntegration.test.ts | 16 +++++----- .../test/vite/sentrySvelteKitPlugins.test.ts | 2 +- packages/types/src/index.ts | 8 ++--- packages/vercel-edge/src/index.ts | 2 +- packages/vercel-edge/src/sdk.ts | 2 +- 84 files changed, 187 insertions(+), 185 deletions(-) diff --git a/.oxlintrc.base.json b/.oxlintrc.base.json index d55a118f76d7..4d3a6065d946 100644 --- a/.oxlintrc.base.json +++ b/.oxlintrc.base.json @@ -36,7 +36,8 @@ "no-unsafe-optional-chaining": "off", "no-eval": "off", "no-import-assign": "off", - "typescript/no-duplicate-type-constituents": "off" + "typescript/no-duplicate-type-constituents": "off", + "typescript/no-deprecated": "error" }, "overrides": [ { @@ -101,7 +102,8 @@ "typescript/no-misused-spread": "off", "typescript/require-array-sort-compare": "off", "typescript/no-base-to-string": "off", - "typescript/await-thenable": "off" + "typescript/await-thenable": "off", + "typescript/no-deprecated": "off" } }, { diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts index 1fff722f964e..5a1ce09de3cb 100755 --- a/packages/angular/src/sdk.ts +++ b/packages/angular/src/sdk.ts @@ -35,7 +35,7 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati // - https://github.com/getsentry/sentry-javascript/issues/2744 return [ // TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), functionToStringIntegration(), conversationIdIntegration(), diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts index b4fc6fccbee3..a42d2addcb04 100644 --- a/packages/astro/src/index.server.ts +++ b/packages/astro/src/index.server.ts @@ -13,10 +13,10 @@ export { addIntegration, amqplibIntegration, anthropicAIIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, googleGenAIIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, captureCheckIn, captureConsoleIntegration, @@ -69,7 +69,7 @@ export { httpIntegration, httpServerIntegration, httpServerSpansIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, initOpenTelemetry, diff --git a/packages/astro/src/integration/index.ts b/packages/astro/src/integration/index.ts index a1b4df28b003..2565ec9e75f1 100644 --- a/packages/astro/src/integration/index.ts +++ b/packages/astro/src/integration/index.ts @@ -29,7 +29,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { clientInitPath, serverInitPath, autoInstrumentation, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated sourceMapsUploadOptions, sourcemaps, // todo(v11): Extract `release` build time option here - cannot be done currently, because it conflicts with the `DeprecatedRuntimeOptions` type @@ -64,7 +64,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { }; const sourceMapsNeeded = sdkEnabled.client || sdkEnabled.server; - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const { unstable_sentryVitePluginOptions: deprecatedVitePluginOptions, ...uploadOptions } = sourceMapsUploadOptions || {}; @@ -76,7 +76,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { const shouldUploadSourcemaps = (sourceMapsNeeded && sourcemaps?.disable !== true && - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated uploadOptions?.enabled) ?? true; @@ -87,7 +87,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { let updatedFilesToDeleteAfterUpload: string[] | undefined = undefined; if ( - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated typeof uploadOptions?.filesToDeleteAfterUpload === 'undefined' && typeof sourcemaps?.filesToDeleteAfterUpload === 'undefined' && computedSourceMapSettings.previousUserSourceMapSetting === 'unset' @@ -112,15 +112,15 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { sentryVitePlugin({ applicationKey, // Priority: top-level options > deprecated options > env vars - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated org: org ?? uploadOptions.org ?? env.SENTRY_ORG, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated project: project ?? uploadOptions.project ?? env.SENTRY_PROJECT, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated authToken: authToken ?? uploadOptions.authToken ?? env.SENTRY_AUTH_TOKEN, url: sentryUrl ?? env.SENTRY_URL, headers, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated telemetry: telemetry ?? uploadOptions.telemetry ?? true, silent: silent ?? false, errorHandler, @@ -133,11 +133,11 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => { debug: debug ?? false, sourcemaps: { ...sourcemaps, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated assets: sourcemaps?.assets ?? uploadOptions.assets ?? [getSourcemapsAssetsGlob(config)], filesToDeleteAfterUpload: sourcemaps?.filesToDeleteAfterUpload ?? - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated uploadOptions?.filesToDeleteAfterUpload ?? updatedFilesToDeleteAfterUpload, ...unstableMerged_sentryVitePluginOptions?.sourcemaps, diff --git a/packages/astro/src/integration/types.ts b/packages/astro/src/integration/types.ts index ec9996cba134..638c4faff2bf 100644 --- a/packages/astro/src/integration/types.ts +++ b/packages/astro/src/integration/types.ts @@ -194,9 +194,9 @@ export type SentryOptions = Omit & * @deprecated This option was deprecated. Please move the options to the top-level configuration. * See the migration guide in the SourceMapsOptions type documentation. */ - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated sourceMapsUploadOptions?: SourceMapsOptions; - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated } & DeprecatedRuntimeOptions; /** diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts index 0cbc893b4601..987af54e07d3 100644 --- a/packages/aws-serverless/src/index.ts +++ b/packages/aws-serverless/src/index.ts @@ -47,9 +47,9 @@ export { instrumentLangChainEmbeddings, httpHeadersToSpanAttributes, winterCGHeadersToDict, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, consoleIntegration, httpIntegration, @@ -69,7 +69,7 @@ export { localVariablesIntegration, requestDataIntegration, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, linkedErrorsIntegration, @@ -175,6 +175,6 @@ export { awsIntegration } from './integration/aws'; export { awsLambdaIntegration } from './integration/awslambda'; export { getDefaultIntegrations, init } from './init'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { tryPatchHandler, wrapHandler } from './sdk'; export type { WrapperOptions } from './sdk'; diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts index 2b6cc1e25779..dd707592dfa0 100644 --- a/packages/aws-serverless/src/sdk.ts +++ b/packages/aws-serverless/src/sdk.ts @@ -168,7 +168,7 @@ export function wrapHandler( ): Handler | StreamifyHandler { const START_TIME = performance.now(); - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated if (typeof wrapOptions.startTrace !== 'undefined') { consoleSandbox(() => { // eslint-disable-next-line no-console diff --git a/packages/browser-utils/src/getNativeImplementation.ts b/packages/browser-utils/src/getNativeImplementation.ts index 410d2abf4de0..0bb5302b12f5 100644 --- a/packages/browser-utils/src/getNativeImplementation.ts +++ b/packages/browser-utils/src/getNativeImplementation.ts @@ -40,7 +40,7 @@ export function getNativeImplementation { _runCollectorCallbackOnce('pagehide'); }); diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts index f5dbb45f9d8f..23edf25cc92b 100644 --- a/packages/browser/src/client.ts +++ b/packages/browser/src/client.ts @@ -107,7 +107,7 @@ export class BrowserClient extends Client { const { sendClientReports, enableLogs, _experiments, enableMetrics: enableMetricsOption } = this._options; // todo(v11): Remove the experimental flag - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const enableMetrics = enableMetricsOption ?? _experiments?.enableMetrics ?? true; // Flush logs and metrics when page becomes hidden (e.g., tab switch, navigation) diff --git a/packages/browser/src/eventbuilder.ts b/packages/browser/src/eventbuilder.ts index cb489980527f..d91cd0e9bc76 100644 --- a/packages/browser/src/eventbuilder.ts +++ b/packages/browser/src/eventbuilder.ts @@ -306,7 +306,7 @@ export function eventFromUnknownInput( addExceptionTypeValue(event, message); } if ('code' in domException) { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated event.tags = { ...event.tags, 'DOMException.code': `${domException.code}` }; } diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts index 0ede8e8d76be..8de560dd8998 100644 --- a/packages/browser/src/exports.ts +++ b/packages/browser/src/exports.ts @@ -58,7 +58,7 @@ export { withScope, withIsolationScope, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, dedupeIntegration, diff --git a/packages/browser/src/integrations/httpclient.ts b/packages/browser/src/integrations/httpclient.ts index 404e8dd50306..1f6f9900e5d3 100644 --- a/packages/browser/src/integrations/httpclient.ts +++ b/packages/browser/src/integrations/httpclient.ts @@ -433,7 +433,7 @@ function _getDataCollectionSettings() { // collect headers/cookies with deny-list filtering even without sendDefaultPii). const options = client.getOptions(); if (options.dataCollection == null) { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const enabled = Boolean(options.sendDefaultPii); return { cookies: enabled, requestHeaders: enabled, responseHeaders: enabled }; } diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts index ed438d15a7b3..15b776219b0e 100644 --- a/packages/browser/src/profiling/integration.ts +++ b/packages/browser/src/profiling/integration.ts @@ -33,7 +33,7 @@ const _browserProfilingIntegration = (() => { options.profileLifecycle = 'manual'; } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated if (hasLegacyProfiling(options) && !options.profilesSampleRate) { DEBUG_BUILD && debug.log('[Profiling] Profiling disabled, no profiling options found.'); return; diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts index 0d7d413428dd..7f1ecdbc6d8f 100644 --- a/packages/browser/src/profiling/utils.ts +++ b/packages/browser/src/profiling/utils.ts @@ -651,7 +651,7 @@ export function shouldProfileSpanLegacy(span: Span): boolean { return false; } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const profilesSampleRate = (options as BrowserOptions).profilesSampleRate as | BrowserOptions['profilesSampleRate'] | boolean; @@ -729,7 +729,7 @@ export function shouldProfileSession(options: BrowserOptions): boolean { * Checks if legacy profiling is configured. */ export function hasLegacyProfiling(options: BrowserOptions): boolean { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated return typeof options.profilesSampleRate !== 'undefined'; } diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts index 5ca208ca0466..f9ee4938ace1 100644 --- a/packages/browser/src/sdk.ts +++ b/packages/browser/src/sdk.ts @@ -32,7 +32,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] { */ return [ // TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), functionToStringIntegration(), conversationIdIntegration(), diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts index c44742a0e2d3..cbc0ef48a1dd 100644 --- a/packages/bun/src/index.ts +++ b/packages/bun/src/index.ts @@ -70,9 +70,9 @@ export { instrumentLangChainEmbeddings, httpHeadersToSpanAttributes, winterCGHeadersToDict, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, consoleIntegration, httpIntegration, @@ -91,7 +91,7 @@ export { requestDataIntegration, fsIntegration, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, linkedErrorsIntegration, @@ -191,7 +191,7 @@ export { export type { BunOptions } from './types'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { BunClient } from './client'; export { getDefaultIntegrations, init } from './sdk'; export { bunServerIntegration } from './integrations/bunserver'; diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts index 6f9c06fdf88b..213965c80304 100644 --- a/packages/bun/src/sdk.ts +++ b/packages/bun/src/sdk.ts @@ -32,7 +32,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] { return [ // Common // TODO(v11): Replace with eventFiltersIntegration once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), functionToStringIntegration(), linkedErrorsIntegration(), diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts index 61707365fafd..b15221ec2009 100644 --- a/packages/cloudflare/src/index.ts +++ b/packages/cloudflare/src/index.ts @@ -71,7 +71,7 @@ export { getSpanDescendants, continueTrace, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, instrumentOpenAiClient, instrumentGoogleGenAIClient, diff --git a/packages/cloudflare/src/sdk.ts b/packages/cloudflare/src/sdk.ts index 32ee59bc9826..dee58fc47688 100644 --- a/packages/cloudflare/src/sdk.ts +++ b/packages/cloudflare/src/sdk.ts @@ -27,14 +27,14 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[ // TODO(v11): Drop this transitional gating and let `requestDataIntegration` rely on the resolved // `dataCollection` defaults directly. Until then, preserve the historical Cloudflare behavior of not // attaching cookies unless the user explicitly opts in via `sendDefaultPii` or `dataCollection.cookies`. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const cookiesEnabled = options.sendDefaultPii || options.dataCollection?.cookies != null; return [ // The Dedupe integration should not be used in workflows because we want to // capture all step failures, even if they are the same error. ...(options.enableDedupe === false ? [] : [dedupeIntegration()]), // TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), functionToStringIntegration(), conversationIdIntegration(), diff --git a/packages/core/src/browser-exports.ts b/packages/core/src/browser-exports.ts index 4b013834edec..97f33eaa9433 100644 --- a/packages/core/src/browser-exports.ts +++ b/packages/core/src/browser-exports.ts @@ -6,7 +6,7 @@ export { getComponentName, getLocationHref, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated htmlTreeAsString, } from './utils/browser'; export { supportsDOMError, supportsHistory, supportsNativeFetch, supportsReportingObserver } from './utils/supports'; diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts index 6cbcd5b95507..ea45982083a9 100644 --- a/packages/core/src/client.ts +++ b/packages/core/src/client.ts @@ -257,7 +257,7 @@ export abstract class Client { // Backfill enableLogs option from _experiments.enableLogs // TODO(v11): Remove or change default value - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated this._options.enableLogs = this._options.enableLogs ?? this._options._experiments?.enableLogs; // Setup log flushing with weight and timeout tracking @@ -266,7 +266,7 @@ export abstract class Client { } // todo(v11): Remove the experimental flag - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const enableMetrics = this._options.enableMetrics ?? this._options._experiments?.enableMetrics ?? true; // Setup metric flushing with weight and timeout tracking diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts index 1ccf53705bbb..2c0b6e5df926 100644 --- a/packages/core/src/metrics/internal.ts +++ b/packages/core/src/metrics/internal.ts @@ -176,7 +176,7 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal const { _experiments, enableMetrics, beforeSendMetric } = client.getOptions(); // todo(v11): Remove the experimental flag - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const metricsEnabled = enableMetrics ?? _experiments?.enableMetrics ?? true; if (!metricsEnabled) { @@ -191,7 +191,7 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal client.emit('processMetric', enrichedMetric); // todo(v11): Remove the experimental `beforeSendMetric` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const beforeSendCallback = beforeSendMetric || _experiments?.beforeSendMetric; const processedMetric = beforeSendCallback ? beforeSendCallback(enrichedMetric) : enrichedMetric; diff --git a/packages/core/src/shared-exports.ts b/packages/core/src/shared-exports.ts index 87908812ca85..98b01aef0683 100644 --- a/packages/core/src/shared-exports.ts +++ b/packages/core/src/shared-exports.ts @@ -83,7 +83,7 @@ export { parameterize, fmt } from './utils/parameterize'; export type { HandleTunnelRequestOptions } from './utils/tunnel'; export { handleTunnelRequest } from './utils/tunnel'; export { addAutoIpAddressToSession } from './utils/ipAddress'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { addAutoIpAddressToUser } from './utils/ipAddress'; export { convertSpanLinksForEnvelope, @@ -126,7 +126,7 @@ export type { MaxRequestBodySize } from './utils/request'; export { DEFAULT_ENVIRONMENT, DEV_ENVIRONMENT } from './constants'; export { addBreadcrumb } from './breadcrumbs'; export { functionToStringIntegration } from './integrations/functiontostring'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { inboundFiltersIntegration } from './integrations/eventFilters'; export { eventFiltersIntegration } from './integrations/eventFilters'; export { linkedErrorsIntegration } from './integrations/linkederrors'; @@ -147,7 +147,7 @@ export { conversationIdIntegration } from './integrations/conversationId'; export { profiler } from './profiling'; // eslint thinks the entire function is deprecated (while only one overload is actually deprecated) // Therefore: -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { instrumentFetchRequest, _INTERNAL_getTracingHeadersForFetchRequest } from './fetch'; export { captureFeedback } from './feedback'; export type { ReportDialogOptions } from './report-dialog'; @@ -192,7 +192,7 @@ export type { GoogleGenAIOptions, GoogleGenAIInstrumentedMethod, } from './tracing/google-genai/types'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export type { GoogleGenAIIstrumentedMethod } from './tracing/google-genai/types'; export { SpanBuffer } from './tracing/spans/spanBuffer'; export { hasSpanStreamingEnabled } from './tracing/spans/hasSpanStreamingEnabled'; @@ -208,7 +208,7 @@ export { export { applyAggregateErrorsToEvent } from './utils/aggregate-errors'; export { getBreadcrumbLogLevelFromHttpStatusCode } from './utils/breadcrumb-log-level'; export { dsnFromString, dsnToString, makeDsn } from './utils/dsn'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { SentryError } from './utils/error'; export { GLOBAL_OBJ } from './utils/worldwide'; export type { InternalGlobal } from './utils/worldwide'; @@ -220,7 +220,7 @@ export { addHandler, maybeInstrument, resetInstrumentationHandlers, triggerHandl export { isDOMError, isDOMException, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated isElement, isError, isErrorEvent, @@ -231,10 +231,10 @@ export { isPrimitive, isRegExp, isString, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated isSyntheticEvent, isThenable, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated isVueViewModel, } from './utils/is'; export { isBrowser } from './utils/isBrowser'; @@ -255,7 +255,7 @@ export { setNormalizationDepthOverrideHint, setSkipNormalizationHint } from './u export { addNonEnumerableProperty, convertToPlainObject, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated dropUndefinedKeys, extractExceptionKeysForMessage, fill, @@ -281,9 +281,9 @@ export { isNativeFunction, supportsDOMException, supportsErrorEvent, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated supportsFetch, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated supportsReferrerPolicy, } from './utils/supports'; export { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils/syncpromise'; @@ -491,7 +491,7 @@ export type { MetricType, SerializedMetric, SerializedMetricContainer, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated SerializedMetricAttributeValue, } from './types/metric'; export type { TimedEvent } from './types/timedEvent'; diff --git a/packages/core/src/utils/supports.ts b/packages/core/src/utils/supports.ts index 7ac3b4789765..83e2dd084f3b 100644 --- a/packages/core/src/utils/supports.ts +++ b/packages/core/src/utils/supports.ts @@ -122,7 +122,7 @@ export function supportsNativeFetch(): boolean { // so create a "pure" iframe to see if that has native fetch let result = false; const doc = WINDOW.document; - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated if (doc && typeof (doc.createElement as unknown) === 'function') { try { const sandbox = doc.createElement('iframe'); diff --git a/packages/core/src/utils/time.ts b/packages/core/src/utils/time.ts index 10a5103b2fc1..4d260069fae6 100644 --- a/packages/core/src/utils/time.ts +++ b/packages/core/src/utils/time.ts @@ -113,7 +113,7 @@ function getBrowserTimeOrigin(): number | undefined { // Also as of writing, performance.timing is not available in Web Workers in mainstream browsers, so it is not always // a valid fallback. In the absence of an initial time provided by the browser, fallback to the current time from the // Date API. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const navigationStart = performance.timing?.navigationStart; if (typeof navigationStart === 'number') { const navigationStartDelta = Math.abs(navigationStart + performanceNow - dateNow); diff --git a/packages/core/test/lib/integrations/eventFilters.test.ts b/packages/core/test/lib/integrations/eventFilters.test.ts index 5c7785c77fe4..db3cc4efafbf 100644 --- a/packages/core/test/lib/integrations/eventFilters.test.ts +++ b/packages/core/test/lib/integrations/eventFilters.test.ts @@ -410,7 +410,7 @@ function createUndefinedIsNotAnObjectEvent(evaluatingStr: string): Event { } describe.each([ - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated ['InboundFilters', inboundFiltersIntegration], ['EventFilters', eventFiltersIntegration], ])('%s', (_, integrationFn) => { diff --git a/packages/core/test/lib/utils/object.test.ts b/packages/core/test/lib/utils/object.test.ts index dacf40052b59..952597f210b3 100644 --- a/packages/core/test/lib/utils/object.test.ts +++ b/packages/core/test/lib/utils/object.test.ts @@ -166,7 +166,7 @@ describe('extractExceptionKeysForMessage()', () => { }); }); -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ describe('dropUndefinedKeys()', () => { test('simple case', () => { expect( @@ -312,7 +312,7 @@ describe('dropUndefinedKeys()', () => { expect(droppedChicken.lays[0] === droppedChicken).toBe(true); }); }); -/* eslint-enable deprecation/deprecation */ +/* eslint-enable typescript/no-deprecated */ describe('objectify()', () => { describe('stringifies nullish values', () => { diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts index 95890bdc54b9..796c418396fd 100644 --- a/packages/deno/src/index.ts +++ b/packages/deno/src/index.ts @@ -66,7 +66,7 @@ export { startSpanManual, startNewTrace, suppressTracing, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, linkedErrorsIntegration, diff --git a/packages/deno/src/sdk.ts b/packages/deno/src/sdk.ts index b593a08ddad8..a8168f82bb22 100644 --- a/packages/deno/src/sdk.ts +++ b/packages/deno/src/sdk.ts @@ -36,7 +36,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] { return [ // Common // TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), requestDataIntegration(), functionToStringIntegration(), diff --git a/packages/elysia/src/index.ts b/packages/elysia/src/index.ts index 55542acfc55f..2d06d75f1a33 100644 --- a/packages/elysia/src/index.ts +++ b/packages/elysia/src/index.ts @@ -48,9 +48,9 @@ export { instrumentLangChainEmbeddings, httpHeadersToSpanAttributes, winterCGHeadersToDict, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, consoleIntegration, httpIntegration, @@ -69,7 +69,7 @@ export { requestDataIntegration, fsIntegration, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, linkedErrorsIntegration, diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts index 2662ef4720a0..852f51c1260a 100644 --- a/packages/google-cloud-serverless/src/index.ts +++ b/packages/google-cloud-serverless/src/index.ts @@ -47,9 +47,9 @@ export { instrumentLangChainEmbeddings, httpHeadersToSpanAttributes, winterCGHeadersToDict, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, consoleIntegration, httpIntegration, @@ -70,7 +70,7 @@ export { requestDataIntegration, fsIntegration, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, linkedErrorsIntegration, diff --git a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts index fbbe8f704fbe..2ec720d8911f 100644 --- a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts +++ b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts @@ -53,7 +53,7 @@ function isTunnelRouteSpan(spanAttributes: Record): boolean { return false; } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpTarget = spanAttributes[SEMATTRS_HTTP_TARGET]; if (typeof httpTarget === 'string') { diff --git a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts index bf919e644754..9b25e9fe2061 100644 --- a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts +++ b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts @@ -66,7 +66,7 @@ export function constructTurbopackConfig({ // so it is safe even for node_modules with strict initialization order. // We only exclude Next.js build polyfills which contain non-standard syntax that causes // parse errors when any code is prepended (Turbopack re-parses the loader output). - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const applicationKey = userSentryOptions?.applicationKey ?? userSentryOptions?._experimental?.turbopackApplicationKey; if (applicationKey && nextJsVersion && supportsTurbopackRuleCondition(nextJsVersion)) { newConfig.rules = safelyAddTurbopackRule(newConfig.rules, { diff --git a/packages/nextjs/src/config/withSentryConfig/deprecatedWebpackOptions.ts b/packages/nextjs/src/config/withSentryConfig/deprecatedWebpackOptions.ts index 497475c3d50a..b1903799cc58 100644 --- a/packages/nextjs/src/config/withSentryConfig/deprecatedWebpackOptions.ts +++ b/packages/nextjs/src/config/withSentryConfig/deprecatedWebpackOptions.ts @@ -35,7 +35,7 @@ export function migrateDeprecatedWebpackOptions(userSentryOptions: SentryBuildOp return message; }; - /* eslint-disable deprecation/deprecation */ + /* eslint-disable typescript/no-deprecated */ // Migrate each deprecated option to the new path, but only if the new path isn't already set webpack.autoInstrumentServerFunctions = withDeprecatedFallback( webpack.autoInstrumentServerFunctions, diff --git a/packages/nextjs/src/config/withSentryConfig/getFinalConfigObjectUtils.ts b/packages/nextjs/src/config/withSentryConfig/getFinalConfigObjectUtils.ts index c95c65a00de7..b33df747bf8e 100644 --- a/packages/nextjs/src/config/withSentryConfig/getFinalConfigObjectUtils.ts +++ b/packages/nextjs/src/config/withSentryConfig/getFinalConfigObjectUtils.ts @@ -93,7 +93,7 @@ export function maybeCreateRouteManifest( userSentryOptions: SentryBuildOptions, ): RouteManifest | undefined { // Handle deprecated option with warning - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated if (userSentryOptions.disableManifestInjection) { // eslint-disable-next-line no-console console.warn( @@ -107,7 +107,7 @@ export function maybeCreateRouteManifest( } // Still check the deprecated option if the new option is not set - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated if (userSentryOptions.routeManifestInjection === undefined && userSentryOptions.disableManifestInjection) { return undefined; } diff --git a/packages/nextjs/src/server/enhanceHandleRequestRootSpan.ts b/packages/nextjs/src/server/enhanceHandleRequestRootSpan.ts index a934380492dc..4e5985ae0b88 100644 --- a/packages/nextjs/src/server/enhanceHandleRequestRootSpan.ts +++ b/packages/nextjs/src/server/enhanceHandleRequestRootSpan.ts @@ -41,9 +41,9 @@ export function enhanceHandleRequestRootSpan(span: MutableRootSpan): void { span.setName(stripUrlQueryAndFragment(currentName)); } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const method = attributes[SEMATTRS_HTTP_METHOD] ?? attributes[ATTR_HTTP_REQUEST_METHOD]; - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const target = attributes[SEMATTRS_HTTP_TARGET]; const route = attributes[ATTR_HTTP_ROUTE] || attributes[ATTR_NEXT_ROUTE]; const spanName = attributes[ATTR_NEXT_SPAN_NAME]; diff --git a/packages/nextjs/src/server/handleOnSpanStart.ts b/packages/nextjs/src/server/handleOnSpanStart.ts index 21af973f2b2f..28adad63c6ec 100644 --- a/packages/nextjs/src/server/handleOnSpanStart.ts +++ b/packages/nextjs/src/server/handleOnSpanStart.ts @@ -37,7 +37,7 @@ export function handleOnSpanStart(span: Span): void { if (typeof spanAttributes?.[ATTR_NEXT_ROUTE] === 'string') { // Only hoist the http.route attribute if the transaction doesn't already have it if ( - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated (rootSpanAttributes?.[ATTR_HTTP_REQUEST_METHOD] || rootSpanAttributes?.[SEMATTRS_HTTP_METHOD]) && !rootSpanAttributes?.[ATTR_HTTP_ROUTE] ) { @@ -49,7 +49,7 @@ export function handleOnSpanStart(span: Span): void { // Update the isolation scope's transaction name so that non-transaction events // (e.g. captureMessage, captureException) also get the parameterized route. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const method = rootSpanAttributes?.[ATTR_HTTP_REQUEST_METHOD] || rootSpanAttributes?.[SEMATTRS_HTTP_METHOD]; if (typeof method === 'string') { getIsolationScope().setTransactionName(`${method} ${route}`); diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts index 6ee3f9a5bb98..d6b01712fe13 100644 --- a/packages/nextjs/src/server/index.ts +++ b/packages/nextjs/src/server/index.ts @@ -188,11 +188,11 @@ export function init(options: NodeOptions): NodeClient | undefined { // because we didn't get the chance to do `suppressTracing`, since this happens outside of userland. // We need to drop these spans. if ( - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated (typeof spanAttributes[SEMATTRS_HTTP_TARGET] === 'string' && - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated spanAttributes[SEMATTRS_HTTP_TARGET].includes('sentry_key') && - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated spanAttributes[SEMATTRS_HTTP_TARGET].includes('sentry_client')) || (typeof spanAttributes[ATTR_URL_QUERY] === 'string' && spanAttributes[ATTR_URL_QUERY].includes('sentry_key') && diff --git a/packages/nextjs/test/config/withSentry.test.ts b/packages/nextjs/test/config/withSentry.test.ts index 3ed6672393ea..5b6643358f57 100644 --- a/packages/nextjs/test/config/withSentry.test.ts +++ b/packages/nextjs/test/config/withSentry.test.ts @@ -23,7 +23,7 @@ describe('withSentry', () => { this.end(); }, end: function (this: AugmentedNextApiResponse) { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated this.finished = true; // @ts-expect-error This is a mock this.writableEnded = true; diff --git a/packages/node-core/src/index.ts b/packages/node-core/src/index.ts index 8ce1cade960d..456343ac4406 100644 --- a/packages/node-core/src/index.ts +++ b/packages/node-core/src/index.ts @@ -34,9 +34,9 @@ export { } from '@sentry/opentelemetry'; // Deprecated exports (do not add to common-exports.ts) -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { anrIntegration, disableAnrDetectionForCallback } from './integrations/anr'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { inboundFiltersIntegration } from '@sentry/core'; export type { ExclusiveEventHintOrCaptureContext, CaptureContext } from '@sentry/core'; diff --git a/packages/node-core/src/integrations/anr/common.ts b/packages/node-core/src/integrations/anr/common.ts index 44fb519828fb..8f5b3fa97a9d 100644 --- a/packages/node-core/src/integrations/anr/common.ts +++ b/packages/node-core/src/integrations/anr/common.ts @@ -71,7 +71,7 @@ export interface AnrIntegrationOptions { appRootPath: string | undefined; } -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export interface WorkerStartData extends AnrIntegrationOptions { debug: boolean; sdkMetadata: SdkMetadata; diff --git a/packages/node-core/src/integrations/anr/index.ts b/packages/node-core/src/integrations/anr/index.ts index e2207f9379c7..f297afc8caa7 100644 --- a/packages/node-core/src/integrations/anr/index.ts +++ b/packages/node-core/src/integrations/anr/index.ts @@ -63,7 +63,7 @@ const INTEGRATION_NAME = 'Anr'; type AnrInternal = { startWorker: () => void; stopWorker: () => void }; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated const _anrIntegration = ((options: Partial = {}) => { if (NODE_VERSION.major < 16 || (NODE_VERSION.major === 16 && NODE_VERSION.minor < 17)) { throw new Error('ANR detection requires Node 16.17.0 or later'); @@ -112,7 +112,7 @@ const _anrIntegration = ((options: Partial = {}) => { } as Integration & AnrInternal; }) satisfies IntegrationFn; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated type AnrReturn = (options?: Partial) => Integration & AnrInternal; /** @@ -160,7 +160,7 @@ export const anrIntegration = defineIntegration(_anrIntegration) as AnrReturn; */ async function _startWorker( client: NodeClient, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated integrationOptions: Partial, ): Promise<() => void> { const dsn = client.getDsn(); diff --git a/packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts index 9a53f4ed926e..f143439e0a33 100644 --- a/packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts +++ b/packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts @@ -180,7 +180,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase { data['otel.kind'] = SpanKind[span.kind]; } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const maybeHttpStatusCodeAttribute = attributes[SEMATTRS_HTTP_STATUS_CODE]; if (maybeHttpStatusCodeAttribute) { data[ATTR_HTTP_RESPONSE_STATUS_CODE] = maybeHttpStatusCodeAttribute as string; diff --git a/packages/opentelemetry/src/utils/getRequestSpanData.ts b/packages/opentelemetry/src/utils/getRequestSpanData.ts index 083434e07559..da24a9bf49dc 100644 --- a/packages/opentelemetry/src/utils/getRequestSpanData.ts +++ b/packages/opentelemetry/src/utils/getRequestSpanData.ts @@ -19,14 +19,14 @@ export function getRequestSpanData(span: Span | ReadableSpan): Partial = { url: maybeUrlAttribute, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated 'http.method': (span.attributes[ATTR_HTTP_REQUEST_METHOD] || span.attributes[SEMATTRS_HTTP_METHOD]) as | string | undefined, diff --git a/packages/opentelemetry/src/utils/isSentryRequest.ts b/packages/opentelemetry/src/utils/isSentryRequest.ts index d6b59880137b..ab0c65c9c3be 100644 --- a/packages/opentelemetry/src/utils/isSentryRequest.ts +++ b/packages/opentelemetry/src/utils/isSentryRequest.ts @@ -16,7 +16,7 @@ export function isSentryRequestSpan(span: AbstractSpan): boolean { const { attributes } = span; // `ATTR_URL_FULL` is the new attribute, but we still support the old one, `ATTR_HTTP_URL`, for now. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpUrl = attributes[SEMATTRS_HTTP_URL] || attributes[ATTR_URL_FULL]; if (!httpUrl) { diff --git a/packages/opentelemetry/src/utils/mapStatus.ts b/packages/opentelemetry/src/utils/mapStatus.ts index b12abbb4a17f..2dcceb37cb40 100644 --- a/packages/opentelemetry/src/utils/mapStatus.ts +++ b/packages/opentelemetry/src/utils/mapStatus.ts @@ -79,9 +79,9 @@ export function mapStatus(span: AbstractSpan): SpanStatus { function inferStatusFromAttributes(attributes: SpanAttributes): SpanStatus | undefined { // If the span status is UNSET, we try to infer it from HTTP or GRPC status codes. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpCodeAttribute = attributes[ATTR_HTTP_RESPONSE_STATUS_CODE] || attributes[SEMATTRS_HTTP_STATUS_CODE]; - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const grpcCodeAttribute = attributes[SEMATTRS_RPC_GRPC_STATUS_CODE]; const numberHttpCode = diff --git a/packages/opentelemetry/src/utils/parseSpanDescription.ts b/packages/opentelemetry/src/utils/parseSpanDescription.ts index fc0f92143516..ae310a6534d1 100644 --- a/packages/opentelemetry/src/utils/parseSpanDescription.ts +++ b/packages/opentelemetry/src/utils/parseSpanDescription.ts @@ -41,13 +41,13 @@ interface SpanDescription { */ export function inferSpanData(spanName: string, attributes: SpanAttributes, kind: SpanKind): SpanDescription { // if http.method exists, this is an http request span - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpMethod = attributes[ATTR_HTTP_REQUEST_METHOD] || attributes[SEMATTRS_HTTP_METHOD]; if (httpMethod) { return descriptionForHttpMethod({ attributes, name: spanName, kind }, httpMethod); } - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const dbSystem = attributes[ATTR_DB_SYSTEM_NAME] || attributes[SEMATTRS_DB_SYSTEM]; const opIsCache = typeof attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'string' && @@ -62,7 +62,7 @@ export function inferSpanData(spanName: string, attributes: SpanAttributes, kind const customSourceOrRoute = attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] === 'custom' ? 'custom' : 'route'; // If rpc.service exists then this is a rpc call span. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const rpcService = attributes[SEMATTRS_RPC_SERVICE]; if (rpcService) { return { @@ -72,7 +72,7 @@ export function inferSpanData(spanName: string, attributes: SpanAttributes, kind } // If messaging.system exists then this is a messaging system span. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const messagingSystem = attributes[SEMATTRS_MESSAGING_SYSTEM]; if (messagingSystem) { return { @@ -82,7 +82,7 @@ export function inferSpanData(spanName: string, attributes: SpanAttributes, kind } // If faas.trigger exists then this is a function as a service span. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const faasTrigger = attributes[SEMATTRS_FAAS_TRIGGER]; if (faasTrigger) { return { @@ -128,7 +128,7 @@ function descriptionForDbSystem({ attributes, name }: { attributes: Attributes; } // Use DB statement (Ex "SELECT * FROM table") if possible as description. - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const statement = attributes[SEMATTRS_DB_STATEMENT]; const description = statement ? statement.toString() : name; @@ -247,10 +247,10 @@ export function getSanitizedUrl( hasRoute: boolean; } { // This is the relative path of the URL, e.g. /sub - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpTarget = attributes[SEMATTRS_HTTP_TARGET]; // This is the full URL, including host & query params etc., e.g. https://example.com/sub?foo=bar - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const httpUrl = attributes[SEMATTRS_HTTP_URL] || attributes[ATTR_URL_FULL]; // This is the normalized route name - may not always be available! const httpRoute = attributes[ATTR_HTTP_ROUTE]; diff --git a/packages/opentelemetry/test/resource.test.ts b/packages/opentelemetry/test/resource.test.ts index 1a6ebedf34d4..78626a5bdab2 100644 --- a/packages/opentelemetry/test/resource.test.ts +++ b/packages/opentelemetry/test/resource.test.ts @@ -66,7 +66,7 @@ describe('getSentryResource', () => { it('OTEL_RESOURCE_ATTRIBUTES can override service.namespace', () => { process.env['OTEL_RESOURCE_ATTRIBUTES'] = 'service.namespace=my-namespace'; const resource = getSentryResource('node'); - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated expect(resource.attributes[SEMRESATTRS_SERVICE_NAMESPACE]).toBe('my-namespace'); }); @@ -96,7 +96,7 @@ describe('getSentryResource', () => { it('always sets service.namespace to sentry by default', () => { const resource = getSentryResource('node'); - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated expect(resource.attributes[SEMRESATTRS_SERVICE_NAMESPACE]).toBe('sentry'); }); diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts index 7b39b3698286..4f1579918ecc 100644 --- a/packages/opentelemetry/test/trace.test.ts +++ b/packages/opentelemetry/test/trace.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ import type { Span, TimeInput } from '@opentelemetry/api'; import { context, ROOT_CONTEXT, SpanKind, trace, TraceFlags } from '@opentelemetry/api'; import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; diff --git a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts b/packages/opentelemetry/test/utils/getRequestSpanData.test.ts index ad40ec83d480..b68f6bcc19fe 100644 --- a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts +++ b/packages/opentelemetry/test/utils/getRequestSpanData.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ import type { Span } from '@opentelemetry/api'; import { trace } from '@opentelemetry/api'; import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; diff --git a/packages/opentelemetry/test/utils/mapStatus.test.ts b/packages/opentelemetry/test/utils/mapStatus.test.ts index b754e121e276..8b19d4e9b640 100644 --- a/packages/opentelemetry/test/utils/mapStatus.test.ts +++ b/packages/opentelemetry/test/utils/mapStatus.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ import type { Span } from '@opentelemetry/api'; import { trace } from '@opentelemetry/api'; import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base'; diff --git a/packages/opentelemetry/test/utils/parseSpanDescription.test.ts b/packages/opentelemetry/test/utils/parseSpanDescription.test.ts index 529866b8a2ac..acf42b172851 100644 --- a/packages/opentelemetry/test/utils/parseSpanDescription.test.ts +++ b/packages/opentelemetry/test/utils/parseSpanDescription.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ import type { Span } from '@opentelemetry/api'; import { SpanKind } from '@opentelemetry/api'; import { diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts index d549b62d6cc2..7a593815e446 100644 --- a/packages/profiling-node/src/spanProfileUtils.ts +++ b/packages/profiling-node/src/spanProfileUtils.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ import type { CustomSamplingContext, Span } from '@sentry/core'; import { debug, spanIsSampled, spanToJSON, uuid4 } from '@sentry/core'; import type { NodeClient } from '@sentry/node'; diff --git a/packages/react-router/src/server/index.ts b/packages/react-router/src/server/index.ts index ee50dee46ac9..3f8b7c0e149a 100644 --- a/packages/react-router/src/server/index.ts +++ b/packages/react-router/src/server/index.ts @@ -4,12 +4,12 @@ export * from '@sentry/node'; export { init } from './sdk'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { wrapSentryHandleRequest, sentryHandleRequest } from './wrapSentryHandleRequest'; export { createSentryHandleRequest, type SentryHandleRequestOptions } from './createSentryHandleRequest'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { wrapServerAction } from './wrapServerAction'; -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export { wrapServerLoader } from './wrapServerLoader'; export { createSentryHandleError, type SentryHandleErrorOptions } from './createSentryHandleError'; export { getMetaTagTransformer } from './getMetaTagTransformer'; diff --git a/packages/react-router/src/server/instrumentation/reactRouter.ts b/packages/react-router/src/server/instrumentation/reactRouter.ts index e322caa5cfcc..524ed790ef89 100644 --- a/packages/react-router/src/server/instrumentation/reactRouter.ts +++ b/packages/react-router/src/server/instrumentation/reactRouter.ts @@ -112,7 +112,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase( const root = getRootSpan(active); const spanData = spanToJSON(root); if (spanData.origin === 'auto.http.otel.http') { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const target = spanData.data[SEMATTRS_HTTP_TARGET]; if (target) { diff --git a/packages/react-router/src/server/wrapServerLoader.ts b/packages/react-router/src/server/wrapServerLoader.ts index a4c6485052b0..76f5a1154b5c 100644 --- a/packages/react-router/src/server/wrapServerLoader.ts +++ b/packages/react-router/src/server/wrapServerLoader.ts @@ -73,7 +73,7 @@ export function wrapServerLoader( const root = getRootSpan(active); const spanData = spanToJSON(root); if (spanData.origin === 'auto.http.otel.http') { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated const target = spanData.data[SEMATTRS_HTTP_TARGET]; if (target) { diff --git a/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts b/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts index 2ee57bdc717e..9364875fd9a6 100644 --- a/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts +++ b/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts @@ -48,7 +48,7 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo ...unstableSentryVitePluginOptions?.sourcemaps, ...sentryConfig.sourcemaps, ...sourceMapsUploadOptions, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disable: sourceMapsUploadOptions?.enabled === false ? true : sentryConfig.sourcemaps?.disable, }, release: { diff --git a/packages/remix/src/cloudflare/index.ts b/packages/remix/src/cloudflare/index.ts index 97f2609bf10d..82438119e5d2 100644 --- a/packages/remix/src/cloudflare/index.ts +++ b/packages/remix/src/cloudflare/index.ts @@ -93,7 +93,7 @@ export { getSpanDescendants, continueTrace, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, linkedErrorsIntegration, requestDataIntegration, diff --git a/packages/remix/src/server/index.ts b/packages/remix/src/server/index.ts index cc5f92bc2948..3ccda4362e9e 100644 --- a/packages/remix/src/server/index.ts +++ b/packages/remix/src/server/index.ts @@ -8,9 +8,9 @@ export { addEventProcessor, addIntegration, amqplibIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, captureCheckIn, captureConsoleIntegration, @@ -54,7 +54,7 @@ export { httpIntegration, httpServerIntegration, httpServerSpansIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, initOpenTelemetry, diff --git a/packages/remix/src/vendor/instrumentation.ts b/packages/remix/src/vendor/instrumentation.ts index 9da38fbd0e7a..fa8f88a94149 100644 --- a/packages/remix/src/vendor/instrumentation.ts +++ b/packages/remix/src/vendor/instrumentation.ts @@ -1,4 +1,4 @@ -/* eslint-disable deprecation/deprecation */ +/* eslint-disable typescript/no-deprecated */ /* eslint-disable jsdoc/require-jsdoc */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable import/no-named-as-default-member */ diff --git a/packages/solidstart/src/server/index.ts b/packages/solidstart/src/server/index.ts index 06c95b7bbc8b..f0e6b1f5e523 100644 --- a/packages/solidstart/src/server/index.ts +++ b/packages/solidstart/src/server/index.ts @@ -11,9 +11,9 @@ export { addEventProcessor, addIntegration, amqplibIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, captureCheckIn, captureConsoleIntegration, @@ -57,7 +57,7 @@ export { httpIntegration, httpServerIntegration, httpServerSpansIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, initOpenTelemetry, diff --git a/packages/sveltekit/src/client/browserTracingIntegration.ts b/packages/sveltekit/src/client/browserTracingIntegration.ts index 98ba14981e38..22539045cfb2 100644 --- a/packages/sveltekit/src/client/browserTracingIntegration.ts +++ b/packages/sveltekit/src/client/browserTracingIntegration.ts @@ -56,7 +56,7 @@ function _instrumentPageload(client: Client): void { } // TODO(v11): require svelte 5 or newer to switch to `page` from `$app/state` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated page.subscribe(page => { if (!page) { return; @@ -79,7 +79,7 @@ function _instrumentNavigations(client: Client): void { let routingSpan: Span | undefined; // TODO(v11): require svelte 5 or newer to switch to `navigating` from `$app/state` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.subscribe(navigation => { if (!navigation) { // `navigating` emits a 'null' value when the navigation is completed. diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts index 4bd05d6f4657..ac3760e87598 100644 --- a/packages/sveltekit/src/server/index.ts +++ b/packages/sveltekit/src/server/index.ts @@ -9,9 +9,9 @@ export { addEventProcessor, addIntegration, amqplibIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated anrIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated disableAnrDetectionForCallback, captureCheckIn, captureConsoleIntegration, @@ -54,7 +54,7 @@ export { getTraceMetaTags, graphqlIntegration, hapiIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, eventFiltersIntegration, initOpenTelemetry, diff --git a/packages/sveltekit/src/vite/sentryVitePlugins.ts b/packages/sveltekit/src/vite/sentryVitePlugins.ts index 533a90556185..6be20fc99c20 100644 --- a/packages/sveltekit/src/vite/sentryVitePlugins.ts +++ b/packages/sveltekit/src/vite/sentryVitePlugins.ts @@ -96,14 +96,14 @@ export function generateVitePluginOptions( // Source Maps if (svelteKitPluginOptions.autoUploadSourceMaps && process.env.NODE_ENV !== 'development') { const { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated unstable_sentryVitePluginOptions: deprecated_unstableSourceMapUploadOptions, ...deprecatedSourceMapUploadOptions - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated } = svelteKitPluginOptions.sourceMapsUploadOptions || {}; const { - // eslint-disable-next-line @typescript-eslint/no-unused-vars,deprecation/deprecation + // eslint-disable-next-line @typescript-eslint/no-unused-vars,typescript/no-deprecated sourceMapsUploadOptions: _filtered1, // eslint-disable-next-line @typescript-eslint/no-unused-vars unstable_sentryVitePluginOptions: _filtered2, @@ -135,14 +135,14 @@ export function generateVitePluginOptions( // Handle sourcemaps options - merge deprecated and new, with new taking precedence if ( - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated deprecatedSourceMapUploadOptions.sourcemaps || svelteKitPluginOptions.sourcemaps || deprecated_unstableSourceMapUploadOptions?.sourcemaps || unstable_sentryVitePluginOptions?.sourcemaps ) { sentryVitePluginsOptions.sourcemaps = { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated ...deprecatedSourceMapUploadOptions.sourcemaps, ...svelteKitPluginOptions.sourcemaps, // Also handle nested deprecated options from unstable plugin options @@ -153,14 +153,14 @@ export function generateVitePluginOptions( // Handle release options - merge deprecated and new, with new taking precedence if ( - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated deprecatedSourceMapUploadOptions.release || svelteKitPluginOptions.release || deprecated_unstableSourceMapUploadOptions?.release || unstable_sentryVitePluginOptions?.release ) { sentryVitePluginsOptions.release = { - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated ...deprecatedSourceMapUploadOptions.release, ...svelteKitPluginOptions.release, // Also handle nested deprecated options from unstable plugin options diff --git a/packages/sveltekit/src/vite/svelteConfig.ts b/packages/sveltekit/src/vite/svelteConfig.ts index b8f439092bee..eb1d0b0e3259 100644 --- a/packages/sveltekit/src/vite/svelteConfig.ts +++ b/packages/sveltekit/src/vite/svelteConfig.ts @@ -61,7 +61,7 @@ export function getHooksFileName(svelteConfig: Config, hookType: 'client' | 'ser // `files` is deprecated in favour of unchangeable file names. Once it is removed, only the // fallback will be necessary. We can remove the curstom files path once we drop support // for that version range (presumably sveltekit 2). - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated return svelteConfig.kit?.files?.hooks?.[hookType] || `src/hooks.${hookType}`; } diff --git a/packages/sveltekit/src/worker/index.ts b/packages/sveltekit/src/worker/index.ts index 89beca6d718f..6691d36ee99c 100644 --- a/packages/sveltekit/src/worker/index.ts +++ b/packages/sveltekit/src/worker/index.ts @@ -43,7 +43,7 @@ export { getSpanStatusFromHttpCode, getTraceData, getTraceMetaTags, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, isInitialized, isEnabled, diff --git a/packages/sveltekit/test/client/browserTracingIntegration.test.ts b/packages/sveltekit/test/client/browserTracingIntegration.test.ts index 1b2ff9ada950..50dde667a2ef 100644 --- a/packages/sveltekit/test/client/browserTracingIntegration.test.ts +++ b/packages/sveltekit/test/client/browserTracingIntegration.test.ts @@ -119,7 +119,7 @@ describe('browserTracingIntegration', () => { // We emit an update to the `page` store to simulate the SvelteKit router lifecycle // TODO(v11): switch to `page` from `$app/state` // @ts-expect-error - page is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated page.set({ route: { id: 'testRoute' } }); // This should update the transaction name with the parameterized route: @@ -155,7 +155,7 @@ describe('browserTracingIntegration', () => { // We emit an update to the `page` store to simulate the SvelteKit router lifecycle // TODO(v11): switch to `page` from `$app/state` // @ts-expect-error - page is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated page.set({ route: { id: 'testRoute/:id' } }); // This should update the transaction name with the parameterized route: @@ -173,7 +173,7 @@ describe('browserTracingIntegration', () => { // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - page is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set({ from: { route: { id: '/users' }, url: { pathname: '/users' } }, to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } }, @@ -193,7 +193,7 @@ describe('browserTracingIntegration', () => { // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - page is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set({ from: { route: { id: '/users' }, url: { pathname: '/users' } }, to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } }, @@ -229,7 +229,7 @@ describe('browserTracingIntegration', () => { // We emit `null` here to simulate the end of the navigation lifecycle // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - navigating is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set(null); expect(routingSpanEndSpy).toHaveBeenCalledTimes(1); @@ -246,7 +246,7 @@ describe('browserTracingIntegration', () => { // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - navigating is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set({ from: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } }, to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } }, @@ -264,7 +264,7 @@ describe('browserTracingIntegration', () => { // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - navigating is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set({ from: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } }, to: { route: { id: '/users/[id]' }, url: { pathname: '/users/223412' } }, @@ -305,7 +305,7 @@ describe('browserTracingIntegration', () => { // TODO(v11): switch to `navigating` from `$app/state` // @ts-expect-error - navigating is a writable but the types say it's just readable - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated navigating.set({ to: { route: {}, url: { pathname: '/' } }, }); diff --git a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts index 7956c078e9f6..4e8a73e71003 100644 --- a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts +++ b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts @@ -30,7 +30,7 @@ function getSentrySvelteKitPlugins(options?: Parameters[ authToken: 'token', org: 'org', project: 'project', - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated ...options?.sourceMapsUploadOptions, }, ...options, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index e4a2f5935439..2821bf497fb9 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -191,7 +191,7 @@ export type FetchBreadcrumbHint = FetchBreadcrumbHint_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type XhrBreadcrumbHint = XhrBreadcrumbHint_imported; /** @deprecated This type has been moved to `@sentry/core`. */ -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export type Client> = Client_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type ClientReport = ClientReport_imported; @@ -300,7 +300,7 @@ export type Extras = Extras_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type Integration = Integration_imported; /** @deprecated This type has been moved to `@sentry/core`. */ -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export type IntegrationFn = IntegrationFn_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type Mechanism = Mechanism_imported; @@ -313,10 +313,10 @@ export type Primitive = Primitive_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type WorkerLocation = WorkerLocation_imported; /** @deprecated This type has been moved to `@sentry/core`. */ -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export type ClientOptions = ClientOptions_imported; /** @deprecated This type has been moved to `@sentry/core`. */ -// eslint-disable-next-line deprecation/deprecation +// eslint-disable-next-line typescript/no-deprecated export type Options = Options_imported; /** @deprecated This type has been moved to `@sentry/core`. */ export type Package = Package_imported; diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts index 655ade4e18ad..47e6af074f6d 100644 --- a/packages/vercel-edge/src/index.ts +++ b/packages/vercel-edge/src/index.ts @@ -68,7 +68,7 @@ export { getSpanDescendants, continueTrace, functionToStringIntegration, - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration, instrumentOpenAiClient, instrumentLangGraph, diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts index 3d6b3393935d..8dd87f4a506d 100644 --- a/packages/vercel-edge/src/sdk.ts +++ b/packages/vercel-edge/src/sdk.ts @@ -50,7 +50,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] { return [ dedupeIntegration(), // TODO(v11): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration` - // eslint-disable-next-line deprecation/deprecation + // eslint-disable-next-line typescript/no-deprecated inboundFiltersIntegration(), functionToStringIntegration(), conversationIdIntegration(), From bcd67129e71dd44d50d1af0fd3bb56221b9dc48f Mon Sep 17 00:00:00 2001 From: JPeer264 Date: Wed, 17 Jun 2026 15:02:35 +0200 Subject: [PATCH 2/3] chore: Add missing oxlint disable --- packages/astro/src/index.server.ts | 2 ++ packages/aws-serverless/src/index.ts | 2 ++ .../aws-serverless/src/integration/aws/vendored/aws-sdk.ts | 2 ++ .../integration/aws/vendored/services/ServiceExtension.ts | 1 + .../src/integration/aws/vendored/services/bedrock-runtime.ts | 2 ++ .../src/integration/aws/vendored/services/dynamodb.ts | 3 +++ .../src/integration/aws/vendored/services/lambda.ts | 1 + .../src/integration/aws/vendored/services/sns.ts | 3 +++ packages/browser-utils/src/index.ts | 2 ++ packages/browser/src/integrations/webVitals.ts | 1 + packages/browser/src/tracing/browserTracingIntegration.ts | 1 + packages/bun/src/index.ts | 2 ++ packages/cloudflare/src/durableobject.ts | 2 ++ packages/cloudflare/src/index.ts | 2 ++ packages/cloudflare/src/sdk.ts | 1 + packages/cloudflare/src/utils/rpcOptions.ts | 1 + packages/core/src/integrations/express/index.ts | 1 + packages/core/src/integrations/mcp-server/handlers.ts | 3 +++ packages/core/src/server-exports.ts | 1 + packages/core/src/shared-exports.ts | 2 ++ packages/elysia/src/index.ts | 2 ++ packages/google-cloud-serverless/src/index.ts | 2 ++ .../src/integrations/http/httpServerSpansIntegration.ts | 5 +++++ packages/node/src/index.ts | 1 + packages/node/src/integrations/tracing/index.ts | 1 + .../src/integrations/tracing/mongoose/vendored/mongoose.ts | 2 ++ .../node/src/integrations/tracing/mongoose/vendored/utils.ts | 5 +++++ packages/opentelemetry/src/exports.ts | 1 + packages/vercel-edge/src/sdk.ts | 1 + 29 files changed, 55 insertions(+) diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts index a42d2addcb04..c73bc4f31f27 100644 --- a/packages/astro/src/index.server.ts +++ b/packages/astro/src/index.server.ts @@ -65,6 +65,7 @@ export { winterCGHeadersToDict, graphqlIntegration, hapiIntegration, + // eslint-disable-next-line typescript/no-deprecated honoIntegration, httpIntegration, httpServerIntegration, @@ -127,6 +128,7 @@ export { setupConnectErrorHandler, setupExpressErrorHandler, setupHapiErrorHandler, + // eslint-disable-next-line typescript/no-deprecated setupHonoErrorHandler, setupKoaErrorHandler, setUser, diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts index 987af54e07d3..04b1b76efaa1 100644 --- a/packages/aws-serverless/src/index.ts +++ b/packages/aws-serverless/src/index.ts @@ -122,7 +122,9 @@ export { createSentryWinstonTransport, hapiIntegration, setupHapiErrorHandler, + // eslint-disable-next-line typescript/no-deprecated honoIntegration, + // eslint-disable-next-line typescript/no-deprecated setupHonoErrorHandler, spotlightIntegration, initOpenTelemetry, diff --git a/packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts b/packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts index 124e44a1ca6c..6f7119bf24c3 100644 --- a/packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts +++ b/packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts @@ -289,6 +289,7 @@ export class AwsInstrumentation extends InstrumentationBase ExpressIntegrationOptions; let moduleExports: ExpressModuleExport; if (!maybeGetOptions && isLegacyOptions(optionsOrExports)) { + // eslint-disable-next-line typescript/no-deprecated const { express, ...options } = optionsOrExports; moduleExports = express; getOptions = () => options; diff --git a/packages/core/src/integrations/mcp-server/handlers.ts b/packages/core/src/integrations/mcp-server/handlers.ts index 200156a24093..0f847f4ad6f8 100644 --- a/packages/core/src/integrations/mcp-server/handlers.ts +++ b/packages/core/src/integrations/mcp-server/handlers.ts @@ -132,6 +132,7 @@ function captureHandlerError(error: Error, methodName: keyof MCPServerInstance, * @param serverInstance - MCP server instance */ export function wrapToolHandlers(serverInstance: MCPServerInstance): void { + // eslint-disable-next-line typescript/no-deprecated if (typeof serverInstance.tool === 'function') wrapMethodHandler(serverInstance, 'tool'); if (typeof serverInstance.registerTool === 'function') wrapMethodHandler(serverInstance, 'registerTool'); } @@ -142,6 +143,7 @@ export function wrapToolHandlers(serverInstance: MCPServerInstance): void { * @param serverInstance - MCP server instance */ export function wrapResourceHandlers(serverInstance: MCPServerInstance): void { + // eslint-disable-next-line typescript/no-deprecated if (typeof serverInstance.resource === 'function') wrapMethodHandler(serverInstance, 'resource'); if (typeof serverInstance.registerResource === 'function') wrapMethodHandler(serverInstance, 'registerResource'); } @@ -152,6 +154,7 @@ export function wrapResourceHandlers(serverInstance: MCPServerInstance): void { * @param serverInstance - MCP server instance */ export function wrapPromptHandlers(serverInstance: MCPServerInstance): void { + // eslint-disable-next-line typescript/no-deprecated if (typeof serverInstance.prompt === 'function') wrapMethodHandler(serverInstance, 'prompt'); if (typeof serverInstance.registerPrompt === 'function') wrapMethodHandler(serverInstance, 'registerPrompt'); } diff --git a/packages/core/src/server-exports.ts b/packages/core/src/server-exports.ts index 1a19fa2902cc..2ee34bbbdeff 100644 --- a/packages/core/src/server-exports.ts +++ b/packages/core/src/server-exports.ts @@ -15,6 +15,7 @@ export { vercelWaitUntil } from './utils/vercelWaitUntil'; export { flushIfServerless } from './utils/flushIfServerless'; export { callFrameToStackFrame, watchdogTimer } from './utils/anr'; export { safeUnref as _INTERNAL_safeUnref } from './utils/timer'; +// eslint-disable-next-line typescript/no-deprecated export { patchExpressModule, setupExpressErrorHandler, expressErrorHandler } from './integrations/express/index'; export type { ExpressIntegrationOptions, diff --git a/packages/core/src/shared-exports.ts b/packages/core/src/shared-exports.ts index 98b01aef0683..e2160c9e14d9 100644 --- a/packages/core/src/shared-exports.ts +++ b/packages/core/src/shared-exports.ts @@ -179,10 +179,12 @@ export type { LangChainOptions, LangChainIntegration } from './tracing/langchain export { instrumentStateGraphCompile, instrumentCreateReactAgent, instrumentLangGraph } from './tracing/langgraph'; export { LANGGRAPH_INTEGRATION_NAME } from './tracing/langgraph/constants'; export type { LangGraphOptions, LangGraphIntegration, CompiledGraph } from './tracing/langgraph/types'; +// eslint-disable-next-line typescript/no-deprecated export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './tracing/openai/types'; export type { AnthropicAiClient, AnthropicAiOptions, + // eslint-disable-next-line typescript/no-deprecated AnthropicAiInstrumentedMethod, AnthropicAiResponse, } from './tracing/anthropic-ai/types'; diff --git a/packages/elysia/src/index.ts b/packages/elysia/src/index.ts index 2d06d75f1a33..8f3b80a1a95c 100644 --- a/packages/elysia/src/index.ts +++ b/packages/elysia/src/index.ts @@ -119,7 +119,9 @@ export { processSessionIntegration, hapiIntegration, setupHapiErrorHandler, + // eslint-disable-next-line typescript/no-deprecated honoIntegration, + // eslint-disable-next-line typescript/no-deprecated setupHonoErrorHandler, spotlightIntegration, initOpenTelemetry, diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts index 852f51c1260a..e473381fbf22 100644 --- a/packages/google-cloud-serverless/src/index.ts +++ b/packages/google-cloud-serverless/src/index.ts @@ -120,7 +120,9 @@ export { processSessionIntegration, hapiIntegration, setupHapiErrorHandler, + // eslint-disable-next-line typescript/no-deprecated honoIntegration, + // eslint-disable-next-line typescript/no-deprecated setupHonoErrorHandler, spotlightIntegration, initOpenTelemetry, diff --git a/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts b/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts index 1ae81fdf32f5..b20210bb8e54 100644 --- a/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts +++ b/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts @@ -376,6 +376,7 @@ function getIncomingRequestAttributesOnResponse( const newAttributes: SpanAttributes = { [HTTP_RESPONSE_STATUS_CODE]: statusCode, + // eslint-disable-next-line typescript/no-deprecated [HTTP_STATUS_CODE]: statusCode, 'http.status_text': statusMessage?.toUpperCase(), }; @@ -383,11 +384,15 @@ function getIncomingRequestAttributesOnResponse( const rpcMetadata = getRPCMetadata(context.active()); if (socket) { const { localAddress, localPort, remoteAddress, remotePort } = socket; + // eslint-disable-next-line typescript/no-deprecated newAttributes[NET_HOST_IP] = localAddress; + // eslint-disable-next-line typescript/no-deprecated newAttributes[NET_HOST_PORT] = localPort; + // eslint-disable-next-line typescript/no-deprecated newAttributes[NET_PEER_IP] = remoteAddress; newAttributes['net.peer.port'] = remotePort; } + // eslint-disable-next-line typescript/no-deprecated newAttributes[HTTP_STATUS_CODE] = statusCode; newAttributes['http.status_text'] = (statusMessage || '').toUpperCase(); diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index 97fe9d006e8b..791a8a8a5c6a 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -15,6 +15,7 @@ export { postgresIntegration } from './integrations/tracing/postgres'; export { postgresJsIntegration } from './integrations/tracing/postgresjs'; export { prismaIntegration } from './integrations/tracing/prisma'; export { hapiIntegration, setupHapiErrorHandler } from './integrations/tracing/hapi'; +// eslint-disable-next-line typescript/no-deprecated export { honoIntegration, setupHonoErrorHandler } from './integrations/tracing/hono'; export { koaIntegration, setupKoaErrorHandler } from './integrations/tracing/koa'; export { connectIntegration, setupConnectErrorHandler } from './integrations/tracing/connect'; diff --git a/packages/node/src/integrations/tracing/index.ts b/packages/node/src/integrations/tracing/index.ts index 944d762f26b4..5f56fdb379b0 100644 --- a/packages/node/src/integrations/tracing/index.ts +++ b/packages/node/src/integrations/tracing/index.ts @@ -36,6 +36,7 @@ export function getAutoPerformanceIntegrations(): Integration[] { expressIntegration(), fastifyIntegration(), graphqlIntegration(), + // eslint-disable-next-line typescript/no-deprecated honoIntegration(), mongoIntegration(), mongooseIntegration(), diff --git a/packages/node/src/integrations/tracing/mongoose/vendored/mongoose.ts b/packages/node/src/integrations/tracing/mongoose/vendored/mongoose.ts index 1238b42c510a..37ead8d8ff8c 100644 --- a/packages/node/src/integrations/tracing/mongoose/vendored/mongoose.ts +++ b/packages/node/src/integrations/tracing/mongoose/vendored/mongoose.ts @@ -308,7 +308,9 @@ export class MongooseInstrumentation extends InstrumentationBase Date: Wed, 17 Jun 2026 15:13:52 +0200 Subject: [PATCH 3/3] fixup! chore: Add missing oxlint disable --- packages/cloudflare/src/durableobject.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cloudflare/src/durableobject.ts b/packages/cloudflare/src/durableobject.ts index 332c715f4f43..e91f2fbd4b55 100644 --- a/packages/cloudflare/src/durableobject.ts +++ b/packages/cloudflare/src/durableobject.ts @@ -128,8 +128,8 @@ export function instrumentDurableObjectWithSentry< // only the listed method names should be instrumented. // eslint-disable-next-line typescript/no-deprecated const instrumentPrototypeMethods = Array.isArray(options.instrumentPrototypeMethods) - // eslint-disable-next-line typescript/no-deprecated - ? options.instrumentPrototypeMethods + ? // eslint-disable-next-line typescript/no-deprecated + options.instrumentPrototypeMethods : undefined; const allowSet = instrumentPrototypeMethods ? new Set(instrumentPrototypeMethods) : null;