@instana/shared-metrics 2.23.0 → 2.25.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.25.0](https://github.com/instana/nodejs/compare/v2.24.0...v2.25.0) (2023-06-16)
+
+**Note:** Version bump only for package @instana/shared-metrics
+
+
+
+
+
+# [2.24.0](https://github.com/instana/nodejs/compare/v2.23.0...v2.24.0) (2023-06-13)
+
+
+### Features
+
+* **collector:** added node:fs, restify and socket.io support (OpenTelemetry integration) ([#715](https://github.com/instana/nodejs/issues/715)) ([60f3bb9](https://github.com/instana/nodejs/commit/60f3bb960f909e0640b372de97c8f6d7c1654038)), closes [#109122](https://github.com/instana/nodejs/issues/109122)
+
+
+
+
+
 # [2.23.0](https://github.com/instana/nodejs/compare/v2.22.1...v2.23.0) (2023-06-06)
 
 **Note:** Version bump only for package @instana/shared-metrics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "2.23.0",
+  "version": "2.25.0",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -67,7 +67,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "2.23.0",
+    "@instana/core": "2.25.0",
     "detect-libc": "^1.0.3",
     "event-loop-lag": "^1.4.0",
     "recursive-copy": "^2.0.13",
@@ -82,5 +82,5 @@
     "event-loop-stats": "1.4.1",
     "gcstats.js": "1.0.0"
   },
-  "gitHead": "2ae60e82e5f6c3e22d6740d4b95c1a9b13a9a984"
+  "gitHead": "a0ca4681e7c3cb948ea2eba0f8e91e537ee03ed4"
 }

package/src/dependencies.js

@@ -6,8 +6,7 @@
 'use strict';
 
 const path = require('path');
-const fs = require('fs');
-const { applicationUnderMonitoring } = require('@instana/core').util;
+const { util, uninstrumentedFs: fs } = require('@instana/core');
 
 let logger = require('@instana/core').logger.getLogger('metrics');
 
@@ -43,7 +42,7 @@ exports.activate = function activate() {
   attempts++;
 
   const started = Date.now();
-  applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, mainPackageJsonPath) => {
+  util.applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, mainPackageJsonPath) => {
     if (err) {
       return logger.warn('Failed to determine main package.json. Reason: %s %s ', err.message, err.stack);
     } else if (!mainPackageJsonPath && attempts < exports.MAX_ATTEMPTS) {
@@ -54,7 +53,7 @@ exports.activate = function activate() {
       logger.info(
         `Main package.json could not be found after ${attempts} retries. Looking for node_modules folder now.`
       );
-      applicationUnderMonitoring.findNodeModulesFolder((errNodeModules, nodeModulesFolder) => {
+      util.applicationUnderMonitoring.findNodeModulesFolder((errNodeModules, nodeModulesFolder) => {
         if (errNodeModules) {
           return logger.warn('Failed to determine node_modules folder. Reason: %s %s ', err.message, err.stack);
         } else if (!nodeModulesFolder) {
@@ -69,7 +68,7 @@ exports.activate = function activate() {
     }
 
     let dependencyDir;
-    if (applicationUnderMonitoring.isAppInstalledIntoNodeModules()) {
+    if (util.applicationUnderMonitoring.isAppInstalledIntoNodeModules()) {
       dependencyDir = path.join(path.dirname(mainPackageJsonPath), '..', '..', 'node_modules');
     } else {
       dependencyDir = path.join(path.dirname(mainPackageJsonPath), 'node_modules');

package/src/directDependencies.js

@@ -5,9 +5,7 @@
 
 'use strict';
 
-const fs = require('fs');
-
-const { applicationUnderMonitoring } = require('@instana/core').util;
+const { util, uninstrumentedFs: fs } = require('@instana/core');
 
 let logger = require('@instana/core').logger.getLogger('metrics');
 
@@ -33,7 +31,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
+  util.applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
     if (err) {
       return logger.info(
         'Failed to determine main package.json for analysis of direct dependencies. Reason: %s %s ',

package/src/util/DependencyDistanceCalculator.js

@@ -6,12 +6,12 @@
 'use strict';
 
 const assert = require('assert');
-const fs = require('fs');
+const { logger: Logger, uninstrumentedFs: fs } = require('@instana/core');
 const path = require('path');
 
 const CountDownLatch = require('./CountDownLatch');
 
-let logger = require('@instana/core').logger.getLogger('metrics');
+let logger = Logger.getLogger('metrics');
 
 /**
  * @param {import('@instana/core/src/logger').GenericLogger} _logger

package/src/util/nativeModuleRetry.js

@@ -5,11 +5,11 @@
 
 'use strict';
 
-let logger = require('@instana/core').logger.getLogger('shared-metrics/native-module-retry');
+const { logger: Logger, uninstrumentedFs: fs } = require('@instana/core');
+let logger = Logger.getLogger('shared-metrics/native-module-retry');
 
 const EventEmitter = require('events');
 const copy = require('recursive-copy');
-const fs = require('fs');
 const os = require('os');
 const tar = require('tar');
 const path = require('path');