@instana/collector - npm Package Compare versions

Comparing version 2.20.0 to 2.20.1

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+## [2.20.1](https://github.com/instana/nodejs/compare/v2.20.0...v2.20.1) (2023-03-30)
+
+
+### Bug Fixes
+
+* **amqp:** publish span not being transmitted when confirm cb is missing ([#745](https://github.com/instana/nodejs/issues/745)) ([6dce419](https://github.com/instana/nodejs/commit/6dce41905953c3b157b15b1d46a37d1db4ede389))
+
+
+
+
+
 # [2.20.0](https://github.com/instana/nodejs/compare/v2.19.0...v2.20.0) (2023-03-24)
@@ -8,0 +19,0 @@

package.json

 {
   "name": "@instana/collector",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "The Instana Node.js metrics and trace data collector",
@@ -138,4 +138,4 @@ "author": {
   "dependencies": {
-    "@instana/core": "2.20.0",
-    "@instana/shared-metrics": "2.20.0",
+    "@instana/core": "2.20.1",
+    "@instana/shared-metrics": "2.20.1",
     "bunyan": "^1.8.15",
@@ -146,3 +146,3 @@ "semver": "7.3.3",
   "optionalDependencies": {
-    "@instana/autoprofile": "2.20.0"
+    "@instana/autoprofile": "2.20.1"
   },
@@ -157,3 +157,3 @@ "devDependencies": {
   },
-  "gitHead": "c71af966fc982536e9c68f9fca477b8b91fad090"
+  "gitHead": "b05bc237a86683cb8f92e84565d1830aa198c9b1"
 }

src/announceCycle/agentHostLookup.js

@@ -52,12 +52,17 @@ /*
 
-    logger.debug('%s:%s is not running the agent. Trying default gateway...', agentHost, agentOpts.port, {
-      error: localhostCheckErr
-    });
+    logger.debug(
+      'No Instana host agent is running on %s:%s. Trying the default gateway next.',
+      agentHost,
+      agentOpts.port,
+      {
+        error: localhostCheckErr
+      }
+    );
 
     getDefaultGateway(function onGetDefaultGateway(getDefaultGatewayErr, defaultGateway) {
       if (getDefaultGatewayErr) {
-        logger.debug('Error while trying to determine default gateway.', { error: getDefaultGatewayErr });
+        logger.debug('Error while trying to determine the default gateway.', { error: getDefaultGatewayErr });
         logger.warn(
-          'Agent cannot be contacted via %s:%s and default gateway cannot be determined. ' +
-            'Scheduling reattempt of agent host lookup in %s millis.',
+          'The Instana host agent cannot be contacted via %s:%s and the default gateway cannot be determined. ' +
+            'Scheduling another attempt to establish a connection to the Instana host agent in %s ms.',
           agentHost,
@@ -79,8 +84,8 @@ agentOpts.port,
 
-        logger.debug('Failed to contact agent via default gateway %s', defaultGateway, {
+        logger.debug('Failed to reach the Instana host agent via the default gateway %s', defaultGateway, {
           error: defaultGatewayCheckErr
         });
         logger.warn(
-          'Agent cannot be contacted via %s:%s nor via default gateway %s:%s. ' +
-            'Scheduling reattempt of agent host lookup in %s millis.',
+          'The Instana host agent can neither be reached via %s:%s nor via the default gateway %s:%s. ' +
+            'Scheduling another attempt to establish a connection to the Instana host agent in %s ms.',
           agentHost,
@@ -162,4 +167,4 @@ agentOpts.port,
 function setAgentHost(host) {
-  logger.info('Attempting agent communication via %s:%s', host, agentOpts.port);
+  logger.info('Trying to reach the Instana host agent on %s:%s', host, agentOpts.port);
   agentOpts.host = host;
 }

src/announceCycle/agentready.js

@@ -125,3 +125,3 @@ /*
 
-  logger.info('The Instana Node.js collector is now fully initialized.');
+  logger.info('The Instana Node.js collector is now fully initialized and connected to the Instana host agent.');
 }
@@ -150,5 +150,11 @@
     if (error) {
-      logger.warn('Error received while trying to send tracing metrics to agent: %s', error.message);
+      logger.info(
+        'Error received while trying to send tracing metrics to agent: %s. This will not affect monitoring or tracing.',
+        error.message
+      );
       if (typeof error.message === 'string' && error.message.indexOf('Got status code 404')) {
-        logger.warn('Apparently the agent does not support POST /tracermetrics, will stop sending tracing metrics.');
+        logger.info(
+          'Apparently the version of the Instana host agent on this host does not support the POST /tracermetrics ' +
+            'endpoint, will stop sending tracing metrics.'
+        );
         return;
@@ -176,3 +182,6 @@ }
     if (error) {
-      logger.error('Error received while trying to send Agent Monitoring Event to agent: %s', error.message);
+      logger.error(
+        'Error received while trying to send a monitoring event to the Instana host agent: %s',
+        error.message
+      );
     }
@@ -199,3 +208,3 @@ });
       if (err) {
-        logger.debug('Node.js version EOL', err);
+        logger.debug('Sending a monitoring event for the Node.js version end-of-life check has failed.', err);
       }
@@ -202,0 +211,0 @@ }

src/announceCycle/announced.js

@@ -36,7 +36,8 @@ /*
     if (ready) {
-      logger.info('Agent is ready to accept.');
+      logger.info('The Instana host agent is ready to accept data.');
       ctx.transitionTo('agentready');
     } else if (totalNumberOfAttempts > MAX_RETRIES) {
       logger.warn(
-        'Agent is not ready to accept data after %s attempts. Restarting announce cycle.',
+        'The Instana host agent is not yet ready to accept data after %s attempts. Restarting the cycle to establish ' +
+          'a connection.',
         totalNumberOfAttempts
@@ -43,0 +44,0 @@ );

src/announceCycle/unannounced.js

@@ -80,3 +80,9 @@ /*
     if (err) {
-      logger.debug('Announce attempt failed: %s. Will retry in %s ms', err.message, retryDelay);
+      logger.info(
+        'Establishing the connection to the Instana host agent has failed: %s. This usually means that the Instana ' +
+          'host agent is not yet ready to accept connections. This is not an error. Establishing the connection will ' +
+          'be retried in %s ms.',
+        err.message,
+        retryDelay
+      );
       setTimeout(tryToAnnounce, retryDelay, ctx, nextRetryDelay).unref();
@@ -90,6 +96,7 @@ return;
     } catch (e) {
-      logger.warn(
-        'Failed to JSON.parse agent response. Response was %s. Will retry in %s ms',
+      logger.error(
+        "Failed to parse the JSON payload from the Instana host agent's response. Establishing the " +
+          'connection to the Instana host agent will be retried in %s ms. The response payload was %s.',
+        retryDelay,
         rawResponse,
-        retryDelay,
         e
@@ -101,5 +108,11 @@ );
 
-    const pid = agentResponse.pid;
-    logger.info('Overwriting pid for reporting purposes to: %s', pid);
-    pidStore.pid = pid;
+    if (pidStore.pid !== agentResponse.pid) {
+      logger.info(
+        'Reporting data to the Instana host agent with the PID from the root namespace (%s) instead of the ' +
+          'in-container PID (%s).',
+        agentResponse.pid,
+        pidStore.pid
+      );
+      pidStore.pid = agentResponse.pid;
+    }
 
@@ -129,3 +142,3 @@ agentOpts.agentUuid = agentResponse.agentUuid;
       logger.warn(
-        'Received invalid secrets configuration from agent, attribute matcher is not a string: $s',
+        'Received an invalid secrets configuration from the Instana host agent, attribute matcher is not a string: $s',
         agentResponse.secrets.matcher
@@ -135,3 +148,3 @@ );
       logger.warn(
-        'Received invalid secrets configuration from agent, matcher is not supported: $s',
+        'Received an invalid secrets configuration from the Intana agent, matcher is not supported: $s',
         agentResponse.secrets.matcher
@@ -141,3 +154,3 @@ );
       logger.warn(
-        'Received invalid secrets configuration from agent, attribute list is not an array: $s',
+        'Received an invalid secrets configuration from the Instana host agent, attribute list is not an array: $s',
         agentResponse.secrets.list
@@ -216,3 +229,3 @@ );
   if (agentResponse.spanBatchingEnabled === true || agentResponse.spanBatchingEnabled === 'true') {
-    logger.info('Enabling span batching via agent configuration.');
+    logger.info('Enabling span batching via Instana host agent configuration.');
     ensureNestedObjectExists(agentOpts.config, ['tracing']);
@@ -219,0 +232,0 @@ agentOpts.config.tracing.spanBatchingEnabled = true;

No alert changes

Improved metrics

Total package byte prevSize

120222

increased by1.28%

Lines of code

2721

increased by1.04%

Dependency changes

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

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

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

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

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

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

• Updated@instana/core@2.20.1

• Updated@instana/shared-metrics@2.20.1