Skip to content

test(node): Port express error-handling suites to span streaming #24191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chargome wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −25
Draft

test(node): Port express error-handling suites to span streaming #24191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/handle-error/instrument-no-tracing.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/handle-error/instrument-sample-rate-0.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion ...ges/node-integration-tests/suites/express/handle-error/instrument-setup-error-handler.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { loggingTransport } from '@sentry-internal/node-integration-tests';
// middleware is the sole error capturer (mechanism `auto.middleware.express`) — the fallback for
// setups where the channel-based auto capture is unavailable.
Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
Expand Down
1 change: 0 additions & 1 deletion ...ges/node-integration-tests/suites/express/handle-error/instrument-should-handle-error.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/handle-error/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
tracesSampleRate: 1,
Expand Down
23 changes: 11 additions & 12 deletions dev-packages/node-integration-tests/suites/express/handle-error/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ describe('express error handling', () => {
const runner = createRunner()
.unordered()
.expect({
transaction: {
transaction: 'GET /test/express/:id',
contexts: {
trace: {
op: 'http.server',
status: 'internal_error',
data: expect.objectContaining({
'http.response.status_code': 500,
}),
},
},
span: container => {
expect(container.items.find(item => item.is_segment)).toMatchObject({
name: 'GET /test/express/:id',
status: 'error',
attributes: expect.objectContaining({
'sentry.op': { type: 'string', value: 'http.server' },
'sentry.status.message': { type: 'string', value: 'internal_error' },
'http.response.status_code': { type: 'integer', value: 500 },
}),
});
},
})
.expect({
Expand Down Expand Up @@ -99,7 +98,7 @@ describe('express error handling', () => {
createCjsTests(__dirname, 'scenario.mjs', 'instrument-no-tracing.mjs', (createRunner, test) => {
test('should capture and send Express controller error if tracesSampleRate is not set.', async () => {
const runner = createRunner()
.ignore('transaction')
.ignore('span')
.expect({
event: {
exception: {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/multiple-init/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
traceLifecycle: 'static',
// No dsn, means client is disabled
// dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/multiple-init/scenario.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ app.get('/test/no-init', (_req, res) => {
app.get('/test/init', (_req, res) => {
// Call init again, but with DSN
Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/requestUser/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/sentry-trace/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
environment: 'prod',
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/tracing/withError/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
// disable attaching headers to /test/* endpoints
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/node-integration-tests/suites/express/tracing/withError/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('express tracing with error', () => {
createCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
test('should apply the scope transactionName to error events', async () => {
const runner = createRunner()
.ignore('transaction')
.ignore('span')
.expect({
event: {
exception: {
Expand All @@ -29,7 +29,7 @@ describe('express tracing with error', () => {

test('preserves encoded query parameters while filtering sensitive values on events', async () => {
const runner = createRunner()
.ignore('transaction')
.ignore('span')
.expect({
event: {
request: {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/express/without-tracing/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading