@sentry/node 10.58.0 → 10.60.0

package/build/cjs/index.js

@@ -38,6 +38,7 @@ const unleash = require('./integrations/featureFlagShims/unleash.js');
 const growthbook = require('./integrations/featureFlagShims/growthbook.js');
 const firebase = require('./integrations/tracing/firebase/firebase.js');
 const index$8 = require('./sdk/index.js');
+const experimentalUseDiagnosticsChannelInjection = require('./sdk/experimentalUseDiagnosticsChannelInjection.js');
 const initOtel = require('./sdk/initOtel.js');
 const index$7 = require('./integrations/tracing/index.js');
 const opentelemetry = require('@sentry/opentelemetry');
@@ -95,6 +96,7 @@ exports.getDefaultIntegrations = index$8.getDefaultIntegrations;
 exports.getDefaultIntegrationsWithoutPerformance = index$8.getDefaultIntegrationsWithoutPerformance;
 exports.init = index$8.init;
 exports.initWithoutDefaultIntegrations = index$8.initWithoutDefaultIntegrations;
+exports.experimentalUseDiagnosticsChannelInjection = experimentalUseDiagnosticsChannelInjection.experimentalUseDiagnosticsChannelInjection;
 exports.initOpenTelemetry = initOtel.initOpenTelemetry;
 exports.preloadOpenTelemetry = initOtel.preloadOpenTelemetry;
 exports.getAutoPerformanceIntegrations = index$7.getAutoPerformanceIntegrations;
@@ -108,6 +110,7 @@ exports.Scope = core.Scope;
 exports.addBreadcrumb = core.addBreadcrumb;
 exports.addEventProcessor = core.addEventProcessor;
 exports.addIntegration = core.addIntegration;
+exports.bindScopeToEmitter = core.bindScopeToEmitter;
 exports.captureCheckIn = core.captureCheckIn;
 exports.captureConsoleIntegration = core.captureConsoleIntegration;
 exports.captureEvent = core.captureEvent;

package/build/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/integrations/fs/index.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const instrumentation = require('./vendored/instrumentation.js');
 const core = require('@sentry/core');
 const nodeCore = require('@sentry/node-core');
+const instrumentation = require('./vendored/instrumentation.js');
 
 const INTEGRATION_NAME = "FileSystem";
 const fsIntegration = core.defineIntegration(
@@ -13,95 +13,14 @@ const fsIntegration = core.defineIntegration(
         nodeCore.generateInstrumentOnce(
           INTEGRATION_NAME,
           () => new instrumentation.FsInstrumentation({
-            requireParentSpan: true,
-            endHook(functionName, { args, span, error }) {
-              span.updateName(`fs.${functionName}`);
-              span.setAttributes({
-                [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: "file",
-                [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.file.fs"
-              });
-              if (options.recordErrorMessagesAsSpanAttributes) {
-                if (typeof args[0] === "string" && FS_OPERATIONS_WITH_PATH_ARG.includes(functionName)) {
-                  span.setAttribute("path_argument", args[0]);
-                } else if (typeof args[0] === "string" && typeof args[1] === "string" && FS_OPERATIONS_WITH_TARGET_PATH.includes(functionName)) {
-                  span.setAttribute("target_argument", args[0]);
-                  span.setAttribute("path_argument", args[1]);
-                } else if (typeof args[0] === "string" && FS_OPERATIONS_WITH_PREFIX.includes(functionName)) {
-                  span.setAttribute("prefix_argument", args[0]);
-                } else if (typeof args[0] === "string" && typeof args[1] === "string" && FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH.includes(functionName)) {
-                  span.setAttribute("existing_path_argument", args[0]);
-                  span.setAttribute("new_path_argument", args[1]);
-                } else if (typeof args[0] === "string" && typeof args[1] === "string" && FS_OPERATIONS_WITH_SRC_DEST.includes(functionName)) {
-                  span.setAttribute("src_argument", args[0]);
-                  span.setAttribute("dest_argument", args[1]);
-                } else if (typeof args[0] === "string" && typeof args[1] === "string" && FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH.includes(functionName)) {
-                  span.setAttribute("old_path_argument", args[0]);
-                  span.setAttribute("new_path_argument", args[1]);
-                }
-              }
-              if (error && options.recordErrorMessagesAsSpanAttributes) {
-                span.setAttribute("fs_error", error.message);
-              }
-            }
+            recordFilePaths: options.recordFilePaths,
+            recordErrorMessagesAsSpanAttributes: options.recordErrorMessagesAsSpanAttributes
           })
         )();
       }
     };
   }
 );
-const FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH = ["rename", "renameSync"];
-const FS_OPERATIONS_WITH_SRC_DEST = ["copyFile", "cp", "copyFileSync", "cpSync"];
-const FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH = ["link", "linkSync"];
-const FS_OPERATIONS_WITH_PREFIX = ["mkdtemp", "mkdtempSync"];
-const FS_OPERATIONS_WITH_TARGET_PATH = ["symlink", "symlinkSync"];
-const FS_OPERATIONS_WITH_PATH_ARG = [
-  "access",
-  "appendFile",
-  "chmod",
-  "chown",
-  "exists",
-  "mkdir",
-  "lchown",
-  "lstat",
-  "lutimes",
-  "open",
-  "opendir",
-  "readdir",
-  "readFile",
-  "readlink",
-  "realpath",
-  "realpath.native",
-  "rm",
-  "rmdir",
-  "stat",
-  "truncate",
-  "unlink",
-  "utimes",
-  "writeFile",
-  "accessSync",
-  "appendFileSync",
-  "chmodSync",
-  "chownSync",
-  "existsSync",
-  "lchownSync",
-  "lstatSync",
-  "lutimesSync",
-  "opendirSync",
-  "mkdirSync",
-  "openSync",
-  "readdirSync",
-  "readFileSync",
-  "readlinkSync",
-  "realpathSync",
-  "realpathSync.native",
-  "rmdirSync",
-  "rmSync",
-  "statSync",
-  "truncateSync",
-  "unlinkSync",
-  "utimesSync",
-  "writeFileSync"
-];
 
 exports.fsIntegration = fsIntegration;
 //# sourceMappingURL=index.js.map

package/build/cjs/integrations/fs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/integrations/fs/index.ts"],"sourcesContent":["import { FsInstrumentation } from './vendored/instrumentation';\nimport { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\n\nconst INTEGRATION_NAME = 'FileSystem';\n\n/**\n * This integration will create spans for `fs` API operations, like reading and writing files.\n *\n * **WARNING:** This integration may add significant overhead to your application. Especially in scenarios with a lot of\n * file I/O, like for example when running a framework dev server, including this integration can massively slow down\n * your application.\n *\n * @param options Configuration for this integration.\n */\nexport const fsIntegration = defineIntegration(\n  (\n    options: {\n      /**\n       * Setting this option to `true` will include any filepath arguments from your `fs` API calls as span attributes.\n       *\n       * Defaults to `false`.\n       */\n      recordFilePaths?: boolean;\n\n      /**\n       * Setting this option to `true` will include the error messages of failed `fs` API calls as a span attribute.\n       *\n       * Defaults to `false`.\n       */\n      recordErrorMessagesAsSpanAttributes?: boolean;\n    } = {},\n  ) => {\n    return {\n      name: INTEGRATION_NAME,\n      setupOnce() {\n        generateInstrumentOnce(\n          INTEGRATION_NAME,\n          () =>\n            new FsInstrumentation({\n              requireParentSpan: true,\n              endHook(functionName, { args, span, error }) {\n                span.updateName(`fs.${functionName}`);\n\n                span.setAttributes({\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'file',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.file.fs',\n                });\n\n                if (options.recordErrorMessagesAsSpanAttributes) {\n                  if (typeof args[0] === 'string' && FS_OPERATIONS_WITH_PATH_ARG.includes(functionName)) {\n                    span.setAttribute('path_argument', args[0]);\n                  } else if (\n                    typeof args[0] === 'string' &&\n                    typeof args[1] === 'string' &&\n                    FS_OPERATIONS_WITH_TARGET_PATH.includes(functionName)\n                  ) {\n                    span.setAttribute('target_argument', args[0]);\n                    span.setAttribute('path_argument', args[1]);\n                  } else if (typeof args[0] === 'string' && FS_OPERATIONS_WITH_PREFIX.includes(functionName)) {\n                    span.setAttribute('prefix_argument', args[0]);\n                  } else if (\n                    typeof args[0] === 'string' &&\n                    typeof args[1] === 'string' &&\n                    FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH.includes(functionName)\n                  ) {\n                    span.setAttribute('existing_path_argument', args[0]);\n                    span.setAttribute('new_path_argument', args[1]);\n                  } else if (\n                    typeof args[0] === 'string' &&\n                    typeof args[1] === 'string' &&\n                    FS_OPERATIONS_WITH_SRC_DEST.includes(functionName)\n                  ) {\n                    span.setAttribute('src_argument', args[0]);\n                    span.setAttribute('dest_argument', args[1]);\n                  } else if (\n                    typeof args[0] === 'string' &&\n                    typeof args[1] === 'string' &&\n                    FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH.includes(functionName)\n                  ) {\n                    span.setAttribute('old_path_argument', args[0]);\n                    span.setAttribute('new_path_argument', args[1]);\n                  }\n                }\n\n                if (error && options.recordErrorMessagesAsSpanAttributes) {\n                  span.setAttribute('fs_error', error.message);\n                }\n              },\n            }),\n        )();\n      },\n    };\n  },\n);\n\nconst FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH = ['rename', 'renameSync'];\nconst FS_OPERATIONS_WITH_SRC_DEST = ['copyFile', 'cp', 'copyFileSync', 'cpSync'];\nconst FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH = ['link', 'linkSync'];\nconst FS_OPERATIONS_WITH_PREFIX = ['mkdtemp', 'mkdtempSync'];\nconst FS_OPERATIONS_WITH_TARGET_PATH = ['symlink', 'symlinkSync'];\nconst FS_OPERATIONS_WITH_PATH_ARG = [\n  'access',\n  'appendFile',\n  'chmod',\n  'chown',\n  'exists',\n  'mkdir',\n  'lchown',\n  'lstat',\n  'lutimes',\n  'open',\n  'opendir',\n  'readdir',\n  'readFile',\n  'readlink',\n  'realpath',\n  'realpath.native',\n  'rm',\n  'rmdir',\n  'stat',\n  'truncate',\n  'unlink',\n  'utimes',\n  'writeFile',\n  'accessSync',\n  'appendFileSync',\n  'chmodSync',\n  'chownSync',\n  'existsSync',\n  'lchownSync',\n  'lstatSync',\n  'lutimesSync',\n  'opendirSync',\n  'mkdirSync',\n  'openSync',\n  'readdirSync',\n  'readFileSync',\n  'readlinkSync',\n  'realpathSync',\n  'realpathSync.native',\n  'rmdirSync',\n  'rmSync',\n  'statSync',\n  'truncateSync',\n  'unlinkSync',\n  'utimesSync',\n  'writeFileSync',\n];\n"],"names":["defineIntegration","generateInstrumentOnce","FsInstrumentation","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/integrations/fs/index.ts"],"sourcesContent":["import { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\nimport { FsInstrumentation } from './vendored/instrumentation';\n\nconst INTEGRATION_NAME = 'FileSystem';\n\n/**\n * This integration will create spans for `fs` API operations, like reading and writing files.\n *\n * **WARNING:** This integration may add significant overhead to your application. Especially in scenarios with a lot of\n * file I/O, like for example when running a framework dev server, including this integration can massively slow down\n * your application.\n *\n * @param options Configuration for this integration.\n */\nexport const fsIntegration = defineIntegration(\n  (\n    options: {\n      /**\n       * Setting this option to `true` will include any filepath arguments from your `fs` API calls as span attributes.\n       *\n       * Defaults to `false`.\n       */\n      recordFilePaths?: boolean;\n\n      /**\n       * Setting this option to `true` will include the error messages of failed `fs` API calls as a span attribute.\n       *\n       * Defaults to `false`.\n       */\n      recordErrorMessagesAsSpanAttributes?: boolean;\n    } = {},\n  ) => {\n    return {\n      name: INTEGRATION_NAME,\n      setupOnce() {\n        generateInstrumentOnce(\n          INTEGRATION_NAME,\n          () =>\n            new FsInstrumentation({\n              recordFilePaths: options.recordFilePaths,\n              recordErrorMessagesAsSpanAttributes: options.recordErrorMessagesAsSpanAttributes,\n            }),\n        )();\n      },\n    };\n  },\n);\n"],"names":["defineIntegration","generateInstrumentOnce","FsInstrumentation"],"mappings":";;;;;;AAIA,MAAM,gBAAA,GAAmB,YAAA;AAWlB,MAAM,aAAA,GAAgBA,sBAAA;AAAA,EAC3B,CACE,OAAA,GAcI,EAAC,KACF;AACH,IAAA,OAAO;AAAA,MACL,IAAA,EAAM,gBAAA;AAAA,MACN,SAAA,GAAY;AACV,QAAAC,+BAAA;AAAA,UACE,gBAAA;AAAA,UACA,MACE,IAAIC,iCAAA,CAAkB;AAAA,YACpB,iBAAiB,OAAA,CAAQ,eAAA;AAAA,YACzB,qCAAqC,OAAA,CAAQ;AAAA,WAC9C;AAAA,SACL,EAAE;AAAA,MACJ;AAAA,KACF;AAAA,EACF;AACF;;;;"}

package/build/cjs/integrations/fs/vendored/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sources":["../../../../../src/integrations/fs/vendored/constants.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-fs\n * - Upstream version: @opentelemetry/instrumentation-fs@0.37.0\n */\n/* eslint-disable */\n\nimport type { FMember, FPMember } from './types';\n\nexport const PROMISE_FUNCTIONS: FPMember[] = [\n  'access',\n  'appendFile',\n  'chmod',\n  'chown',\n  'copyFile',\n  'cp' as FPMember, // added in v16\n  'lchown',\n  'link',\n  'lstat',\n  'lutimes', // added in v12\n  'mkdir',\n  'mkdtemp',\n  'open',\n  'opendir', // added in v12\n  'readdir',\n  'readFile',\n  'readlink',\n  'realpath',\n  'rename',\n  'rm', // added in v14\n  'rmdir',\n  'stat',\n  'symlink',\n  'truncate',\n  'unlink',\n  'utimes',\n  'writeFile',\n  // 'lchmod', // only implemented on macOS\n];\n\nexport const CALLBACK_FUNCTIONS: FMember[] = [\n  'access',\n  'appendFile',\n  'chmod',\n  'chown',\n  'copyFile',\n  'cp' as FMember, // added in v16\n  'exists', // deprecated, inconsistent cb signature, handling separately when patching\n  'lchown',\n  'link',\n  'lstat',\n  'lutimes', // added in v12\n  'mkdir',\n  'mkdtemp',\n  'open',\n  'opendir', // added in v12\n  'readdir',\n  'readFile',\n  'readlink',\n  'realpath',\n  'realpath.native',\n  'rename',\n  'rm', // added in v14\n  'rmdir',\n  'stat',\n  'symlink',\n  'truncate',\n  'unlink',\n  'utimes',\n  'writeFile',\n  // 'close', // functions on file descriptor\n  // 'fchmod', // functions on file descriptor\n  // 'fchown', // functions on file descriptor\n  // 'fdatasync', // functions on file descriptor\n  // 'fstat', // functions on file descriptor\n  // 'fsync', // functions on file descriptor\n  // 'ftruncate', // functions on file descriptor\n  // 'futimes', // functions on file descriptor\n  // 'lchmod', // only implemented on macOS\n  // 'read', // functions on file descriptor\n  // 'readv', // functions on file descriptor\n  // 'write', // functions on file descriptor\n  // 'writev', // functions on file descriptor\n];\n\nexport const SYNC_FUNCTIONS: FMember[] = [\n  'accessSync',\n  'appendFileSync',\n  'chmodSync',\n  'chownSync',\n  'copyFileSync',\n  'cpSync' as FMember, // added in v16\n  'existsSync',\n  'lchownSync',\n  'linkSync',\n  'lstatSync',\n  'lutimesSync', // added in v12\n  'mkdirSync',\n  'mkdtempSync',\n  'opendirSync', // added in v12\n  'openSync',\n  'readdirSync',\n  'readFileSync',\n  'readlinkSync',\n  'realpathSync',\n  'realpathSync.native',\n  'renameSync',\n  'rmdirSync',\n  'rmSync', // added in v14\n  'statSync',\n  'symlinkSync',\n  'truncateSync',\n  'unlinkSync',\n  'utimesSync',\n  'writeFileSync',\n  // 'closeSync', // functions on file descriptor\n  // 'fchmodSync', // functions on file descriptor\n  // 'fchownSync', // functions on file descriptor\n  // 'fdatasyncSync', // functions on file descriptor\n  // 'fstatSync', // functions on file descriptor\n  // 'fsyncSync', // functions on file descriptor\n  // 'ftruncateSync', // functions on file descriptor\n  // 'futimesSync', // functions on file descriptor\n  // 'lchmodSync', // only implemented on macOS\n  // 'readSync', // functions on file descriptor\n  // 'readvSync', // functions on file descriptor\n  // 'writeSync', // functions on file descriptor\n  // 'writevSync', // functions on file descriptor\n];\n"],"names":[],"mappings":";;AAuBO,MAAM,iBAAA,GAAgC;AAAA,EAC3C,QAAA;AAAA,EACA,YAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,UAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EACA;AAAA;AAEF;AAEO,MAAM,kBAAA,GAAgC;AAAA,EAC3C,QAAA;AAAA,EACA,YAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,UAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,iBAAA;AAAA,EACA,QAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAcF;AAEO,MAAM,cAAA,GAA4B;AAAA,EACvC,YAAA;AAAA,EACA,gBAAA;AAAA,EACA,WAAA;AAAA,EACA,WAAA;AAAA,EACA,cAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA,UAAA;AAAA,EACA,WAAA;AAAA,EACA,aAAA;AAAA;AAAA,EACA,WAAA;AAAA,EACA,aAAA;AAAA,EACA,aAAA;AAAA;AAAA,EACA,UAAA;AAAA,EACA,aAAA;AAAA,EACA,cAAA;AAAA,EACA,cAAA;AAAA,EACA,cAAA;AAAA,EACA,qBAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,UAAA;AAAA,EACA,aAAA;AAAA,EACA,cAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAcF;;;;;;"}
+{"version":3,"file":"constants.js","sources":["../../../../../src/integrations/fs/vendored/constants.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-fs\n * - Upstream version: @opentelemetry/instrumentation-fs@0.37.0\n */\n\nimport type { FMember, FPMember } from './types';\n\nexport const PROMISE_FUNCTIONS: FPMember[] = [\n  'access',\n  'appendFile',\n  'chmod',\n  'chown',\n  'copyFile',\n  'cp' as FPMember, // added in v16\n  'lchown',\n  'link',\n  'lstat',\n  'lutimes', // added in v12\n  'mkdir',\n  'mkdtemp',\n  'open',\n  'opendir', // added in v12\n  'readdir',\n  'readFile',\n  'readlink',\n  'realpath',\n  'rename',\n  'rm', // added in v14\n  'rmdir',\n  'stat',\n  'symlink',\n  'truncate',\n  'unlink',\n  'utimes',\n  'writeFile',\n  // 'lchmod', // only implemented on macOS\n];\n\nexport const CALLBACK_FUNCTIONS: FMember[] = [\n  'access',\n  'appendFile',\n  'chmod',\n  'chown',\n  'copyFile',\n  'cp' as FMember, // added in v16\n  'exists', // deprecated, inconsistent cb signature, handling separately when patching\n  'lchown',\n  'link',\n  'lstat',\n  'lutimes', // added in v12\n  'mkdir',\n  'mkdtemp',\n  'open',\n  'opendir', // added in v12\n  'readdir',\n  'readFile',\n  'readlink',\n  'realpath',\n  'realpath.native',\n  'rename',\n  'rm', // added in v14\n  'rmdir',\n  'stat',\n  'symlink',\n  'truncate',\n  'unlink',\n  'utimes',\n  'writeFile',\n  // 'close', // functions on file descriptor\n  // 'fchmod', // functions on file descriptor\n  // 'fchown', // functions on file descriptor\n  // 'fdatasync', // functions on file descriptor\n  // 'fstat', // functions on file descriptor\n  // 'fsync', // functions on file descriptor\n  // 'ftruncate', // functions on file descriptor\n  // 'futimes', // functions on file descriptor\n  // 'lchmod', // only implemented on macOS\n  // 'read', // functions on file descriptor\n  // 'readv', // functions on file descriptor\n  // 'write', // functions on file descriptor\n  // 'writev', // functions on file descriptor\n];\n\nexport const SYNC_FUNCTIONS: FMember[] = [\n  'accessSync',\n  'appendFileSync',\n  'chmodSync',\n  'chownSync',\n  'copyFileSync',\n  'cpSync' as FMember, // added in v16\n  'existsSync',\n  'lchownSync',\n  'linkSync',\n  'lstatSync',\n  'lutimesSync', // added in v12\n  'mkdirSync',\n  'mkdtempSync',\n  'opendirSync', // added in v12\n  'openSync',\n  'readdirSync',\n  'readFileSync',\n  'readlinkSync',\n  'realpathSync',\n  'realpathSync.native',\n  'renameSync',\n  'rmdirSync',\n  'rmSync', // added in v14\n  'statSync',\n  'symlinkSync',\n  'truncateSync',\n  'unlinkSync',\n  'utimesSync',\n  'writeFileSync',\n  // 'closeSync', // functions on file descriptor\n  // 'fchmodSync', // functions on file descriptor\n  // 'fchownSync', // functions on file descriptor\n  // 'fdatasyncSync', // functions on file descriptor\n  // 'fstatSync', // functions on file descriptor\n  // 'fsyncSync', // functions on file descriptor\n  // 'ftruncateSync', // functions on file descriptor\n  // 'futimesSync', // functions on file descriptor\n  // 'lchmodSync', // only implemented on macOS\n  // 'readSync', // functions on file descriptor\n  // 'readvSync', // functions on file descriptor\n  // 'writeSync', // functions on file descriptor\n  // 'writevSync', // functions on file descriptor\n];\n"],"names":[],"mappings":";;AAWO,MAAM,iBAAA,GAAgC;AAAA,EAC3C,QAAA;AAAA,EACA,YAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,UAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EACA;AAAA;AAEF;AAEO,MAAM,kBAAA,GAAgC;AAAA,EAC3C,QAAA;AAAA,EACA,YAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,UAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,QAAA;AAAA,EACA,MAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,SAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,UAAA;AAAA,EACA,iBAAA;AAAA,EACA,QAAA;AAAA,EACA,IAAA;AAAA;AAAA,EACA,OAAA;AAAA,EACA,MAAA;AAAA,EACA,SAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAcF;AAEO,MAAM,cAAA,GAA4B;AAAA,EACvC,YAAA;AAAA,EACA,gBAAA;AAAA,EACA,WAAA;AAAA,EACA,WAAA;AAAA,EACA,cAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA,UAAA;AAAA,EACA,WAAA;AAAA,EACA,aAAA;AAAA;AAAA,EACA,WAAA;AAAA,EACA,aAAA;AAAA,EACA,aAAA;AAAA;AAAA,EACA,UAAA;AAAA,EACA,aAAA;AAAA,EACA,cAAA;AAAA,EACA,cAAA;AAAA,EACA,cAAA;AAAA,EACA,qBAAA;AAAA,EACA,YAAA;AAAA,EACA,WAAA;AAAA,EACA,QAAA;AAAA;AAAA,EACA,UAAA;AAAA,EACA,aAAA;AAAA,EACA,cAAA;AAAA,EACA,YAAA;AAAA,EACA,YAAA;AAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAcF;;;;;;"}

package/build/cjs/integrations/fs/vendored/instrumentation.js

@@ -1,14 +1,97 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const api = require('@opentelemetry/api');
-const core$1 = require('@opentelemetry/core');
 const instrumentation = require('@opentelemetry/instrumentation');
 const core = require('@sentry/core');
-const constants = require('./constants.js');
 const util = require('util');
+const constants = require('./constants.js');
 const utils = require('./utils.js');
 
 const PACKAGE_NAME = "@sentry/instrumentation-fs";
+const SPAN_ORIGIN = "auto.file.fs";
+const SPAN_OP = "file";
+const FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH = ["rename", "renameSync"];
+const FS_OPERATIONS_WITH_SRC_DEST = ["copyFile", "cp", "copyFileSync", "cpSync"];
+const FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH = ["link", "linkSync"];
+const FS_OPERATIONS_WITH_PREFIX = ["mkdtemp", "mkdtempSync"];
+const FS_OPERATIONS_WITH_TARGET_PATH = ["symlink", "symlinkSync"];
+const FS_OPERATIONS_WITH_PATH_ARG = [
+  "access",
+  "appendFile",
+  "chmod",
+  "chown",
+  "exists",
+  "mkdir",
+  "lchown",
+  "lstat",
+  "lutimes",
+  "open",
+  "opendir",
+  "readdir",
+  "readFile",
+  "readlink",
+  "realpath",
+  "realpath.native",
+  "rm",
+  "rmdir",
+  "stat",
+  "truncate",
+  "unlink",
+  "utimes",
+  "writeFile",
+  "accessSync",
+  "appendFileSync",
+  "chmodSync",
+  "chownSync",
+  "existsSync",
+  "lchownSync",
+  "lstatSync",
+  "lutimesSync",
+  "opendirSync",
+  "mkdirSync",
+  "openSync",
+  "readdirSync",
+  "readFileSync",
+  "readlinkSync",
+  "realpathSync",
+  "realpathSync.native",
+  "rmdirSync",
+  "rmSync",
+  "statSync",
+  "truncateSync",
+  "unlinkSync",
+  "utimesSync",
+  "writeFileSync"
+];
+function getSpanAttributes(functionName, args, config) {
+  const attributes = {
+    [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: SPAN_OP,
+    [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: SPAN_ORIGIN
+  };
+  if (!config.recordFilePaths) {
+    return attributes;
+  }
+  if (typeof args[0] === "string" && FS_OPERATIONS_WITH_PATH_ARG.includes(functionName)) {
+    attributes["path_argument"] = args[0];
+  } else if (typeof args[0] === "string" && typeof args[1] === "string") {
+    if (FS_OPERATIONS_WITH_TARGET_PATH.includes(functionName)) {
+      attributes["target_argument"] = args[0];
+      attributes["path_argument"] = args[1];
+    } else if (FS_OPERATIONS_WITH_EXISTING_PATH_NEW_PATH.includes(functionName)) {
+      attributes["existing_path_argument"] = args[0];
+      attributes["new_path_argument"] = args[1];
+    } else if (FS_OPERATIONS_WITH_SRC_DEST.includes(functionName)) {
+      attributes["src_argument"] = args[0];
+      attributes["dest_argument"] = args[1];
+    } else if (FS_OPERATIONS_WITH_OLD_PATH_NEW_PATH.includes(functionName)) {
+      attributes["old_path_argument"] = args[0];
+      attributes["new_path_argument"] = args[1];
+    }
+  } else if (typeof args[0] === "string" && FS_OPERATIONS_WITH_PREFIX.includes(functionName)) {
+    attributes["prefix_argument"] = args[0];
+  }
+  return attributes;
+}
 function patchedFunctionWithOriginalProperties(patchedFunction, original) {
   return Object.assign(patchedFunction, original);
 }
@@ -35,11 +118,7 @@ class FsInstrumentation extends instrumentation.InstrumentationBase {
               this._unwrap(objectToPatch, functionNameToPatch);
             }
             if (fName === "exists") {
-              this._wrap(
-                objectToPatch,
-                functionNameToPatch,
-                this._patchExistsCallbackFunction.bind(this, fName)
-              );
+              this._wrap(objectToPatch, functionNameToPatch, this._patchExistsCallbackFunction.bind(this, fName));
               continue;
             }
             this._wrap(objectToPatch, functionNameToPatch, this._patchCallbackFunction.bind(this, fName));
@@ -99,131 +178,70 @@ class FsInstrumentation extends instrumentation.InstrumentationBase {
   _patchSyncFunction(functionName, original) {
     const instrumentation = this;
     const patchedFunction = function(...args) {
-      const activeContext = api.context.active();
-      if (!instrumentation._shouldTrace(activeContext)) {
-        return original.apply(this, args);
-      }
-      if (instrumentation._runCreateHook(functionName, {
-        args
-      }) === false) {
-        return api.context.with(core$1.suppressTracing(activeContext), original, this, ...args);
-      }
-      const span = instrumentation.tracer.startSpan(`fs ${functionName}`);
-      try {
-        const res = api.context.with(core$1.suppressTracing(api.trace.setSpan(activeContext, span)), original, this, ...args);
-        instrumentation._runEndHook(functionName, { args, span });
-        return res;
-      } catch (error) {
-        span.recordException(error);
-        span.setStatus({
-          message: error.message,
-          code: api.SpanStatusCode.ERROR
-        });
-        instrumentation._runEndHook(functionName, { args, span, error });
-        throw error;
-      } finally {
-        span.end();
-      }
+      const config = instrumentation.getConfig();
+      const attributes = getSpanAttributes(functionName, args, config);
+      return core.startSpan({ name: `fs.${functionName}`, onlyIfParent: true, attributes }, (span) => {
+        try {
+          return core.suppressTracing(() => original.apply(this, args));
+        } catch (error) {
+          recordError(span, error, config);
+          throw error;
+        }
+      });
     };
     return patchedFunctionWithOriginalProperties(patchedFunction, original);
   }
   _patchCallbackFunction(functionName, original) {
     const instrumentation = this;
     const patchedFunction = function(...args) {
-      const activeContext = api.context.active();
-      if (!instrumentation._shouldTrace(activeContext)) {
-        return original.apply(this, args);
-      }
-      if (instrumentation._runCreateHook(functionName, {
-        args
-      }) === false) {
-        return api.context.with(core$1.suppressTracing(activeContext), original, this, ...args);
-      }
+      const config = instrumentation.getConfig();
       const lastIdx = args.length - 1;
       const cb = args[lastIdx];
-      if (typeof cb === "function") {
-        const span = instrumentation.tracer.startSpan(`fs ${functionName}`);
-        args[lastIdx] = api.context.bind(activeContext, function(error) {
-          if (error) {
-            span.recordException(error);
-            span.setStatus({
-              message: error.message,
-              code: api.SpanStatusCode.ERROR
-            });
-          }
-          instrumentation._runEndHook(functionName, {
-            args,
-            span,
-            error
-          });
-          span.end();
-          return cb.apply(this, arguments);
-        });
-        try {
-          return api.context.with(core$1.suppressTracing(api.trace.setSpan(activeContext, span)), original, this, ...args);
-        } catch (error) {
-          span.recordException(error);
-          span.setStatus({
-            message: error.message,
-            code: api.SpanStatusCode.ERROR
-          });
-          instrumentation._runEndHook(functionName, {
-            args,
-            span,
-            error
-          });
-          span.end();
-          throw error;
-        }
-      } else {
+      if (typeof cb !== "function") {
         return original.apply(this, args);
       }
+      const attributes = getSpanAttributes(functionName, args, config);
+      const span = core.startInactiveSpan({ name: `fs.${functionName}`, onlyIfParent: true, attributes });
+      args[lastIdx] = api.context.bind(api.context.active(), function(...cbArgs) {
+        const error = cbArgs[0];
+        if (error) {
+          recordError(span, error, config);
+        }
+        span.end();
+        return cb.apply(this, cbArgs);
+      });
+      try {
+        return core.suppressTracing(() => original.apply(this, args));
+      } catch (error) {
+        recordError(span, error, config);
+        span.end();
+        throw error;
+      }
     };
     return patchedFunctionWithOriginalProperties(patchedFunction, original);
   }
   _patchExistsCallbackFunction(functionName, original) {
     const instrumentation = this;
     const patchedFunction = function(...args) {
-      const activeContext = api.context.active();
-      if (!instrumentation._shouldTrace(activeContext)) {
-        return original.apply(this, args);
-      }
-      if (instrumentation._runCreateHook(functionName, {
-        args
-      }) === false) {
-        return api.context.with(core$1.suppressTracing(activeContext), original, this, ...args);
-      }
+      const config = instrumentation.getConfig();
       const lastIdx = args.length - 1;
       const cb = args[lastIdx];
-      if (typeof cb === "function") {
-        const span = instrumentation.tracer.startSpan(`fs ${functionName}`);
-        args[lastIdx] = api.context.bind(activeContext, function() {
-          instrumentation._runEndHook(functionName, {
-            args,
-            span
-          });
-          span.end();
-          return cb.apply(this, arguments);
-        });
-        try {
-          return api.context.with(core$1.suppressTracing(api.trace.setSpan(activeContext, span)), original, this, ...args);
-        } catch (error) {
-          span.recordException(error);
-          span.setStatus({
-            message: error.message,
-            code: api.SpanStatusCode.ERROR
-          });
-          instrumentation._runEndHook(functionName, {
-            args,
-            span,
-            error
-          });
-          span.end();
-          throw error;
-        }
-      } else {
+      if (typeof cb !== "function") {
         return original.apply(this, args);
       }
+      const attributes = getSpanAttributes(functionName, args, config);
+      const span = core.startInactiveSpan({ name: `fs.${functionName}`, onlyIfParent: true, attributes });
+      args[lastIdx] = api.context.bind(api.context.active(), function(...cbArgs) {
+        span.end();
+        return cb.apply(this, cbArgs);
+      });
+      try {
+        return core.suppressTracing(() => original.apply(this, args));
+      } catch (error) {
+        recordError(span, error, config);
+        span.end();
+        throw error;
+      }
     };
     const functionWithOriginalProperties = patchedFunctionWithOriginalProperties(patchedFunction, original);
     const promisified = function(path) {
@@ -238,72 +256,24 @@ class FsInstrumentation extends instrumentation.InstrumentationBase {
   _patchPromiseFunction(functionName, original) {
     const instrumentation = this;
     const patchedFunction = async function(...args) {
-      const activeContext = api.context.active();
-      if (!instrumentation._shouldTrace(activeContext)) {
-        return original.apply(this, args);
-      }
-      if (instrumentation._runCreateHook(functionName, {
-        args
-      }) === false) {
-        return api.context.with(core$1.suppressTracing(activeContext), original, this, ...args);
-      }
-      const span = instrumentation.tracer.startSpan(`fs ${functionName}`);
-      try {
-        const res = await api.context.with(
-          core$1.suppressTracing(api.trace.setSpan(activeContext, span)),
-          original,
-          this,
-          ...args
-        );
-        instrumentation._runEndHook(functionName, { args, span });
-        return res;
-      } catch (error) {
-        span.recordException(error);
-        span.setStatus({
-          message: error.message,
-          code: api.SpanStatusCode.ERROR
-        });
-        instrumentation._runEndHook(functionName, { args, span, error });
-        throw error;
-      } finally {
-        span.end();
-      }
+      const config = instrumentation.getConfig();
+      const attributes = getSpanAttributes(functionName, args, config);
+      return core.startSpan({ name: `fs.${functionName}`, onlyIfParent: true, attributes }, async (span) => {
+        try {
+          return await core.suppressTracing(() => original.apply(this, args));
+        } catch (error) {
+          recordError(span, error, config);
+          throw error;
+        }
+      });
     };
     return patchedFunctionWithOriginalProperties(patchedFunction, original);
   }
-  _runCreateHook(...args) {
-    const { createHook } = this.getConfig();
-    if (typeof createHook === "function") {
-      try {
-        return createHook(...args);
-      } catch (e) {
-        this._diag.error("caught createHook error", e);
-      }
-    }
-    return true;
-  }
-  _runEndHook(...args) {
-    const { endHook } = this.getConfig();
-    if (typeof endHook === "function") {
-      try {
-        endHook(...args);
-      } catch (e) {
-        this._diag.error("caught endHook error", e);
-      }
-    }
-  }
-  _shouldTrace(context) {
-    if (core$1.isTracingSuppressed(context)) {
-      return false;
-    }
-    const { requireParentSpan } = this.getConfig();
-    if (requireParentSpan) {
-      const parentSpan = api.trace.getSpan(context);
-      if (parentSpan == null) {
-        return false;
-      }
-    }
-    return true;
+}
+function recordError(span, error, config) {
+  span.setStatus({ code: core.SPAN_STATUS_ERROR, message: "internal_error" });
+  if (config.recordErrorMessagesAsSpanAttributes && error instanceof Error) {
+    span.setAttribute("fs_error", error.message);
   }
 }