@instana/metrics-util - npm Package Compare versions

Comparing version 4.6.1 to 4.6.2

CHANGELOG.md

@@ -6,2 +6,6 @@ # Change Log
 
+## [4.6.2](https://github.com/instana/nodejs/compare/v4.6.1...v4.6.2) (2025-02-24)
+
+**Note:** Version bump only for package @instana/metrics-util
+
 ## [4.6.1](https://github.com/instana/nodejs/compare/v4.6.0...v4.6.1) (2025-01-29)
@@ -8,0 +12,0 @@

package.json

 {
   "name": "@instana/metrics-util",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "Internal utility library for Instana metric collection",
@@ -63,8 +63,8 @@ "author": {
   "dependencies": {
-    "@instana/core": "4.6.1",
-    "@instana/serverless": "4.6.1",
-    "@instana/shared-metrics": "4.6.1",
+    "@instana/core": "4.6.2",
+    "@instana/serverless": "4.6.2",
+    "@instana/shared-metrics": "4.6.2",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "62464af6ca87e5e86de458e16f252d821e993900"
+  "gitHead": "d70ba21a091202ed248f083d546052a63e861ddc"
 }

src/DataProcessor.js

@@ -9,7 +9,4 @@ /*
 const EventEmitter = require('events');
+const core = require('@instana/core');
 
-const {
-  util: { compression: applyCompression }
-} = require('@instana/core');
-
 const SKIPPED = {};
@@ -160,3 +157,3 @@
     } else {
-      dataToBeSent = applyCompression(this.lastTransmittedPayload, uncompressedData, this.compressionExcludeList);
+      dataToBeSent = core.util.compression(this.lastTransmittedPayload, uncompressedData, this.compressionExcludeList);
     }
@@ -163,0 +160,0 @@

src/index.js

@@ -8,8 +8,12 @@ /*
 
-exports = module.exports = {
-  DataProcessor: require('./DataProcessor'),
-  DataSource: require('./DataSource'),
-  HttpDataSource: require('./HttpDataSource'),
-  nodejs: require('./nodejs'),
-  process: require('./process')
-};
+const DataProcessor = require('./DataProcessor');
+const DataSource = require('./DataSource');
+const HttpDataSource = require('./HttpDataSource');
+const nodejs = require('./nodejs');
+const process = require('./process');
+
+exports.nodejs = nodejs;
+exports.process = process;
+exports.DataProcessor = DataProcessor;
+exports.DataSource = DataSource;
+exports.HttpDataSource = HttpDataSource;

src/nodejs/CoreDataSource.js

@@ -8,11 +8,24 @@ /*
 
+const core = require('@instana/core');
+const sharedMetrics = require('@instana/shared-metrics');
+const { consoleLogger } = require('@instana/serverless');
 const DataSource = require('../DataSource');
 
 /**
- * A source for snapshot data and metrics that adapts the metrics from @instana/core and @instana/shared-metrics.
+ * This data source holds metrics from @instana/core and @instana/shared-metrics.
+ * This source depends on external libraries.
+ * The NodejsProcessor owns this source.
+ *
+ * A data source class defines how to collect or define data from a specific source.
+ * The outside does not need to know how the data is collected.
  */
 class CoreDataSource extends DataSource {
-  constructor(coreMetrics, refreshDelay) {
+  constructor(config, refreshDelay) {
     super(refreshDelay);
-    this.coreMetrics = coreMetrics;
+
+    core.metrics.init(config);
+    core.metrics.registerAdditionalMetrics(sharedMetrics.allMetrics);
+
+    // This will be removed by the new logger refactoring PR.
+    core.metrics.setLogger(consoleLogger);
   }
@@ -22,4 +35,5 @@
     if (!this.active) {
-      this.coreMetrics.activate();
+      core.metrics.activate();
     }
+
     super.activate();
@@ -30,4 +44,5 @@ }
     if (this.active) {
-      this.coreMetrics.deactivate();
+      core.metrics.deactivate();
     }
+
     super.deactivate();
@@ -37,3 +52,3 @@ }
   doRefresh(callback) {
-    this.rawData = this.coreMetrics.gatherData();
+    this.rawData = core.metrics.gatherData();
     process.nextTick(() => callback(null, this.rawData));
@@ -40,0 +55,0 @@ }

src/nodejs/index.js

@@ -9,4 +9,4 @@ /*
 exports = module.exports = {
-  coreAndShared: require('./coreAndShared'),
-  NodeJsProcessor: require('./NodeJsProcessor')
+  NodeJsProcessor: require('./NodeJsProcessor'),
+  CoreDataSource: require('./CoreDataSource')
 };

src/nodejs/NodeJsProcessor.js

@@ -10,9 +10,7 @@ /*
 
-const CoreDataSource = require('./CoreDataSource');
-
 class NodeJsProcessor extends DataProcessor {
-  constructor(coreAndShared, pid) {
+  constructor(coreAndSharedMetricsDataSource, pid) {
     super('com.instana.plugin.nodejs');
     this.pid = pid;
-    this.addSource('core', new CoreDataSource(coreAndShared));
+    this.addSource('core', coreAndSharedMetricsDataSource);
   }
@@ -19,0 +17,0 @@

src/process/ProcessProcessor.js

@@ -8,3 +8,3 @@ /*
 
-const { secrets } = require('@instana/core');
+const core = require('@instana/core');
 
@@ -60,3 +60,3 @@ const DataProcessor = require('../DataProcessor');
       Object.keys(snapshot.env).forEach(envVar => {
-        if (secrets.isSecret(envVar) || envVar === 'INSTANA_AGENT_KEY') {
+        if (core.secrets.isSecret(envVar) || envVar === 'INSTANA_AGENT_KEY') {
           snapshot.env[envVar] = '<redacted>';
@@ -63,0 +63,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

39680

-0.07%

Number of package files

15

-6.25%

Lines of code

527

-2.59%

Dependency changes

• + Added

  @instana/core@4.6.2
  (transitive)

• + Added

  @instana/serverless@4.6.2
  (transitive)

• + Added

  @instana/shared-metrics@4.6.2
  (transitive)

• - Removed

  @instana/core@4.6.1
  (transitive)

• - Removed

  @instana/serverless@4.6.1
  (transitive)

• - Removed

  @instana/shared-metrics@4.6.1
  (transitive)

• Updated

  @instana/core@4.6.2

• Updated

  @instana/serverless@4.6.2

• Updated

  @instana/shared-metrics@4.6.2