@instana/shared-metrics 3.15.0 → 3.15.2

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.15.2](https://github.com/instana/nodejs/compare/v3.15.1...v3.15.2) (2024-08-27)
+
+**Note:** Version bump only for package @instana/shared-metrics
+
+## [3.15.1](https://github.com/instana/nodejs/compare/v3.15.0...v3.15.1) (2024-08-19)
+
+### Bug Fixes
+
+- **shared-metrics:** removed recursive-copy dependency ([#1265](https://github.com/instana/nodejs/issues/1265)) ([63e67f1](https://github.com/instana/nodejs/commit/63e67f17d0b3025a5b671c2a4ba7f37e163a9649))
+
 # [3.15.0](https://github.com/instana/nodejs/compare/v3.14.4...v3.15.0) (2024-08-13)
 
 **Note:** Version bump only for package @instana/shared-metrics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "3.15.0",
+  "version": "3.15.2",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -59,19 +59,20 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "3.15.0",
+    "@instana/core": "3.15.2",
     "detect-libc": "^2.0.2",
     "event-loop-lag": "^1.4.0",
-    "recursive-copy": "^2.0.13",
+    "fs-extra": "^11.2.0",
     "semver": "^7.5.4",
     "tar": "^6.2.1"
   },
   "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
     "@types/tar": "^6.1.6"
   },
   "optionalDependencies": {
     "event-loop-stats": "1.4.1",
     "gcstats.js": "1.0.0"
   },
-  "gitHead": "afbe2f4ac0d9017f9ff6031507f479f14fdd1fb5"
+  "gitHead": "654046cc3111e0ee43d4d32dfb70b76478d0d99c"
 }

package/src/util/nativeModuleRetry.js

@@ -9,11 +9,11 @@ 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 os = require('os');
 const tar = require('tar');
 const path = require('path');
 const detectLibc = require('detect-libc');
+const fse = require('fs-extra');
 
 /**
  * @typedef {Object} InstanaSharedMetricsOptions
@@ -183,23 +183,14 @@ function copyPrecompiled(opts, loaderEmitter, callback) {
       .then(() => {
         // See below for the reason why we append 'precompiled' to the path.
         const targetDir = path.join(opts.nativeModulePath, 'precompiled');
+        const sourceDir = path.join(os.tmpdir(), opts.nativeModuleName);
+        logger.debug(
+          `Copying the precompiled build for ${opts.nativeModuleName} ${label} from ${sourceDir} to ${targetDir}.`
+        );
 
-        // @ts-ignore
-        copy(
-          path.join(os.tmpdir(), opts.nativeModuleName),
-          targetDir,
-          {
-            overwrite: true,
-            dot: true
-          },
-          // @ts-ignore
-          cpErr => {
-            if (cpErr) {
-              logger.warn(`Copying the precompiled build for ${opts.nativeModuleName} ${label} failed.`, cpErr);
-              callback(false);
-              return;
-            }
-
+        fse
+          .copy(sourceDir, targetDir)
+          .then(() => {
             // We have unpacked and copied the correct precompiled native addon. The next attempt to require the
             // dependency should work.
             //
@@ -211,10 +202,14 @@ function copyPrecompiled(opts, loaderEmitter, callback) {
             // it will remember and not try to load anything from that path again (a `false` will be
             // put into the cache for that cache key). Instead, we force a new path, by adding precompiled
             // to the module path and use the absolute path to the module to load it.
+            logger.debug(`Successfully copied the precompiled build for ${opts.nativeModuleName} ${label}.`);
             opts.loadFrom = targetDir;
             callback(true);
-          }
-        );
+          })
+          .catch(error => {
+            logger.warn(`Copying the precompiled build for ${opts.nativeModuleName} ${label} failed.`, error);
+            callback(false);
+          });
       })
       .catch(tarErr => {
         logger.warn(`Unpacking the precompiled build for ${opts.nativeModuleName} ${label} failed.`, tarErr);