diff --git a/CHANGELOG.md b/CHANGELOG.md index 39ca8cb79060..38fd95259776 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Work in this release was contributed by @psh4607, @thijsw, @trinitiwowka, @nehap - `DenoMysql` => `Mysql` - `DenoPostgres` => `Postgres` - feat(node): Add first-party Mastra integration ([#23823](https://github.com/getsentry/sentry-javascript/pull/23823)). Enabled by default; disable with `defaultIntegrations: integrations => integrations.filter(i => i.name !== 'Mastra')`. +- feat(node): Enable the `dataloader` and `knex` integrations by default. Both were previously opt-in — `dataloader` was removed from the defaults in v8 due to an upstream OpenTelemetry bug that has since been fixed, and `knex` was never enabled by default. You no longer need to add `dataloaderIntegration()` or `knexIntegration()` manually. Disable either with `defaultIntegrations: integrations => integrations.filter(i => i.name !== 'Dataloader' /* or 'Knex' */)`. - **feat(browser): Add `bfcacheMetricsIntegration` to track back/forward cache health** The new opt-in `bfcacheMetricsIntegration` emits metrics about browser back/forward cache (bfcache) navigations, so you can diff --git a/dev-packages/node-integration-tests/suites/tracing/dataloader/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/dataloader/instrument.mjs index 25a9dbb0c127..22bf57f14364 100644 --- a/dev-packages/node-integration-tests/suites/tracing/dataloader/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/dataloader/instrument.mjs @@ -7,5 +7,4 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - integrations: [Sentry.dataloaderIntegration()], }); diff --git a/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument-span-streaming.mjs b/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument-span-streaming.mjs index a7b5194fba83..53b9511a21f0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument-span-streaming.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument-span-streaming.mjs @@ -6,6 +6,5 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - integrations: [Sentry.knexIntegration()], traceLifecycle: 'stream', }); diff --git a/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument.mjs index d474bd31690d..170ad6f6a702 100644 --- a/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/knex/mysql2/instrument.mjs @@ -7,5 +7,4 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - integrations: [Sentry.knexIntegration()], }); diff --git a/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument-span-streaming.mjs b/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument-span-streaming.mjs index a7b5194fba83..53b9511a21f0 100644 --- a/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument-span-streaming.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument-span-streaming.mjs @@ -6,6 +6,5 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - integrations: [Sentry.knexIntegration()], traceLifecycle: 'stream', }); diff --git a/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument.mjs index d474bd31690d..170ad6f6a702 100644 --- a/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument.mjs +++ b/dev-packages/node-integration-tests/suites/tracing/knex/pg/instrument.mjs @@ -7,5 +7,4 @@ Sentry.init({ release: '1.0', tracesSampleRate: 1.0, transport: loggingTransport, - integrations: [Sentry.knexIntegration()], }); diff --git a/packages/server-utils/src/integrations/index.ts b/packages/server-utils/src/integrations/index.ts index 849a873cb1e3..89386654397d 100644 --- a/packages/server-utils/src/integrations/index.ts +++ b/packages/server-utils/src/integrations/index.ts @@ -1,4 +1,6 @@ import { amqplibIntegration } from './amqplib'; +import { dataloaderIntegration } from './dataloader'; +import { knexIntegration } from './knex'; import { mongoIntegration } from './mongodb'; import { graphqlIntegration } from './graphql'; import { redisIntegration } from './redis'; @@ -39,10 +41,12 @@ export function getTracingIntegrations(): Integration[] { postgresIntegration(), prismaIntegration(), tediousIntegration(), + knexIntegration(), genericPoolIntegration(), kafkaIntegration(), amqplibIntegration(), lruMemoizerIntegration(), + dataloaderIntegration(), awsIntegration(), // AI providers // LangChain must come first to disable AI provider integrations before they instrument