Skip to content

Commit 0bffaa1

Browse files
authored
always disable fs integration in serverless (#5412)
1 parent a68768f commit 0bffaa1

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

packages/datadog-instrumentations/src/helpers/hooks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = {
5050
'express-session': () => require('../express-session'),
5151
fastify: () => require('../fastify'),
5252
'find-my-way': () => require('../find-my-way'),
53-
fs: () => require('../fs'),
53+
fs: { serverless: false, fn: () => require('../fs') },
5454
'generic-pool': () => require('../generic-pool'),
5555
graphql: () => require('../graphql'),
5656
grpc: () => require('../grpc'),

packages/datadog-instrumentations/src/helpers/register.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const requirePackageJson = require('../../../dd-trace/src/require-package-json')
88
const log = require('../../../dd-trace/src/log')
99
const checkRequireCache = require('../check_require_cache')
1010
const telemetry = require('../../../dd-trace/src/guardrails/telemetry')
11+
const { isInServerlessEnvironment } = require('../../../dd-trace/src/serverless')
1112

1213
const {
1314
DD_TRACE_DISABLED_INSTRUMENTATIONS = '',
@@ -60,6 +61,8 @@ for (const packageName of names) {
6061
let hook = hooks[packageName]
6162

6263
if (typeof hook === 'object') {
64+
if (hook.serverless === false && isInServerlessEnvironment()) continue
65+
6366
hookOptions.internals = hook.esmFirst
6467
hook = hook.fn
6568
}

0 commit comments

Comments
 (0)