From 6645f8dc2b53a5a6cb96f41e6260d44e62a22716 Mon Sep 17 00:00:00 2001 From: Nicolas Hrubec Date: Fri, 9 Oct 2026 12:05:50 +0200 Subject: [PATCH] test(node): Use default streaming in scope and span suites Co-Authored-By: GPT-6 --- .../node-suites/excludes.ts | 16 ++++++++-------- .../node-suites/excludes.ts | 6 +++--- .../{context-streamed => context}/scenario.ts | 1 - .../scope-contexts/scenario.ts | 1 - .../scope-contexts/test.ts | 0 .../suites/{context-streamed => context}/test.ts | 0 .../scenario.ts | 0 .../test.ts | 0 .../public-api/scopes/initialScopes/scenario.ts | 1 - .../public-api/scopes/isolationScope/scenario.ts | 1 - .../attributes/instrument.mjs | 1 - .../attributes/server.mjs | 0 .../attributes/test.ts | 2 +- .../children/instrument.mjs | 1 - .../children/server.mjs | 0 .../children/test.ts | 2 +- .../continued-trace-child/instrument.mjs | 1 - .../continued-trace-child/server.mjs | 0 .../continued-trace-child/test.ts | 2 +- .../continued-trace-http-client/instrument.mjs | 1 - .../continued-trace-http-client/server.mjs | 0 .../continued-trace-http-client/test.ts | 2 +- .../continued-trace-segment/instrument.mjs | 1 - .../continued-trace-segment/server.mjs | 0 .../continued-trace-segment/test.ts | 2 +- .../segments/instrument.mjs | 1 - .../segments/server.mjs | 0 .../segments/test.ts | 2 +- .../instrument.mjs | 1 - .../{sampling-streamed => sampling}/server.mjs | 0 .../{sampling-streamed => sampling}/test.ts | 2 +- 31 files changed, 18 insertions(+), 29 deletions(-) rename dev-packages/node-integration-tests/suites/{context-streamed => context}/scenario.ts (92%) rename dev-packages/node-integration-tests/suites/{context-streamed => context}/scope-contexts/scenario.ts (96%) rename dev-packages/node-integration-tests/suites/{context-streamed => context}/scope-contexts/test.ts (100%) rename dev-packages/node-integration-tests/suites/{context-streamed => context}/test.ts (100%) rename dev-packages/node-integration-tests/suites/public-api/{beforeSendSpan-streamed => beforeSendSpan}/scenario.ts (100%) rename dev-packages/node-integration-tests/suites/public-api/{beforeSendSpan-streamed => beforeSendSpan}/test.ts (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/attributes/instrument.mjs (92%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/attributes/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/attributes/test.ts (94%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/children/instrument.mjs (92%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/children/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/children/test.ts (97%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-child/instrument.mjs (92%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-child/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-child/test.ts (96%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-http-client/instrument.mjs (93%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-http-client/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-http-client/test.ts (98%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-segment/instrument.mjs (92%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-segment/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/continued-trace-segment/test.ts (96%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/segments/instrument.mjs (92%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/segments/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{ignoreSpans-streamed => ignoreSpans}/segments/test.ts (95%) rename dev-packages/node-integration-tests/suites/tracing/{sampling-streamed => sampling}/instrument.mjs (95%) rename dev-packages/node-integration-tests/suites/tracing/{sampling-streamed => sampling}/server.mjs (100%) rename dev-packages/node-integration-tests/suites/tracing/{sampling-streamed => sampling}/test.ts (97%) diff --git a/dev-packages/bun-integration-tests/node-suites/excludes.ts b/dev-packages/bun-integration-tests/node-suites/excludes.ts index 495ca29dec35..9f8d29a4db53 100644 --- a/dev-packages/bun-integration-tests/node-suites/excludes.ts +++ b/dev-packages/bun-integration-tests/node-suites/excludes.ts @@ -22,14 +22,14 @@ const NO_HTTP_SERVER_SPANS = [ 'suites/tracing/httpIntegration-streamed/test.ts', 'suites/tracing/httpIntegration/test.ts', 'suites/tracing/httpServerSpans-unrouted/test.ts', - 'suites/tracing/ignoreSpans-streamed/**', + 'suites/tracing/ignoreSpans/**', 'suites/tracing/meta-tags-twp-errors/test.ts', 'suites/tracing/meta-tags/test.ts', 'suites/tracing/requestData/test.ts', 'suites/tracing/sample-rand-propagation/test.ts', 'suites/tracing/sample-rate-propagation/**', 'suites/tracing/sampling-static/test.ts', - 'suites/tracing/sampling-streamed/test.ts', + 'suites/tracing/sampling/test.ts', 'suites/tracing/traceid-recycling-with-spans/test.ts', 'suites/tracing/traceid-recycling/test.ts', ]; @@ -170,7 +170,7 @@ const FETCH_INTEGRATION_DIFFERS = [ 'suites/tracing/http-client-spans/fetch-basic/test.ts', 'suites/tracing/http-client-spans/fetch-error/test.ts', 'suites/tracing/http-client-spans/fetch-strip-query/test.ts', - 'suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts', + 'suites/tracing/ignoreSpans/continued-trace-http-client/test.ts', 'suites/tracing/requests/fetch-breadcrumbs/test.ts', 'suites/tracing/requests/fetch-sampled-no-active-span/test.ts', ]; @@ -194,11 +194,11 @@ const NO_EXPRESS_INSTRUMENTATION = [ 'suites/sessions/crashed-session-aggregate/test.ts', 'suites/sessions/errored-session-aggregate/test.ts', 'suites/tracing/httpIntegration-streamed/test.ts', - 'suites/tracing/ignoreSpans-streamed/attributes/test.ts', - 'suites/tracing/ignoreSpans-streamed/children/test.ts', - 'suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts', - 'suites/tracing/ignoreSpans-streamed/segments/test.ts', - 'suites/tracing/sampling-streamed/test.ts', + 'suites/tracing/ignoreSpans/attributes/test.ts', + 'suites/tracing/ignoreSpans/children/test.ts', + 'suites/tracing/ignoreSpans/continued-trace-child/test.ts', + 'suites/tracing/ignoreSpans/segments/test.ts', + 'suites/tracing/sampling/test.ts', 'suites/tracing/traceid-recycling-with-spans/test.ts', ]; diff --git a/dev-packages/deno-integration-tests/node-suites/excludes.ts b/dev-packages/deno-integration-tests/node-suites/excludes.ts index e5ec281a7a52..14205893d332 100644 --- a/dev-packages/deno-integration-tests/node-suites/excludes.ts +++ b/dev-packages/deno-integration-tests/node-suites/excludes.ts @@ -16,9 +16,9 @@ const NO_FETCH_INSTRUMENTATION = [ 'suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts', 'suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts', 'suites/tracing/http-client-spans/fetch-strip-query/test.ts', - 'suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts', - 'suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts', - 'suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts', + 'suites/tracing/ignoreSpans/continued-trace-child/test.ts', + 'suites/tracing/ignoreSpans/continued-trace-http-client/test.ts', + 'suites/tracing/ignoreSpans/continued-trace-segment/test.ts', 'suites/tracing/no-parent-span-client-report/test.ts', 'suites/tracing/requests/fetch-breadcrumbs/test.ts', 'suites/tracing/requests/fetch-no-trace-propagation/test.ts', diff --git a/dev-packages/node-integration-tests/suites/context-streamed/scenario.ts b/dev-packages/node-integration-tests/suites/context/scenario.ts similarity index 92% rename from dev-packages/node-integration-tests/suites/context-streamed/scenario.ts rename to dev-packages/node-integration-tests/suites/context/scenario.ts index 7f1b5ddd053f..4eb6adf001a0 100644 --- a/dev-packages/node-integration-tests/suites/context-streamed/scenario.ts +++ b/dev-packages/node-integration-tests/suites/context/scenario.ts @@ -4,7 +4,6 @@ import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', tracesSampleRate: 1.0, - traceLifecycle: 'stream', transport: loggingTransport, }); diff --git a/dev-packages/node-integration-tests/suites/context-streamed/scope-contexts/scenario.ts b/dev-packages/node-integration-tests/suites/context/scope-contexts/scenario.ts similarity index 96% rename from dev-packages/node-integration-tests/suites/context-streamed/scope-contexts/scenario.ts rename to dev-packages/node-integration-tests/suites/context/scope-contexts/scenario.ts index f29857444e4d..6e2e0c7cd341 100644 --- a/dev-packages/node-integration-tests/suites/context-streamed/scope-contexts/scenario.ts +++ b/dev-packages/node-integration-tests/suites/context/scope-contexts/scenario.ts @@ -4,7 +4,6 @@ import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', tracesSampleRate: 1.0, - traceLifecycle: 'stream', transport: loggingTransport, }); diff --git a/dev-packages/node-integration-tests/suites/context-streamed/scope-contexts/test.ts b/dev-packages/node-integration-tests/suites/context/scope-contexts/test.ts similarity index 100% rename from dev-packages/node-integration-tests/suites/context-streamed/scope-contexts/test.ts rename to dev-packages/node-integration-tests/suites/context/scope-contexts/test.ts diff --git a/dev-packages/node-integration-tests/suites/context-streamed/test.ts b/dev-packages/node-integration-tests/suites/context/test.ts similarity index 100% rename from dev-packages/node-integration-tests/suites/context-streamed/test.ts rename to dev-packages/node-integration-tests/suites/context/test.ts diff --git a/dev-packages/node-integration-tests/suites/public-api/beforeSendSpan-streamed/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/beforeSendSpan/scenario.ts similarity index 100% rename from dev-packages/node-integration-tests/suites/public-api/beforeSendSpan-streamed/scenario.ts rename to dev-packages/node-integration-tests/suites/public-api/beforeSendSpan/scenario.ts diff --git a/dev-packages/node-integration-tests/suites/public-api/beforeSendSpan-streamed/test.ts b/dev-packages/node-integration-tests/suites/public-api/beforeSendSpan/test.ts similarity index 100% rename from dev-packages/node-integration-tests/suites/public-api/beforeSendSpan-streamed/test.ts rename to dev-packages/node-integration-tests/suites/public-api/beforeSendSpan/test.ts diff --git a/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts index 4a4327c15b3a..f9245b584256 100644 --- a/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts +++ b/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', transport: loggingTransport, diff --git a/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts index 1e0e81cf58cb..b527d14699cc 100644 --- a/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts +++ b/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node'; import { loggingTransport } from '@sentry-internal/node-integration-tests'; Sentry.init({ - traceLifecycle: 'static', dsn: 'https://public@dsn.ingest.sentry.io/1337', release: '1.0', transport: loggingTransport, diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/instrument.mjs similarity index 92% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/instrument.mjs index 31da3f1dacfb..0db17515dbba 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/instrument.mjs @@ -6,7 +6,6 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: [{ attributes: { 'http.request.method': 'POST' } }], clientReportFlushInterval: 1_000, }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/test.ts similarity index 94% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/test.ts index 22eac608d616..dbc23242a06b 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/attributes/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/attributes/test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; -describe('filtering segment spans by attribute with ignoreSpans (streaming)', () => { +describe('filtering segment spans by attribute with ignoreSpans', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/instrument.mjs similarity index 92% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/instrument.mjs index 266ffdc4f52c..4e6a4d0677c9 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/instrument.mjs @@ -6,7 +6,6 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: ['expressInit', /custom-to-drop/, { op: 'ignored-op' }], clientReportFlushInterval: 1_000, }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/test.ts similarity index 97% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/test.ts index fefa45353102..03bac0660313 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/children/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/children/test.ts @@ -2,7 +2,7 @@ import { SENTRY_OP } from '@sentry/conventions/attributes'; import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; -describe('filtering child spans with ignoreSpans (streaming)', () => { +describe('filtering child spans with ignoreSpans', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/instrument.mjs similarity index 92% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/instrument.mjs index 75d3d12bc730..ca7f173be631 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/instrument.mjs @@ -5,7 +5,6 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', tracesSampleRate: 0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: ['ignoredMiddleware'], tracePropagationTargets: [process.env.SERVER_URL], clientReportFlushInterval: 1_000, diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/test.ts similarity index 96% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/test.ts index a9c5574810d5..2f04092502b5 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-child/test.ts @@ -3,7 +3,7 @@ import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; import { SENTRY_OP } from '@sentry/conventions/attributes'; -describe('ignoring a child of a continued server segment (streaming)', () => { +describe('ignoring a child of a continued server segment', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/instrument.mjs similarity index 93% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/instrument.mjs index 2d534bda43f2..8d6990f70f60 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/instrument.mjs @@ -5,7 +5,6 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', tracesSampleRate: 0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: [{ attributes: { 'url.path': '/outgoing' } }], tracePropagationTargets: [process.env.SERVER_URL], clientReportFlushInterval: 1_000, diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/test.ts similarity index 98% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/test.ts index 79e727254710..da9f1e5a7d9f 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-http-client/test.ts @@ -3,7 +3,7 @@ import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; import { SENTRY_OP } from '@sentry/conventions/attributes'; -describe('ignoring an HTTP client child of a continued server segment (streaming)', () => { +describe('ignoring an HTTP client child of a continued server segment', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/instrument.mjs similarity index 92% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/instrument.mjs index d6c2931b331f..950501539e15 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/instrument.mjs @@ -5,7 +5,6 @@ Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', tracesSampleRate: 0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: [{ op: 'http.server' }], tracePropagationTargets: [process.env.SERVER_URL], }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/test.ts similarity index 96% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/test.ts index 5aa058ff4d7c..afc8eb2158ba 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/continued-trace-segment/test.ts @@ -3,7 +3,7 @@ import { afterAll, describe, expect } from 'vitest'; import { RUNTIME } from '../../../../utils'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; -describe('ignoring a continued server segment (streaming)', () => { +describe('ignoring a continued server segment', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/instrument.mjs similarity index 92% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/instrument.mjs index 812ba9fb86a8..e86e9f19984b 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/instrument.mjs @@ -6,7 +6,6 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - traceLifecycle: 'stream', ignoreSpans: [{ attributes: { 'url.path': '/health' } }], clientReportFlushInterval: 1_000, }); diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/server.mjs b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/test.ts similarity index 95% rename from dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/test.ts rename to dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/test.ts index 538c9c77a532..ebbd956d8239 100644 --- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/segments/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans/segments/test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner'; -describe('filtering segment spans with ignoreSpans (streaming)', () => { +describe('filtering segment spans with ignoreSpans', () => { afterAll(() => { cleanupChildProcesses(); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/sampling-streamed/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/sampling/instrument.mjs similarity index 95% rename from dev-packages/node-integration-tests/suites/tracing/sampling-streamed/instrument.mjs rename to dev-packages/node-integration-tests/suites/tracing/sampling/instrument.mjs index 0ce3c59cf745..4fd072ae569a 100644 --- a/dev-packages/node-integration-tests/suites/tracing/sampling-streamed/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/sampling/instrument.mjs @@ -12,6 +12,5 @@ Sentry.init({ return inheritOrSampleWith(1); }, transport: loggingTransport, - traceLifecycle: 'stream', clientReportFlushInterval: 1_000, }); diff --git a/dev-packages/node-integration-tests/suites/tracing/sampling-streamed/server.mjs b/dev-packages/node-integration-tests/suites/tracing/sampling/server.mjs similarity index 100% rename from dev-packages/node-integration-tests/suites/tracing/sampling-streamed/server.mjs rename to dev-packages/node-integration-tests/suites/tracing/sampling/server.mjs diff --git a/dev-packages/node-integration-tests/suites/tracing/sampling-streamed/test.ts b/dev-packages/node-integration-tests/suites/tracing/sampling/test.ts similarity index 97% rename from dev-packages/node-integration-tests/suites/tracing/sampling-streamed/test.ts rename to dev-packages/node-integration-tests/suites/tracing/sampling/test.ts index aa28c3c7723b..fbcf06a52eec 100644 --- a/dev-packages/node-integration-tests/suites/tracing/sampling-streamed/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/sampling/test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect } from 'vitest'; import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner'; -describe('negative sampling (streaming)', () => { +describe('negative sampling', () => { afterAll(() => { cleanupChildProcesses(); });