From c38ce77056244cc6cd0b1fc8fe888c8893e67ede Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 24 Mar 2023 13:20:11 +0000 Subject: [PATCH 1/4] Deprecate `@sentry/tracing` --- .../test/browser/browsertracing.test.ts | 1 + .../test/browser/request.test.ts | 1 + packages/tracing/src/index.ts | 276 ++++++++++++++++-- packages/tracing/test/hub.test.ts | 1 + packages/tracing/test/index.test.ts | 1 + .../test/integrations/apollo-nestjs.test.ts | 1 + .../tracing/test/integrations/apollo.test.ts | 1 + .../tracing/test/integrations/graphql.test.ts | 1 + .../test/integrations/node/mongo.test.ts | 1 + .../test/integrations/node/postgres.test.ts | 1 + .../test/integrations/node/prisma.test.ts | 1 + packages/tracing/test/span.test.ts | 1 + packages/tracing/test/transaction.test.ts | 1 + packages/tracing/test/utils.test.ts | 1 + 14 files changed, 263 insertions(+), 26 deletions(-) diff --git a/packages/tracing-internal/test/browser/browsertracing.test.ts b/packages/tracing-internal/test/browser/browsertracing.test.ts index 01e5f8990e9b..669e79e3c097 100644 --- a/packages/tracing-internal/test/browser/browsertracing.test.ts +++ b/packages/tracing-internal/test/browser/browsertracing.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ import { Hub, makeMain, TRACING_DEFAULTS } from '@sentry/core'; import * as hubExtensions from '@sentry/core'; import type { BaseTransportOptions, ClientOptions, DsnComponents } from '@sentry/types'; diff --git a/packages/tracing-internal/test/browser/request.test.ts b/packages/tracing-internal/test/browser/request.test.ts index 5e89ac99f451..a423986884b7 100644 --- a/packages/tracing-internal/test/browser/request.test.ts +++ b/packages/tracing-internal/test/browser/request.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ import * as sentryCore from '@sentry/core'; import * as utils from '@sentry/utils'; diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts index 497806fd4660..8f7f0076e7c3 100644 --- a/packages/tracing/src/index.ts +++ b/packages/tracing/src/index.ts @@ -1,47 +1,271 @@ -export { - // BrowserTracing is already exported as part of `Integrations` below (and for the moment will remain so for - // backwards compatibility), but that interferes with treeshaking, so we also export it separately - // here. - BrowserTracing, - BROWSER_TRACING_INTEGRATION_ID, - IdleTransaction, - Span, - // eslint-disable-next-line deprecation/deprecation - SpanStatus, - TRACEPARENT_REGEXP, - Transaction, - addExtensionMethods, - defaultRequestInstrumentationOptions, - extractTraceparentData, - instrumentOutgoingRequests, - getActiveTransaction, - hasTracingEnabled, - spanStatusfromHttpCode, - startIdleTransaction, - stripUrlQueryAndFragment, +import type { + RequestInstrumentationOptions as RequestInstrumentationOptionsT, + SpanStatusType as SpanStatusTypeT, } from '@sentry-internal/tracing'; -export type { RequestInstrumentationOptions, SpanStatusType } from '@sentry-internal/tracing'; - import { - addExtensionMethods, + addExtensionMethods as addExtensionMethodsT, Apollo, - BrowserTracing, + BROWSER_TRACING_INTEGRATION_ID as BROWSER_TRACING_INTEGRATION_ID_T, + BrowserTracing as BrowserTracingT, + defaultRequestInstrumentationOptions as defaultRequestInstrumentationOptionsT, Express, + extractTraceparentData as extractTraceparentDataT, + getActiveTransaction as getActiveTransactionT, GraphQL, + hasTracingEnabled as hasTracingEnabledT, + IdleTransaction as IdleTransactionT, + instrumentOutgoingRequests as instrumentOutgoingRequestsT, Mongo, Mysql, Postgres, Prisma, + Span as SpanT, + // eslint-disable-next-line deprecation/deprecation + SpanStatus as SpanStatusT, + spanStatusfromHttpCode as spanStatusfromHttpCodeT, + startIdleTransaction as startIdleTransactionT, + stripUrlQueryAndFragment as stripUrlQueryAndFragmentT, + TRACEPARENT_REGEXP as TRACEPARENT_REGEXP_T, + Transaction as TransactionT, } from '@sentry-internal/tracing'; +// BrowserTracing is already exported as part of `Integrations` below (and for the moment will remain so for +// backwards compatibility), but that interferes with treeshaking, so we also export it separately +// here. +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK + * + * import { BrowserTracing } from '@sentry/browser'; + * new BrowserTracing() + */ +export const BrowserTracing = BrowserTracingT; + +// BrowserTracing is already exported as part of `Integrations` below (and for the moment will remain so for +// backwards compatibility), but that interferes with treeshaking, so we also export it separately +// here. +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK + * + * import { BrowserTracing } from '@sentry/browser'; + * new BrowserTracing() + */ +export type BrowserTracing = BrowserTracingT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export const addExtensionMethods = addExtensionMethodsT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `getActiveTransaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export const getActiveTransaction = getActiveTransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `extractTraceparentData` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export const extractTraceparentData = extractTraceparentDataT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `spanStatusfromHttpCode` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export const spanStatusfromHttpCode = spanStatusfromHttpCodeT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `SpanStatusType` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export type SpanStatusType = SpanStatusTypeT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Transaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export const Transaction = TransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Transaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export type Transaction = TransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Span` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export const Span = SpanT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Span` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK + */ +export type Span = SpanT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export const BROWSER_TRACING_INTEGRATION_ID = BROWSER_TRACING_INTEGRATION_ID_T; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `defaultRequestInstrumentationOptions` can be imported from `@sentry/browser`, or your framework SDK + */ +export const defaultRequestInstrumentationOptions = defaultRequestInstrumentationOptionsT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `hasTracingEnabled` can be imported from `@sentry/utils` + */ +export const hasTracingEnabled = hasTracingEnabledT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `stripUrlQueryAndFragment` can be imported from `@sentry/utils` + */ +export const stripUrlQueryAndFragment = stripUrlQueryAndFragmentT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `TRACEPARENT_REGEXP` can be imported from `@sentry/utils` + */ +export const TRACEPARENT_REGEXP = TRACEPARENT_REGEXP_T; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export const IdleTransaction = IdleTransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export type IdleTransaction = IdleTransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export const instrumentOutgoingRequests = instrumentOutgoingRequestsT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export const startIdleTransaction = startIdleTransactionT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +// eslint-disable-next-line deprecation/deprecation +export const SpanStatus = SpanStatusT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +// eslint-disable-next-line deprecation/deprecation +export type SpanStatus = SpanStatusT; + +/** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + */ +export type RequestInstrumentationOptions = RequestInstrumentationOptionsT; + export const Integrations = { + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK + * + * import { BrowserTracing } from '@sentry/browser'; + * new BrowserTracing() + */ + // eslint-disable-next-line deprecation/deprecation BrowserTracing: BrowserTracing, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Apollo` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Apollo({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Apollo: Apollo, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Express` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Express({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Express: Express, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `GraphQL` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.GraphQL({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation GraphQL: GraphQL, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Mongo` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Mongo({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Mongo: Mongo, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Mysql` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Mysql({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Mysql: Mysql, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Postgres` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Postgres({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Postgres: Postgres, + /** + * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * + * `Prisma` can be imported from `@sentry/node` + * + * import { Integrations } from '@sentry/node'; + * new Integrations.Prisma({ ... }) + */ + // eslint-disable-next-line deprecation/deprecation Prisma: Prisma, }; @@ -51,5 +275,5 @@ declare const __SENTRY_TRACING__: boolean; // Guard for tree if (typeof __SENTRY_TRACING__ === 'undefined' || __SENTRY_TRACING__) { // We are patching the global object with our hub extension methods - addExtensionMethods(); + addExtensionMethodsT(); } diff --git a/packages/tracing/test/hub.test.ts b/packages/tracing/test/hub.test.ts index 789ffc8e939f..d292a231f1b7 100644 --- a/packages/tracing/test/hub.test.ts +++ b/packages/tracing/test/hub.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { BrowserClient } from '@sentry/browser'; import { Hub, makeMain } from '@sentry/core'; diff --git a/packages/tracing/test/index.test.ts b/packages/tracing/test/index.test.ts index e8a7d0d09f52..79a61cd66dd6 100644 --- a/packages/tracing/test/index.test.ts +++ b/packages/tracing/test/index.test.ts @@ -24,6 +24,7 @@ describe('index', () => { }); it('contains BrowserTracing', () => { + // eslint-disable-next-line deprecation/deprecation expect(Integrations.BrowserTracing).toEqual(BrowserTracing); }); }); diff --git a/packages/tracing/test/integrations/apollo-nestjs.test.ts b/packages/tracing/test/integrations/apollo-nestjs.test.ts index 0a5116277cb1..cf5733ad979d 100644 --- a/packages/tracing/test/integrations/apollo-nestjs.test.ts +++ b/packages/tracing/test/integrations/apollo-nestjs.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/integrations/apollo.test.ts b/packages/tracing/test/integrations/apollo.test.ts index 456c824f23ce..9b50fbaa1adc 100644 --- a/packages/tracing/test/integrations/apollo.test.ts +++ b/packages/tracing/test/integrations/apollo.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/integrations/graphql.test.ts b/packages/tracing/test/integrations/graphql.test.ts index ccd4348784bd..fa5a026d653a 100644 --- a/packages/tracing/test/integrations/graphql.test.ts +++ b/packages/tracing/test/integrations/graphql.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/integrations/node/mongo.test.ts b/packages/tracing/test/integrations/node/mongo.test.ts index 70ac88e13109..8c406a6ecd14 100644 --- a/packages/tracing/test/integrations/node/mongo.test.ts +++ b/packages/tracing/test/integrations/node/mongo.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/integrations/node/postgres.test.ts b/packages/tracing/test/integrations/node/postgres.test.ts index c2d5868596a1..6a965b1ed9f8 100644 --- a/packages/tracing/test/integrations/node/postgres.test.ts +++ b/packages/tracing/test/integrations/node/postgres.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/integrations/node/prisma.test.ts b/packages/tracing/test/integrations/node/prisma.test.ts index 735167161402..d1acdc65190e 100644 --- a/packages/tracing/test/integrations/node/prisma.test.ts +++ b/packages/tracing/test/integrations/node/prisma.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ /* eslint-disable @typescript-eslint/unbound-method */ import { Hub, Scope } from '@sentry/core'; import { logger } from '@sentry/utils'; diff --git a/packages/tracing/test/span.test.ts b/packages/tracing/test/span.test.ts index 38231b40e2ca..e642f7490589 100644 --- a/packages/tracing/test/span.test.ts +++ b/packages/tracing/test/span.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ import { BrowserClient } from '@sentry/browser'; import { Hub, makeMain, Scope } from '@sentry/core'; import type { BaseTransportOptions, ClientOptions, TransactionSource } from '@sentry/types'; diff --git a/packages/tracing/test/transaction.test.ts b/packages/tracing/test/transaction.test.ts index dae87c3a2f20..d07c52d34681 100644 --- a/packages/tracing/test/transaction.test.ts +++ b/packages/tracing/test/transaction.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ import { BrowserClient, Hub } from '@sentry/browser'; import { addExtensionMethods, Transaction } from '../src'; diff --git a/packages/tracing/test/utils.test.ts b/packages/tracing/test/utils.test.ts index 67e529e59ae9..00d90e873c9e 100644 --- a/packages/tracing/test/utils.test.ts +++ b/packages/tracing/test/utils.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable deprecation/deprecation */ import { extractTraceparentData, hasTracingEnabled } from '../src'; describe('hasTracingEnabled (deprecated)', () => { From 5177a7f5028f8f6c9f68370cf48ba2e18405b0db Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 24 Mar 2023 13:26:52 +0000 Subject: [PATCH 2/4] Missed a lint --- .../test/browser/backgroundtab.test.ts | 1 + packages/tracing/src/index.ts | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/tracing-internal/test/browser/backgroundtab.test.ts b/packages/tracing-internal/test/browser/backgroundtab.test.ts index 0826d5f72884..436d63aab36c 100644 --- a/packages/tracing-internal/test/browser/backgroundtab.test.ts +++ b/packages/tracing-internal/test/browser/backgroundtab.test.ts @@ -19,6 +19,7 @@ describe('registerBackgroundTabDetection', () => { makeMain(hub); // If we do not add extension methods, invoking hub.startTransaction returns undefined + // eslint-disable-next-line deprecation/deprecation addExtensionMethods(); // @ts-ignore need to override global document diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts index 8f7f0076e7c3..56d4dfd07ef2 100644 --- a/packages/tracing/src/index.ts +++ b/packages/tracing/src/index.ts @@ -34,7 +34,6 @@ import { // here. /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -47,7 +46,6 @@ export const BrowserTracing = BrowserTracingT; // here. /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -189,7 +187,6 @@ export type RequestInstrumentationOptions = RequestInstrumentationOptionsT; export const Integrations = { /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -199,7 +196,6 @@ export const Integrations = { BrowserTracing: BrowserTracing, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Apollo` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -209,7 +205,6 @@ export const Integrations = { Apollo: Apollo, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Express` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -219,7 +214,6 @@ export const Integrations = { Express: Express, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `GraphQL` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -229,7 +223,6 @@ export const Integrations = { GraphQL: GraphQL, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Mongo` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -239,7 +232,6 @@ export const Integrations = { Mongo: Mongo, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Mysql` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -249,7 +241,6 @@ export const Integrations = { Mysql: Mysql, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Postgres` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -259,7 +250,6 @@ export const Integrations = { Postgres: Postgres, /** * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. - * * `Prisma` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; From 6633111b98a995c09171ad9e795242813e0b9f2c Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Fri, 24 Mar 2023 14:04:47 +0000 Subject: [PATCH 3/4] More missed lints! --- .../multiple-routers/common-infix-parameterized/server.ts | 1 + .../suites/express/multiple-routers/common-infix/server.ts | 1 + .../common-prefix-parameterized-reverse/server.ts | 1 + .../multiple-routers/common-prefix-parameterized/server.ts | 1 + .../common-prefix-same-length-parameterized copy/server.ts | 1 + .../common-prefix-same-length-parameterized/server.ts | 1 + .../suites/express/multiple-routers/common-prefix/server.ts | 1 + .../suites/express/sentry-trace/baggage-header-out/server.ts | 1 + .../baggage-other-vendors-with-sentry-entries/server.ts | 1 + .../suites/express/sentry-trace/baggage-other-vendors/server.ts | 1 + .../express/sentry-trace/baggage-transaction-name/server.ts | 1 + .../suites/express/sentry-trace/server.ts | 1 + .../suites/tracing-new/tracePropagationTargets/scenario.ts | 2 -- .../suites/tracing/apollo-graphql/scenario.ts | 1 + .../suites/tracing/prisma-orm/scenario.ts | 1 + 15 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts index 190a836d10c9..116d703384d0 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts index 4751d8fa82fb..1aebc5716594 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts index 15c8d63b64e3..8fa43c0654fb 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts index 05861702e020..526f06e2979e 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts index b1f2fd321409..caeac2d4db92 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts index 2ea0325b5fdd..c2d06dc16d6c 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts index 02f0bb20928e..5de431f36e4b 100644 --- a/packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts +++ b/packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts @@ -8,6 +8,7 @@ const app = express(); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts index 2ec3c7ca010d..16f5371bc1ee 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts @@ -12,6 +12,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', environment: 'prod', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts index 1feae49936e5..6674e2a1bb77 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts @@ -12,6 +12,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', environment: 'prod', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts index 475b6928cd8a..86cfa033b79e 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts @@ -12,6 +12,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', environment: 'prod', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts index 6e814bc5e333..3d8afeaed2f8 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts @@ -12,6 +12,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', environment: 'prod', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, // TODO: We're rethinking the mechanism for including Pii data in DSC, hence commenting out sendDefaultPii for now diff --git a/packages/node-integration-tests/suites/express/sentry-trace/server.ts b/packages/node-integration-tests/suites/express/sentry-trace/server.ts index 25238008efcf..76bb399e3bc0 100644 --- a/packages/node-integration-tests/suites/express/sentry-trace/server.ts +++ b/packages/node-integration-tests/suites/express/sentry-trace/server.ts @@ -12,6 +12,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', environment: 'prod', + // eslint-disable-next-line deprecation/deprecation integrations: [new Sentry.Integrations.Http({ tracing: true }), new Tracing.Integrations.Express({ app })], tracesSampleRate: 1.0, }); diff --git a/packages/node-integration-tests/suites/tracing-new/tracePropagationTargets/scenario.ts b/packages/node-integration-tests/suites/tracing-new/tracePropagationTargets/scenario.ts index a6197e5ab743..aac4bb97035f 100644 --- a/packages/node-integration-tests/suites/tracing-new/tracePropagationTargets/scenario.ts +++ b/packages/node-integration-tests/suites/tracing-new/tracePropagationTargets/scenario.ts @@ -2,8 +2,6 @@ import * as Sentry from '@sentry/node'; import * as http from 'http'; -Sentry.addTracingExtensions(); - Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', diff --git a/packages/node-integration-tests/suites/tracing/apollo-graphql/scenario.ts b/packages/node-integration-tests/suites/tracing/apollo-graphql/scenario.ts index cea4a03df10e..732d32814f95 100644 --- a/packages/node-integration-tests/suites/tracing/apollo-graphql/scenario.ts +++ b/packages/node-integration-tests/suites/tracing/apollo-graphql/scenario.ts @@ -6,6 +6,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracesSampleRate: 1.0, + // eslint-disable-next-line deprecation/deprecation integrations: [new Tracing.Integrations.GraphQL(), new Tracing.Integrations.Apollo()], }); diff --git a/packages/node-integration-tests/suites/tracing/prisma-orm/scenario.ts b/packages/node-integration-tests/suites/tracing/prisma-orm/scenario.ts index 047166a9e136..9c6e25e8b342 100644 --- a/packages/node-integration-tests/suites/tracing/prisma-orm/scenario.ts +++ b/packages/node-integration-tests/suites/tracing/prisma-orm/scenario.ts @@ -10,6 +10,7 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', tracesSampleRate: 1.0, + // eslint-disable-next-line deprecation/deprecation integrations: [new Tracing.Integrations.Prisma({ client })], }); From 97bf6668a6e08637a83bbb5eeff021db4b3ee9f5 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 3 Apr 2023 13:33:21 +0200 Subject: [PATCH 4/4] change deprecation wording --- packages/tracing/src/index.ts | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts index 56d4dfd07ef2..ff52e3d31466 100644 --- a/packages/tracing/src/index.ts +++ b/packages/tracing/src/index.ts @@ -33,7 +33,7 @@ import { // backwards compatibility), but that interferes with treeshaking, so we also export it separately // here. /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -45,7 +45,7 @@ export const BrowserTracing = BrowserTracingT; // backwards compatibility), but that interferes with treeshaking, so we also export it separately // here. /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -54,139 +54,139 @@ export const BrowserTracing = BrowserTracingT; export type BrowserTracing = BrowserTracingT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export const addExtensionMethods = addExtensionMethodsT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `getActiveTransaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export const getActiveTransaction = getActiveTransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `extractTraceparentData` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export const extractTraceparentData = extractTraceparentDataT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `spanStatusfromHttpCode` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export const spanStatusfromHttpCode = spanStatusfromHttpCodeT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `SpanStatusType` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export type SpanStatusType = SpanStatusTypeT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `Transaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export const Transaction = TransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `Transaction` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export type Transaction = TransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `Span` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export const Span = SpanT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `Span` can be imported from `@sentry/node`, `@sentry/browser`, or your framework SDK */ export type Span = SpanT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export const BROWSER_TRACING_INTEGRATION_ID = BROWSER_TRACING_INTEGRATION_ID_T; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `defaultRequestInstrumentationOptions` can be imported from `@sentry/browser`, or your framework SDK */ export const defaultRequestInstrumentationOptions = defaultRequestInstrumentationOptionsT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `hasTracingEnabled` can be imported from `@sentry/utils` */ export const hasTracingEnabled = hasTracingEnabledT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `stripUrlQueryAndFragment` can be imported from `@sentry/utils` */ export const stripUrlQueryAndFragment = stripUrlQueryAndFragmentT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * * `TRACEPARENT_REGEXP` can be imported from `@sentry/utils` */ export const TRACEPARENT_REGEXP = TRACEPARENT_REGEXP_T; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export const IdleTransaction = IdleTransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export type IdleTransaction = IdleTransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export const instrumentOutgoingRequests = instrumentOutgoingRequestsT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export const startIdleTransaction = startIdleTransactionT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ // eslint-disable-next-line deprecation/deprecation export const SpanStatus = SpanStatusT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ // eslint-disable-next-line deprecation/deprecation export type SpanStatus = SpanStatusT; /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. */ export type RequestInstrumentationOptions = RequestInstrumentationOptionsT; export const Integrations = { /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `BrowserTracing` can be imported from `@sentry/browser` or your framework SDK * * import { BrowserTracing } from '@sentry/browser'; @@ -195,7 +195,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation BrowserTracing: BrowserTracing, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Apollo` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -204,7 +204,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation Apollo: Apollo, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Express` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -213,7 +213,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation Express: Express, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `GraphQL` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -222,7 +222,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation GraphQL: GraphQL, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Mongo` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -231,7 +231,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation Mongo: Mongo, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Mysql` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -240,7 +240,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation Mysql: Mysql, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Postgres` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node'; @@ -249,7 +249,7 @@ export const Integrations = { // eslint-disable-next-line deprecation/deprecation Postgres: Postgres, /** - * @deprecated `@sentry/tracing` has been deprecated and will be removed in the next major version. + * @deprecated `@sentry/tracing` has been deprecated and will be moved to to `@sentry/node`, `@sentry/browser`, or your framework SDK in the next major version. * `Prisma` can be imported from `@sentry/node` * * import { Integrations } from '@sentry/node';