@instana/shared-metrics 3.1.2 → 3.2.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.2.0](https://github.com/instana/nodejs/compare/v3.1.3...v3.2.0) (2024-02-27)
+
+### Bug Fixes
+
+- depreacted request-promise module ([#1017](https://github.com/instana/nodejs/issues/1017)) ([6bb88dd](https://github.com/instana/nodejs/commit/6bb88dd4ca08d2482ff917fb3b9f884f4e4bdf8e))
+
+## [3.1.3](https://github.com/instana/nodejs/compare/v3.1.2...v3.1.3) (2024-01-31)
+
+### Bug Fixes
+
+- resolved logging issue for the dependency distance calculator ([#1024](https://github.com/instana/nodejs/issues/1024)) ([59de3e6](https://github.com/instana/nodejs/commit/59de3e6345bb4b64a2b5f02e01b5351182c66d83)), closes [#1019](https://github.com/instana/nodejs/issues/1019)
+
 ## [3.1.2](https://github.com/instana/nodejs/compare/v3.1.1...v3.1.2) (2024-01-29)
 
 **Note:** Version bump only for package @instana/shared-metrics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -26,8 +26,8 @@
   },
   "scripts": {
     "audit": "npm audit --omit=dev",
-    "test": "mocha --config=test/.mocharc.js --require test/hooks.js --sort $(find test -iname '*test.js' -not -path '*node_modules*')",
-    "test:ci": "echo \"******* Files to be tested:\n $CI_SHARED_METRICS_TEST_FILES\" && if [ -z \"${CI_SHARED_METRICS_TEST_FILES}\" ]; then echo \"No test files have been assigned to this CircleCI executor.\"; else mocha --config=test/.mocharc.js --reporter mocha-multi-reporters --reporter-options configFile=reporter-config.json --require test/hooks.js ${CI_SHARED_METRICS_TEST_FILES}; fi",
+    "test": "mocha --config=test/.mocharc.js --require test/hooks.js --sort $(find test -iname '*test.js')",
+    "test:ci": "mocha --config=test/.mocharc.js --reporter mocha-multi-reporters --reporter-options configFile=reporter-config.json --require test/hooks.js 'test/**/*test.js'",
     "test:debug": "WITH_STDOUT=true npm run test",
     "lint": "eslint src test",
     "verify": "npm run lint && npm test",
@@ -59,7 +59,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "3.1.2",
+    "@instana/core": "3.2.0",
     "detect-libc": "^2.0.2",
     "event-loop-lag": "^1.4.0",
     "recursive-copy": "^2.0.13",
@@ -73,5 +73,5 @@
     "event-loop-stats": "1.4.1",
     "gcstats.js": "1.0.0"
   },
-  "gitHead": "879f6328997177c1ce6da2bc24ba130b39c1c393"
+  "gitHead": "4e9af9e088ed97732fc93ac6157cfad90eb96fa2"
 }

package/src/directDependencies.js

@@ -29,7 +29,13 @@ const MAX_ATTEMPTS = 20;
 const DELAY = 1000;
 let attempts = 0;
 
+exports.deactivate = function deactivate() {
+  attempts = 0;
+};
+
 exports.activate = function activate() {
+  logger.debug(`activate ${attempts}`);
+
   attempts++;
   util.applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
     if (err) {
@@ -54,6 +60,8 @@ exports.activate = function activate() {
  * @param {string} packageJsonPath
  */
 function addDirectDependenciesFromMainPackageJson(packageJsonPath) {
+  logger.debug(`addDirectDependenciesFromMainPackageJson: ${packageJsonPath}`);
+
   const started = Date.now();
   fs.readFile(packageJsonPath, { encoding: 'utf8' }, (err, contents) => {
     if (err) {

package/src/index.js

@@ -13,7 +13,6 @@ const allMetrics = [
   require('./dependencies'),
   require('./directDependencies'),
   require('./description'),
-  require('./directDependencies'),
   require('./execArgs'),
   require('./gc'),
   require('./healthchecks'),

package/src/util/DependencyDistanceCalculator.js

@@ -16,7 +16,7 @@ let logger = Logger.getLogger('metrics');
 /**
  * @param {import('@instana/core/src/logger').GenericLogger} _logger
  */
-exports.setLogger = function setLogger(_logger) {
+const setLogger = function (_logger) {
   logger = _logger;
 };
 
@@ -277,5 +277,6 @@ function searchInParentDir(dir, onParentDir, callback) {
 module.exports = {
   DependencyDistanceCalculator,
   MAX_DEPTH: 15,
-  __moduleRefExportedForTest: module
+  __moduleRefExportedForTest: module,
+  setLogger
 };

package/src/util/index.js

@@ -6,6 +6,7 @@
 'use strict';
 
 const nativeModuleRetry = require('./nativeModuleRetry');
+const { setLogger: setLoggerForDependencyDistanceCalculator } = require('./DependencyDistanceCalculator');
 module.exports = {
   nativeModuleRetry,
   /**
@@ -13,5 +14,6 @@ module.exports = {
    */
   setLogger: function setLogger(logger) {
     nativeModuleRetry.setLogger(logger);
+    setLoggerForDependencyDistanceCalculator(logger);
   }
 };