Skip to content

Commit fc48f83

Browse files
authored
ref: Remove a subset of TODO(v9) instances (#15033)
1 parent ddc378d commit fc48f83

File tree

12 files changed

+17
-57
lines changed

12 files changed

+17
-57
lines changed

.craft.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ targets:
55
# NPM Targets
66
## 1. Base Packages, node or browser SDKs depend on
77
## 1.1 Types
8-
# TODO(v9): Remove
98
- name: npm
109
id: '@sentry/types'
1110
includeNames: /^sentry-types-\d.*\.tgz$/

dev-packages/e2e-tests/verdaccio-config/config.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ packages:
164164
unpublish: $all
165165
# proxy: npmjs # Don't proxy for E2E tests!
166166

167-
# TODO(v9): Remove
168167
'@sentry/types':
169168
access: $all
170169
publish: $all

dev-packages/node-integration-tests/test.txt

+10-10
Large diffs are not rendered by default.

docs/migration/v8-to-v9.md

+4
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ Older Typescript versions _may_ still work, but we will not test them anymore an
102102

103103
- The `tracesSampler` hook will no longer be called for _every_ span. Instead, it will only be called for "root spans". Root spans are spans that have no local parent span. Root spans may however have incoming trace data from a different service, for example when using distributed tracing.
104104

105+
- The `childProcessIntegration`'s (previously `processThreadBreadcrumbIntegration`) `name` value has been changed from `"ProcessAndThreadBreadcrumbs"` to `"ChildProcess"`. This is relevant if you were filtering integrations by name.
106+
105107
### `@sentry/browser`
106108

107109
- The `captureUserFeedback` method has been removed. Use the `captureFeedback` method instead and update the `comments` field to `message`.
@@ -116,6 +118,8 @@ Older Typescript versions _may_ still work, but we will not test them anymore an
116118

117119
- By default, source maps will now be automatically deleted after being uploaded to Sentry for client-side builds. You can opt out of this behavior by explicitly setting `sourcemaps.deleteSourcemapsAfterUpload` to `false` in your Sentry config.
118120

121+
- The `sentry` property on the Next.js config object has officially been discontinued. Pass options to `withSentryConfig` directly.
122+
119123
### All Meta-Framework SDKs (`@sentry/astro`, `@sentry/nuxt`, `@sentry/solidstart`)
120124

121125
- Updated source map generation to respect the user-provided value of your build config, such as `vite.build.sourcemap`:

packages/core/package.json

-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
"publishConfig": {
3939
"access": "public"
4040
},
41-
"TODO(v9):": "Remove these dependencies",
42-
"devDependencies": {
43-
"@types/array.prototype.flat": "^1.2.1",
44-
"array.prototype.flat": "^1.3.0"
45-
},
4641
"scripts": {
4742
"build": "run-p build:transpile build:types",
4843
"build:dev": "yarn build",

packages/core/src/scope.ts

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export interface ScopeContext {
5353
propagationContext: PropagationContext;
5454
}
5555

56-
// TODO(v9): Add `normalizedRequest`
5756
export interface SdkProcessingMetadata {
5857
[key: string]: unknown;
5958
requestSession?: {

packages/core/src/utils/spanUtils.ts

-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { _getSpanForScope } from './spanOnScope';
3030
export const TRACE_FLAG_NONE = 0x0;
3131
export const TRACE_FLAG_SAMPLED = 0x1;
3232

33-
// todo(v9): Remove this once we've stopped dropping spans via `beforeSendSpan`
3433
let hasShownSpanDropWarning = false;
3534

3635
/**
@@ -281,8 +280,6 @@ export function getActiveSpan(): Span | undefined {
281280

282281
/**
283282
* Logs a warning once if `beforeSendSpan` is used to drop spans.
284-
*
285-
* todo(v9): Remove this once we've stopped dropping spans via `beforeSendSpan`.
286283
*/
287284
export function showSpanDropWarning(): void {
288285
if (!hasShownSpanDropWarning) {

packages/nextjs/src/config/types.ts

-9
Original file line numberDiff line numberDiff line change
@@ -373,15 +373,6 @@ export type SentryBuildOptions = {
373373
*/
374374
unstable_sentryWebpackPluginOptions?: SentryWebpackPluginOptions;
375375

376-
/**
377-
* Use `hidden-source-map` for webpack `devtool` option, which strips the `sourceMappingURL` from the bottom of built
378-
* JS files.
379-
*
380-
* @deprecated This is deprecated. The SDK emits chunks without `sourceMappingURL` for client bundles by default.
381-
*/
382-
// TODO(v9): Remove option
383-
hideSourceMaps?: boolean;
384-
385376
/**
386377
* Include Next.js-internal code and code from dependencies when uploading source maps.
387378
*

packages/nextjs/src/config/withSentryConfig.ts

-11
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ function getFinalConfigObject(
5050
incomingUserNextConfigObject: NextConfigObject,
5151
userSentryOptions: SentryBuildOptions,
5252
): NextConfigObject {
53-
// TODO(v9): Remove this check for the Sentry property
54-
if ('sentry' in incomingUserNextConfigObject) {
55-
// eslint-disable-next-line no-console
56-
console.warn(
57-
'[@sentry/nextjs] Setting a `sentry` property on the Next.js config object as a means of configuration is no longer supported. Please use the `sentryBuildOptions` argument of of the `withSentryConfig()` function instead.',
58-
);
59-
60-
// Next 12.2.3+ warns about non-canonical properties on `userNextConfig`.
61-
delete incomingUserNextConfigObject.sentry;
62-
}
63-
6453
if (userSentryOptions?.tunnelRoute) {
6554
if (incomingUserNextConfigObject.output === 'export') {
6655
if (!showedExportModeTunnelWarning) {

packages/node/src/integrations/childProcess.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ interface Options {
1212
includeChildProcessArgs?: boolean;
1313
}
1414

15-
// TODO(v9): Update this name and mention in migration docs.
16-
const INTEGRATION_NAME = 'ProcessAndThreadBreadcrumbs';
15+
const INTEGRATION_NAME = 'ChildProcess';
1716

1817
/**
1918
* Capture breadcrumbs for child processes and worker threads.
@@ -22,14 +21,12 @@ export const childProcessIntegration = defineIntegration((options: Options = {})
2221
return {
2322
name: INTEGRATION_NAME,
2423
setup(_client) {
25-
// eslint-disable-next-line deprecation/deprecation
2624
diagnosticsChannel.channel('child_process').subscribe((event: unknown) => {
2725
if (event && typeof event === 'object' && 'process' in event) {
2826
captureChildProcessEvents(event.process as ChildProcess, options);
2927
}
3028
});
3129

32-
// eslint-disable-next-line deprecation/deprecation
3330
diagnosticsChannel.channel('worker_threads').subscribe((event: unknown) => {
3431
if (event && typeof event === 'object' && 'worker' in event) {
3532
captureWorkerThreadEvents(event.worker as Worker);

packages/node/src/transports/http.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export function makeNodeTransport(options: NodeTransportOptions): Transport {
7272
const nativeHttpModule = isHttps ? https : http;
7373
const keepAlive = options.keepAlive === undefined ? false : options.keepAlive;
7474

75-
// TODO(v9): Evaluate if we can set keepAlive to true. This would involve testing for memory leaks in older node
75+
// TODO(v10): Evaluate if we can set keepAlive to true. This would involve testing for memory leaks in older node
7676
// versions(>= 8) as they had memory leaks when using it: #2555
7777
const agent = proxy
7878
? (new HttpsProxyAgent(proxy) as http.Agent)

packages/nuxt/src/client/vueIntegration.ts

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
import { GLOBAL_OBJ, defineIntegration } from '@sentry/core';
22
import type { VueIntegrationOptions } from '@sentry/vue';
33

4-
type Options = Omit<
5-
VueIntegrationOptions,
6-
| 'app'
7-
| 'Vue'
8-
// TODO(v9): Should be removed from parent type so we can remove it here
9-
| 'hooks'
10-
// TODO(v9): Should be removed from parent type so we can remove it here
11-
| 'timeout'
12-
// TODO(v9): Should be removed from parent type so we can remove it here
13-
| 'trackComponents'
14-
>;
4+
type Options = Omit<VueIntegrationOptions, 'app' | 'Vue'>;
155

166
// Since the options object needs to cross the boundary between some builds (i.e. the nuxt module build and our client
177
// SDK build) we cannot use a getter that is exported from here. Instead we'll pass the options object through a global

0 commit comments

Comments
 (0)