@instana/collector - npm Package Compare versions

Comparing version 3.19.0 to 3.20.0

CHANGELOG.md

@@ -6,2 +6,12 @@ # Change Log
 
+# [3.20.0](https://github.com/instana/nodejs/compare/v3.19.0...v3.20.0) (2024-10-01)
+
+### Bug Fixes
+
+- connected deferred exit span with original entry span ([#1346](https://github.com/instana/nodejs/issues/1346)) ([98f99e1](https://github.com/instana/nodejs/commit/98f99e18ee8323d70f07b045ff740f4d12486c30)), closes [#1297](https://github.com/instana/nodejs/issues/1297)
+
+### Features
+
+- extended typescript support ([#1349](https://github.com/instana/nodejs/issues/1349)) ([3b8abea](https://github.com/instana/nodejs/commit/3b8abeada99cc5952dd8362db54adc66cd8be7da))
+
 # [3.19.0](https://github.com/instana/nodejs/compare/v3.18.2...v3.19.0) (2024-09-25)
@@ -8,0 +18,0 @@

package.json

 {
   "name": "@instana/collector",
-  "version": "3.19.0",
+  "version": "3.20.0",
   "description": "The Instana Node.js metrics and trace data collector",
@@ -12,2 +12,3 @@ "author": {
   "main": "src/index.js",
+  "types": "src/types/index.d.ts",
   "bin": {
@@ -83,4 +84,4 @@ "instana-instrument-edgemicro-cli": "src/bin/instrument-edgemicro-cli.js"
   "dependencies": {
-    "@instana/core": "3.19.0",
-    "@instana/shared-metrics": "3.19.0",
+    "@instana/core": "3.20.0",
+    "@instana/shared-metrics": "3.20.0",
     "bunyan": "^1.8.15",
@@ -91,3 +92,3 @@ "semver": "^7.5.4",
   "optionalDependencies": {
-    "@instana/autoprofile": "3.19.0"
+    "@instana/autoprofile": "3.20.0"
   },
@@ -99,3 +100,3 @@ "devDependencies": {
   },
-  "gitHead": "44d8ef19a478f6653ea0dfce53584b15e4629507"
+  "gitHead": "8533d24ec14a19d8555a65df0c04824a6e263e27"
 }

src/actions/source.js

@@ -10,3 +10,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -13,0 +13,0 @@ logger = require('../logger').getLogger('actions/source', newLogger => {

src/agent/opts.js

@@ -23,3 +23,3 @@ /*
 /**
- * @param {import('../util/normalizeConfig').CollectorConfig} config
+ * @param {import('../types/collector').CollectorConfig} config
  */
@@ -26,0 +26,0 @@ exports.init = function init(config) {

src/agent/requestHandler.js

@@ -8,3 +8,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -11,0 +11,0 @@

src/agentConnection.js

@@ -13,5 +13,5 @@ /*
 
-/** @typedef {import('@instana/core/src/tracing/cls').InstanaBaseSpan} InstanaBaseSpan */
+/** @typedef {import('@instana/core/src/core').InstanaBaseSpan} InstanaBaseSpan */
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -18,0 +18,0 @@ logger = require('./logger').getLogger('agentConnection', newLogger => {

src/announceCycle/agentHostLookup.js

@@ -16,3 +16,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -19,0 +19,0 @@ logger = require('../logger').getLogger('announceCycle/agentHostLookup', newLogger => {

src/announceCycle/agentready.js

@@ -40,3 +40,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -43,0 +43,0 @@ logger = require('../logger').getLogger('announceCycle/agentready', newLogger => {

src/announceCycle/announced.js

@@ -8,3 +8,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -11,0 +11,0 @@ logger = require('../logger').getLogger('announceCycle/announced', newLogger => {

src/announceCycle/defaultGatewayParser.js

@@ -9,3 +9,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -12,0 +12,0 @@ logger = require('../logger').getLogger('announceCycle/defaultGatewayParser', newLogger => {

src/announceCycle/index.js

@@ -19,3 +19,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -22,0 +22,0 @@ logger = require('../logger').getLogger('announceCycle', newLogger => {

src/announceCycle/unannounced.js

@@ -15,3 +15,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -18,0 +18,0 @@ logger = require('../logger').getLogger('announceCycle/unannounced', newLogger => {

src/cmdline.js

@@ -10,3 +10,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -13,0 +13,0 @@ logger = require('./logger').getLogger('cmdline', newLogger => {

src/index.js

@@ -15,2 +15,6 @@ /*
   module.exports = function noOp() {};
+
+  // ESM default exports for TS
+  module.exports.default = function noOp() {};
+
   // @ts-ignore TS1108 (return can only be used within a function body)
@@ -26,3 +30,6 @@ return;
   );
-  module.exports = function noOp() {};
+
+  // ESM default exports for TS
+  module.exports.default = function noOp() {};
+
   // @ts-ignore TS1108 (return can only be used within a function body)
@@ -45,2 +52,3 @@ return;
 const log = require('./logger');
+
 const normalizeConfig = require('./util/normalizeConfig');
@@ -52,7 +60,7 @@ const experimental = require('./experimental');
 
-/** @type {import('./util/normalizeConfig').CollectorConfig} */
+/** @type {import('./types/collector').CollectorConfig} */
 let config;
 
 /**
- * @param {import('./util/normalizeConfig').CollectorConfig} [_config]
+ * @param {import('./types/collector').CollectorConfig} [_config]
  */
@@ -136,3 +144,3 @@ function init(_config) {
 /**
- * @param {import('@instana/core/src/logger').GenericLogger} logger
+ * @param {import('@instana/core/src/core').GenericLogger} logger
  */
@@ -161,1 +169,2 @@ init.setLogger = function setLogger(logger) {
 module.exports = init;
+module.exports.default = init;

src/logger.js

@@ -24,9 +24,9 @@ /*
 
-/** @type {bunyan | import('@instana/core/src/logger').GenericLogger} */
+/** @type {bunyan | import('@instana/core/src/core').GenericLogger} */
 let parentLogger = null;
-/** @type {Object.<string, (logger: import('@instana/core/src/logger').GenericLogger) => *>} */
+/** @type {Object.<string, (logger: import('@instana/core/src/core').GenericLogger) => *>} */
 const registry = {};
 
 /**
- * @param {import('./util/normalizeConfig').CollectorConfig} config
+ * @param {import('./types/collector').CollectorConfig} config
  * @param {boolean} [isReInit]
@@ -84,4 +84,4 @@ */
  * @param {string} loggerName
- * @param {(logger: import('@instana/core/src/logger').GenericLogger) => *} [reInitFn]
- * @returns {import('@instana/core/src/logger').GenericLogger}
+ * @param {(logger: import('@instana/core/src/core').GenericLogger) => *} [reInitFn]
+ * @returns {import('@instana/core/src/core').GenericLogger}
  */
@@ -92,3 +92,2 @@ exports.getLogger = function getLogger(loggerName, reInitFn) {
   }
-
   let _logger;
@@ -112,3 +111,4 @@
   }
-  return _logger;
+
+  return /** @type {import('@instana/core/src/core').GenericLogger} */ (_logger);
 };
@@ -125,3 +125,3 @@
 /**
- * @param {import('@instana/core/src/logger').GenericLogger | *} _logger
+ * @param {import('@instana/core/src/core').GenericLogger | *} _logger
  * @returns {boolean}
@@ -128,0 +128,0 @@ */

src/metrics/index.js

@@ -16,3 +16,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 const logger = require('../logger').getLogger('metrics', newLogger => {
@@ -19,0 +19,0 @@ coreMetrics.setLogger(newLogger);

src/metrics/transmissionCycle.js

@@ -10,3 +10,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -13,0 +13,0 @@ logger = require('../logger').getLogger('metrics/sender', newLogger => {

src/pidStore/index.js

@@ -14,3 +14,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -25,3 +25,3 @@ logger = require('../logger').getLogger('pidStore', newLogger => {
 
-logger.info('Starting with pid %s', internalPidStore.pid);
+logger.info('PID Store starting with pid %s', internalPidStore.pid);
 
@@ -28,0 +28,0 @@ Object.defineProperty(exports, 'pid', {

src/tracing/instrumentation/process/childProcess.js

@@ -18,3 +18,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -21,0 +21,0 @@ logger = require('../../../logger').getLogger('tracing/child_process', newLogger => {

src/tracing/instrumentation/process/edgemicro.js

@@ -13,3 +13,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -16,0 +16,0 @@ logger = require('../../../logger').getLogger('tracing/edgemicro', newLogger => {

src/tracing/instrumentation/process/selfPath.js

@@ -11,3 +11,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -14,0 +14,0 @@ logger = require('../../../logger').getLogger('tracing/selfPath', newLogger => {

src/uncaught/index.js

@@ -14,3 +14,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -28,3 +28,3 @@ logger = require('../logger').getLogger('util/uncaughtExceptionHandler', newLogger => {
 
-/** @type {import('../util/normalizeConfig').CollectorConfig} */
+/** @type {import('../types/collector').CollectorConfig} */
 let config;
@@ -45,3 +45,3 @@
 /**
- * @param {import('../util/normalizeConfig').CollectorConfig} _config
+ * @param {import('../types/collector').CollectorConfig} _config
  * @param {import('../agentConnection')} _downstreamConnection
@@ -48,0 +48,0 @@ * @param {import('../pidStore')} _processIdentityProvider

src/util/initializedTooLate.js

@@ -8,3 +8,3 @@ /*
 
-/** @type {import('@instana/core/src/logger').GenericLogger} */
+/** @type {import('@instana/core/src/core').GenericLogger} */
 let logger;
@@ -11,0 +11,0 @@ logger = require('../logger').getLogger('util/initializedTooLate', newLogger => {

src/util/normalizeConfig.js

@@ -20,16 +20,5 @@ /*
 /**
- * @typedef {Object} CollectorConfig
- * @property {number} [agentPort]
- * @property {string} [agentHost]
- * @property {Object.<string, *>} [tracing]
- * @property {boolean | string} [autoProfile]
- * @property {boolean} [reportUnhandledPromiseRejections]
- * @property {import('@instana/core/src/logger').GenericLogger} [logger]
- * @property {string | number} [level]
- */
-
-/**
  * Merges the config that was passed to the init function with environment variables and default values.
- * @param {CollectorConfig} config
- * @returns {CollectorConfig}
+ * @param {import('../types/collector').CollectorConfig} config
+ * @returns {import('../types/collector').CollectorConfig}
  */
@@ -36,0 +25,0 @@ module.exports = function normalizeConfig(config = {}) {

No alert changes

Improved metrics

Total package byte prevSize

154400

increased by0.91%

Number of package files

44

increased by7.32%

Lines of code

2932

increased by1.07%

Dependency changes

• + Added@instana/autoprofile@3.20.0(transitive)

• + Added@instana/core@3.20.0(transitive)

• + Added@instana/shared-metrics@3.20.0(transitive)

• - Removed@instana/autoprofile@3.19.0(transitive)

• - Removed@instana/core@3.19.0(transitive)

• - Removed@instana/shared-metrics@3.19.0(transitive)

• Updated@instana/core@3.20.0

• Updated@instana/shared-metrics@3.20.0