appdynamics 24.4.1 → 24.9.0

package/lib/probes/winston-probe.js

@@ -11,31 +11,127 @@ WinstonProbe.prototype.attach = function (obj) {
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   let self = this;
+  self.agent.on('destroy', function() {
+    if(obj.__appdynamicsProbeAttached__) {
+      delete obj.__appdynamicsProbeAttached__;
+      self.agent.proxy.release(obj.Logger.prototype.write);
+    }
+  });
+
   self.agent.proxy.before(
     obj.Logger.prototype,
     "write",
-    (obj, args) => this.addLifeCycleHooks(obj, args)
+    (obj, args) => this.handleLogWrite(obj, args)
   );
 };
 
-WinstonProbe.prototype.addLifeCycleHooks = function (obj, args) {
+WinstonProbe.prototype.handleLogWrite = function (obj, args) {
   let self = this;
 
-  if(!self.agent.libagentConnector.getNodeProperty("opentelemetry-logs-push-enabled")
-     || !self.agent.OtelLogger) {
-    return;
-  }
-
   const threadId =  self.agent.profiler.time().threadId;
   const txn = self.agent.profiler.getTransaction(threadId);
-  if(!args[0]) {
-    self.agent.logger.debug('Invalid Log message captured in winston probe');
+
+  let txnBtId = txn && txn.btGuid && self.agent.libagentConnector.getBusinessTransactionId(txn.btGuid) > 0
+                ? self.agent.libagentConnector.getBusinessTransactionId(txn.btGuid) : '';
+
+  if(self.agent.libagentConnector.getNodeProperty("opentelemetry-logs-push-enabled")
+     && !self.agent.OtelLogger) {
+    self.emitToOtel(args, txn, txnBtId);
+  }
+
+  if(!txn) {
     return;
   }
-  const logMessage = args[0];
-  this.agent.OtelLogger.emit(txn,
-                             self.agent.libagentConnector.getBusinessTransactionId(txn.btGuid),
-                             logMessage,
-                             self.agent.libagentConnector.filterLogMessage(logMessage.message),
-                             self.agent.libagentConnector.getNodeProperty("opentelemetry-allowed-log-level"));
+
+  if(process.env.appdynamics_log_metadata_enrichment  || self.agent.libagentConnector.getNodeProperty("enable-log-metadata-enrichment")) {
+    return self.decorateMessage(args, txn, txnBtId);
+  }
+};
+
+WinstonProbe.prototype.decorateMessage = function (args, txn, btId) {
+  let self = this;
+
+  for(let i = 0; i < args.length; i++) {
+    let logMessage = args[i];
+
+    let txnGuid = txn && txn.guid ? txn.guid : '';
+    if(self.hasMetadataDefined(logMessage)) {
+      self.updateMetadata(logMessage, txnGuid, btId);
+    } else {
+      var decorator = self.createDecorator(txnGuid, btId);
+      if(decorator) {
+        logMessage.message = decorator + ' ' + logMessage.message;
+      }
+    }
+  }
+  return args;
+};
+
+WinstonProbe.prototype.hasMetadataDefined = function (logMessage) {
+  return logMessage.hasOwnProperty('appd_app_name')|| logMessage.hasOwnProperty('appd_tier_name')|| logMessage.hasOwnProperty('appd_node_name')
+         || logMessage.hasOwnProperty('appd_request_guid') || logMessage.hasOwnProperty('appd_bt_id');
+};
+
+WinstonProbe.prototype.updateMetadata = function (logMessage, txnGuid, btId) {
+  let self = this;
+  let nodeId = self.agent.libagentConnector.getNodeId();
+  if(logMessage.hasOwnProperty('appd_app_name')) {
+    logMessage.appd_app_name = self.agent.opts.applicationName;
+  }
+  if(logMessage.hasOwnProperty('appd_tier_name')) {
+    logMessage.appd_tier_name = self.agent.opts.tierName;
+  }
+  if(logMessage.hasOwnProperty('appd_node_id')) {
+    logMessage.appd_node_id = nodeId;
+  }
+  if(logMessage.hasOwnProperty('appd_request_guid')) {
+    logMessage.appd_request_guid = txnGuid;
+  }
+  if(logMessage.hasOwnProperty('appd_bt_id')) {
+    logMessage.appd_bt_id = btId;
+  }
+};
+
+WinstonProbe.prototype.createDecorator = function (txnGuid, btId) {
+  let self = this;
+  let decorator = '';
+  let decoratorFields = process.env.appdynamics_log_metadata_fields;
+  let opts = self.agent.opts;
+  let nodeId = self.agent.libagentConnector.getNodeId();
+  if(decoratorFields.includes('appd_app_name')) {
+    decorator = self.addDecoratorField('appd_app_name', opts.applicationName, decorator);
+  }
+  if(decoratorFields.includes('appd_tier_name')) {
+    decorator = self.addDecoratorField('appd_tier_name', opts.tierName, decorator);
+  }
+  if(decoratorFields.includes('appd_node_id')) {
+    decorator = self.addDecoratorField('appd_node_id', nodeId, decorator);
+  }
+  if(decoratorFields.includes('appd_request_guid')) {
+    decorator = self.addDecoratorField('appd_request_guid', txnGuid, decorator);
+  }
+  if(decoratorFields.includes('appd_bt_id')) {
+    decorator = self.addDecoratorField('appd_bt_id', btId, decorator);
+  }
+  // strip leading space
+  return decorator.slice(1);
+};
+
+WinstonProbe.prototype.addDecoratorField = function (name, value, decorator) {
+  decorator += ' ' + name + '=' + value;
+  return decorator;
+};
+
+WinstonProbe.prototype.emitToOtel = function (args, txn, btId) {
+  var self = this;
+
+  for(let i = 0; i < args.length; i++) {
+    let logMessage = args[i];
+
+    this.agent.OtelLogger.emit(txn,
+                              btId,
+                              logMessage,
+                              self.agent.libagentConnector.filterLogMessage(logMessage.message),
+                              self.agent.libagentConnector.getNodeProperty("opentelemetry-allowed-log-level"));
+  }
 };

package/lib/secure_app/secure_app.js

@@ -21,6 +21,14 @@ function SecureApp() {
 
 SecureApp.prototype.init = function(agent) {
   var self = this;
+
+  if(agent.opts.certificateFile)  {
+    try {
+      self.certificateFile = require('fs').readFileSync(agent.opts.certificateFile);
+    } catch (e) {
+      self.agent.logger.WARN('Secure App could not read certificate file');
+    }
+  }
   self.agent = agent;
   self.libraryMetadata = new LibraryMetadata(agent);
   if(!process.env.SKIP_AUTH_FOR_TESTS) {
@@ -115,8 +123,8 @@ SecureApp.prototype._requestOptions = function(path, length, type) {
     'Content-Type': type
   };
 
-  if (self.agent.opts.certificateFile) {
-    requestOptions['ca'] = self.agent.opts.certificateFile;
+  if (self.certificateFile) {
+    requestOptions['ca'] = self.certificateFile;
   }
 
   if(process.env.CONTROLLER_HOST_TEST) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.4.1",
+    "version": "24.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,19 +46,20 @@
         "@opentelemetry/sdk-trace-base": "~1.10.1",
         "@opentelemetry/semantic-conventions": "~1.10.1",
         "@yarnpkg/lockfile": "^1.1.0",
+        "body-parser": "^1.20.3",
         "cls-hooked": "4.2.2",
         "https-proxy-agent": "^5.0.1",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
         "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v21.*"
+        "node": ">=12 <=v22.*"
     },
     "engine-strict": true
 }

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.4.1",
+    "version": "24.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,19 +46,20 @@
         "@opentelemetry/sdk-trace-base": "~1.10.1",
         "@opentelemetry/semantic-conventions": "~1.10.1",
         "@yarnpkg/lockfile": "^1.1.0",
+        "body-parser": "^1.20.3",
         "cls-hooked": "4.2.2",
         "https-proxy-agent": "^5.0.1",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.4.1.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.9.0.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
         "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v21.*"
+        "node": ">=12 <=v22.*"
     },
     "engine-strict": true
 }