@instana/core - npm Package Compare versions

Comparing version 1.73.1 to 1.73.2

package.json

 {
   "name": "@instana/core",
-  "version": "1.73.1",
+  "version": "1.73.2",
   "description": "Core library for Instana's Node.js packages",
@@ -132,3 +132,3 @@ "main": "src/index.js",
   },
-  "gitHead": "dac81866cf06dfc551e1896a861b595e71046b7d"
+  "gitHead": "6b4489c26ce2b2ae0d0711c7f4fb016538f68fe5"
 }

src/util/applicationUnderMonitoring.js

@@ -11,38 +11,34 @@ 'use strict';
 
-exports.getMainPackageJson = function getMainPackageJson(cb) {
+exports.getMainPackageJson = function getMainPackageJson(startDirectory, cb) {
+  if (typeof startDirectory === 'function') {
+    cb = startDirectory;
+    startDirectory = null;
+  }
+
   if (parsedMainPackageJson !== undefined) {
-    process.nextTick(function() {
-      // caution: Node.js v0.12 and lower treat null as undefined
-      // when using process.nextTick(cb, null). This leads to
-      // logic differences. This needs to be kept until Node.js v0.12
-      // and Node.js v0.10 support is no longer required.
-      cb(null, parsedMainPackageJson);
-    });
+    return process.nextTick(cb, null, parsedMainPackageJson);
   }
 
-  exports.getMainPackageJsonPath(function(err, packageJsonPath) {
-    if (err) return cb(err);
+  exports.getMainPackageJsonPath(startDirectory, function(err, packageJsonPath) {
+    if (err) {
+      // fs.readFile would have called cb asynchronously later, so we use process.nextTick here to make all paths async.
+      return process.nextTick(cb, err, null);
+    }
     if (packageJsonPath == null) {
       parsedMainPackageJson = null;
-      return cb(null, null);
+      // fs.readFile would have called cb asynchronously later, so we use process.nextTick here to make all paths async.
+      return process.nextTick(cb, null, null);
     }
 
     fs.readFile(packageJsonPath, { encoding: 'utf8' }, function(readFileErr, contents) {
-      if (readFileErr) return cb(readFileErr);
+      if (readFileErr) {
+        return cb(readFileErr, null);
+      }
 
-      // JSON parsing can fail…
       try {
         parsedMainPackageJson = JSON.parse(contents);
-        // Schedule cb call in next tick to avoid calling it twice which may occur when
-        // callback is throwing exceptions.
-        process.nextTick(function() {
-          // caution: Node.js v12 and lower treat null as undefined
-          // when using process.nextTick(cb, null). This leads to
-          // logic differences. This needs to be kept until Node.js v12
-          // and Node.js v10 support is no longer required.
-          cb(null, parsedMainPackageJson);
-        });
       } catch (e) {
-        cb(e, null);
+        return cb(e, null);
       }
+      return cb(null, parsedMainPackageJson);
     });
@@ -52,38 +48,39 @@ });
 
-exports.getMainPackageJsonPath = function getMainPackageJsonPath(cb) {
+exports.getMainPackageJsonPath = function getMainPackageJsonPath(startDirectory, cb) {
+  if (typeof startDirectory === 'function') {
+    cb = startDirectory;
+    startDirectory = null;
+  }
+
   if (mainPackageJsonPath !== undefined) {
-    process.nextTick(function() {
-      // caution: Node.js v12 and lower treat null as undefined
-      // when using process.nextTick(cb, null). This leads to
-      // logic differences. This needs to be kept until Node.js v12
-      // and Node.js v10 support is no longer required.
-      cb(null, mainPackageJsonPath);
-    });
+    // searchForPackageJsonInDirectoryTreeUpwards would have called cb asynchronously later,
+    // so we use process.nextTick here to make all paths async.
+    return process.nextTick(cb, null, mainPackageJsonPath);
   }
 
-  var mainModule = process.mainModule;
-
-  // this may happen when the Node CLI is evaluating an expression or when the REPL is used
-  if (!mainModule) {
-    mainPackageJsonPath = null;
-    process.nextTick(function() {
-      // caution: Node.js v12 and lower treat null as undefined
-      // when using process.nextTick(cb, null). This leads to
-      // logic differences. This needs to be kept until Node.js v12
-      // and Node.js v10 support is no longer required.
-      cb(null, null);
-    });
-    return;
+  if (!startDirectory) {
+    // No explicit starting directory for searching for the main package.json has been provided, use the Node.js
+    // process' main module as the starting point.
+    var mainModule = process.mainModule;
+    // this may happen when the Node CLI is evaluating an expression or when the REPL is used
+    if (!mainModule) {
+      mainPackageJsonPath = null;
+      // searchForPackageJsonInDirectoryTreeUpwards would have called cb asynchronously later,
+      // so we use process.nextTick here to make all paths async.
+      return process.nextTick(cb, null, null);
+    }
+    startDirectory = path.dirname(mainModule.filename);
   }
 
-  var mainModuleFilename = mainModule.filename;
-  searchForPackageJsonInParentDirs(path.dirname(mainModuleFilename), function(err, main) {
-    if (err) return cb(err);
+  searchForPackageJsonInDirectoryTreeUpwards(startDirectory, function(err, main) {
+    if (err) {
+      return cb(err, null);
+    }
 
     mainPackageJsonPath = main;
-    cb(null, mainPackageJsonPath);
+    return cb(null, mainPackageJsonPath);
   });
 };
 
-function searchForPackageJsonInParentDirs(dir, cb) {
+function searchForPackageJsonInDirectoryTreeUpwards(dir, cb) {
   var fileToCheck = path.join(dir, 'package.json');
@@ -94,43 +91,53 @@
       if (err.code === 'ENOENT') {
-        return serchInParentDir();
+        return searchInParentDir();
+      } else {
+        // searchInParentDir would have called cb asynchronously,
+        // so we use process.nextTick here to make all paths async.
+        return process.nextTick(cb, err, null);
       }
-      return cb(err);
     }
 
-    // if it actually exists, we also need to make sure that there is a node_modules
-    // directory located next to it. This way we can be relatively certain that we did
-    // not encounter a component package.json (as used by the React community).
-    //
-    // It is highly unlikely that the application has no dependencies, because
-    // @instana/core is a dependency itself
+    // If the package.json file actually exists, we also need to make sure that there is a node_modules directory
+    // located next to it. This way we can be relatively certain that we did not encounter a component package.json
+    // (as used by the React for example). It is highly unlikely that the application has no dependencies, because
+    // @instana/core is a dependency itself.
     if (stats.isFile()) {
       var potentialNodeModulesDir = path.join(dir, 'node_modules');
-      fs.stat(potentialNodeModulesDir, function(statErr, dirStats) {
+      fs.stat(potentialNodeModulesDir, function(statErr, potentialNodeModulesDirStats) {
         if (statErr) {
           if (statErr.code === 'ENOENT') {
-            return serchInParentDir();
+            return searchInParentDir();
           }
-          return cb(statErr);
+          // searchInParentDir would have called cb asynchronously,
+          // so we use process.nextTick here to make all paths async.
+          return process.nextTick(cb, statErr, null);
         }
 
-        // great, we found a package.json which has dependencies located next to it. This
-        // should be it!
-        if (dirStats.isDirectory()) {
-          cb(null, fileToCheck);
+        if (potentialNodeModulesDirStats.isDirectory()) {
+          // We have found a package.json which has dependencies located next to it. We assume that this is the
+          // package.json file we are looking for.
+
+          // Also, searchInParentDir would have called cb asynchronously,
+          // so we use process.nextTick here to make all paths async.
+          return process.nextTick(cb, null, fileToCheck);
         } else {
-          serchInParentDir();
+          return searchInParentDir();
         }
       });
     } else {
-      serchInParentDir();
+      return searchInParentDir();
     }
   });
 
-  function serchInParentDir() {
+  function searchInParentDir() {
     // this happens when we cannot find a package.json
     var parentDir = path.resolve(dir, '..');
-    if (dir === parentDir) return cb(null, null);
+    if (dir === parentDir) {
+      // searchForPackageJsonInDirectoryTreeUpwards would have called cb asynchronously,
+      // so we use process.nextTick here to make all paths async.
+      return process.nextTick(cb, null, null);
+    }
 
-    searchForPackageJsonInParentDirs(parentDir, cb);
+    return searchForPackageJsonInDirectoryTreeUpwards(parentDir, cb);
   }
 }

src/util/index.js

 'use strict';
 
 module.exports = exports = {
+  applicationUnderMonitoring: require('./applicationUnderMonitoring'),
   atMostOnce: require('./atMostOnce'),
@@ -5,0 +6,0 @@ buffer: require('./buffer'),

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Debug access

Supply chain risk

Uses debug, reflection and dynamic code execution features.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Number of low supply chain risk alerts

15

decreased by-21.05%

Worsened metrics

Total package byte prevSize

244800

decreased by-4.56%

Number of package files

67

decreased by-17.28%

Lines of code

6890

decreased by-4.76%

No dependency changes