Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .oxlintrc.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
8 changes: 5 additions & 3 deletions packages/astro/src/index.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -65,11 +65,12 @@ export {
winterCGHeadersToDict,
graphqlIntegration,
hapiIntegration,
// eslint-disable-next-line typescript/no-deprecated
honoIntegration,
httpIntegration,
httpServerIntegration,
httpServerSpansIntegration,
// eslint-disable-next-line deprecation/deprecation
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
initOpenTelemetry,
Expand Down Expand Up @@ -127,6 +128,7 @@ export {
setupConnectErrorHandler,
setupExpressErrorHandler,
setupHapiErrorHandler,
// eslint-disable-next-line typescript/no-deprecated
setupHonoErrorHandler,
setupKoaErrorHandler,
setUser,
Expand Down
20 changes: 10 additions & 10 deletions packages/astro/src/integration/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 || {};

Expand All @@ -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;

Expand All @@ -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'
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/src/integration/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ export type SentryOptions = Omit<BuildTimeOptionsBase, 'release'> &
* @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;

/**
Expand Down
10 changes: 6 additions & 4 deletions packages/aws-serverless/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -69,7 +69,7 @@ export {
localVariablesIntegration,
requestDataIntegration,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
linkedErrorsIntegration,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -175,6 +177,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';
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

const httpStatusCode = response.output?.$metadata?.httpStatusCode;
if (httpStatusCode) {
// eslint-disable-next-line typescript/no-deprecated
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}

Expand Down Expand Up @@ -317,6 +318,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

const httpStatusCode = err?.$metadata?.httpStatusCode;
if (httpStatusCode) {
// eslint-disable-next-line typescript/no-deprecated
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface RequestMetadata {
// the ServiceExtension must end the span itself, generally by wrapping the stream and ending after it is
// consumed.
isStream?: boolean;
// eslint-disable-next-line typescript/no-deprecated
spanAttributes?: SpanAttributes;
spanKind?: SpanKind;
spanName?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
): RequestMetadata {
let spanName = GEN_AI_OPERATION_NAME_VALUE_CHAT;
const spanAttributes: Attributes = {
// eslint-disable-next-line typescript/no-deprecated
[ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
[ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
};
Expand Down Expand Up @@ -126,6 +127,7 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
isStream: boolean,
): RequestMetadata {
const spanAttributes: Attributes = {
// eslint-disable-next-line typescript/no-deprecated
[ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
// add operation name for InvokeModel API
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@ export class DynamodbServiceExtension implements ServiceExtension {

const spanAttributes: Attributes = {};

// eslint-disable-next-line typescript/no-deprecated
spanAttributes[ATTR_DB_SYSTEM] = DB_SYSTEM_VALUE_DYNAMODB;
// eslint-disable-next-line typescript/no-deprecated
spanAttributes[ATTR_DB_NAME] = tableName;
// eslint-disable-next-line typescript/no-deprecated
spanAttributes[ATTR_DB_OPERATION] = operation;

// normalizedRequest.commandInput.RequestItems) is undefined when no table names are returned
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export class LambdaServiceExtension implements ServiceExtension {
switch (response.request.commandName) {
case LambdaCommands.Invoke:
{
// eslint-disable-next-line typescript/no-deprecated
span.setAttribute(ATTR_FAAS_EXECUTION, response.requestId);
}
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ export class SnsServiceExtension implements ServiceExtension {
if (request.commandName === 'Publish') {
spanKind = SpanKind.PRODUCER;

// eslint-disable-next-line typescript/no-deprecated
spanAttributes[ATTR_MESSAGING_DESTINATION_KIND] = MESSAGING_DESTINATION_KIND_VALUE_TOPIC;
const { TopicArn, TargetArn, PhoneNumber } = request.commandInput;
// eslint-disable-next-line typescript/no-deprecated
spanAttributes[ATTR_MESSAGING_DESTINATION] = this.extractDestinationName(TopicArn, TargetArn, PhoneNumber);
// ToDO: Use ATTR_MESSAGING_DESTINATION_NAME when implemented
spanAttributes['messaging.destination.name'] = TopicArn || TargetArn || PhoneNumber || 'unknown';

// eslint-disable-next-line typescript/no-deprecated
spanName = `${PhoneNumber ? 'phone_number' : spanAttributes[ATTR_MESSAGING_DESTINATION]} send`;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export function wrapHandler<TEvent, TResult>(
): Handler<TEvent, TResult> | StreamifyHandler<TEvent, TResult> {
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
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-utils/src/getNativeImplementation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function getNativeImplementation<T extends keyof CacheableImplementations
}

const document = WINDOW.document;
// eslint-disable-next-line deprecation/deprecation
// eslint-disable-next-line typescript/no-deprecated
if (document && typeof document.createElement === 'function') {
try {
const sandbox = document.createElement('iframe');
Expand Down
2 changes: 2 additions & 0 deletions packages/browser-utils/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ export {
startTrackingInteractions,
startTrackingLongTasks,
startTrackingLongAnimationFrames,
// eslint-disable-next-line typescript/no-deprecated
startTrackingWebVitals,
startTrackingINP,
registerInpInteractionListener,
} from './metrics/browserMetrics';

// eslint-disable-next-line typescript/no-deprecated
export { elementTimingIntegration, startTrackingElementTiming } from './metrics/elementTiming';

export { extractNetworkProtocol } from './metrics/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-utils/src/metrics/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ export function listenForWebVitalReportEvents(
collected = true;
}

// eslint-disable-next-line deprecation/deprecation
// eslint-disable-next-line typescript/no-deprecated
onHidden(() => {
_runCollectorCallbackOnce('pagehide');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class BrowserClient extends Client<BrowserClientOptions> {
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)
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/eventbuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}` };
}

Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/exports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export {
withScope,
withIsolationScope,
functionToStringIntegration,
// eslint-disable-next-line deprecation/deprecation
// eslint-disable-next-line typescript/no-deprecated
inboundFiltersIntegration,
eventFiltersIntegration,
dedupeIntegration,
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/integrations/httpclient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
}
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/integrations/webVitals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const webVitalsIntegration = defineIntegration((options: WebVitalsOptions
const recordLcpStandaloneSpans =
spanStreamingEnabled || ignored.has('lcp') ? undefined : enableStandaloneLcpSpans || false;

// eslint-disable-next-line typescript/no-deprecated
const finalizeWebVitals = startTrackingWebVitals({
recordClsStandaloneSpans,
recordLcpStandaloneSpans,
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/profiling/integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/browser/src/profiling/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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';
}

Expand Down
2 changes: 1 addition & 1 deletion packages/browser/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
markBackgroundSpan,
traceFetch,
traceXHR,
// eslint-disable-next-line typescript/no-deprecated
trackFetchStreamPerformance,
shouldCreateSpanForRequest,
enableHTTPTimings,
Expand Down
Loading
Loading