refactor: removed agent/log.js and move the fn to agent connection

Author: kirrg001

packages/collector/src/agent/log.js

@@ -5,11 +5,14 @@
 
 'use strict';
 
-const log = require('./log');
-
 const pidStore = require('../pidStore/internalPidStore');
 
-/** @type {NodeJS.WritableStream} */
+/** @type {import('../agentConnection')} */
+let downstreamConnection;
+
+/** @type {NodeJS.WritableStream & {
+ *    setDownstreamConnection: (downstreamConnection: import('../agentConnection')) => void
+ * }} */
 module.exports = {
   /**
    * @param {*} record
@@ -30,7 +33,14 @@ module.exports = {
       stack = record.err.stack;
     }
 
-    log(logLevel, message, stack);
+    downstreamConnection.sendLogToAgent(logLevel, message, stack);
+  },
+
+  /**
+   * @param {import('../agentConnection')} _downstreamConnection
+   */
+  setDownstreamConnection: _downstreamConnection => {
+    downstreamConnection = _downstreamConnection;
   }
 };
 

packages/collector/src/agent/loggerToAgentStream.js

@@ -216,6 +216,52 @@ exports.checkWhetherAgentIsReadyToAcceptData = function checkWhetherAgentIsReady
   checkWhetherResponseForPathIsOkay(`/com.instana.plugin.nodejs.${pidStore.pid}`, cb);
 };
 
+/**
+ * @param {*} logLevel
+ * @param {*} message
+ * @param {*} stackTrace
+ */
+exports.sendLogToAgent = function sendLogToAgent(logLevel, message, stackTrace) {
+  /** @type {{m: string, st?: string}} */
+  const payloadObject = {
+    m: message.trim()
+  };
+
+  if (stackTrace) {
+    payloadObject.st = stackTrace.trim();
+  }
+
+  const payload = Buffer.from(JSON.stringify(payloadObject), 'utf8');
+
+  const req = http.request(
+    {
+      host: agentOpts.host,
+      port: agentOpts.port,
+      path: '/com.instana.agent.logger',
+      method: 'POST',
+      agent: http.agent,
+      headers: {
+        'Content-Type': 'application/json; charset=UTF-8',
+        'Content-Length': payload.length,
+        'x-log-level': logLevel
+      }
+    },
+    res => {
+      res.resume();
+    }
+  );
+
+  function swallow() {
+    // swallow all errors
+  }
+
+  req.setTimeout(agentOpts.requestTimeout, swallow);
+  req.on('error', swallow);
+
+  req.write(payload);
+  req.end();
+};
+
 /**
  * @param {string} path
  * @param {(...args: *) => *} cb

packages/collector/src/agentConnection.js

@@ -113,6 +113,8 @@ function init(userConfig = {}) {
   const announceCycle = require('./announceCycle');
   const metrics = require('./metrics');
 
+  log.setDownstreamConnection(agentConnection);
+
   pidStore.init(config);
   agentOpts.init(config);
   announceCycle.init(config, pidStore);

packages/collector/src/index.js

@@ -158,6 +158,14 @@ exports.init = function init(userConfig = {}) {
 
 exports.getLogger = () => instanaLogger;
 
+/**
+ *
+ * @param {import('./agentConnection')} downstreamConnection
+ */
+exports.setDownstreamConnection = downstreamConnection => {
+  loggerToAgentStream.setDownstreamConnection(downstreamConnection);
+};
+
 /**
  * @param {import('@instana/core/src/core').GenericLogger | *} _logger
  * @returns {boolean}