appdynamics 24.10.0 → 24.12.0

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "24.10.0.0",
-    "sha": "",
+    "version": "24.12.0.0",
+    "sha": "9ace834212bd2d285a9d19f2e69af5f771a8acc6",
     "nodeVersion": "",
-    "buildName": "10391",
+    "buildName": "10453",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/libagent/libagent-connector.js

@@ -174,6 +174,12 @@ LibagentConnector.prototype.init = function () {
 
     self.agent.transactionSender.isEnabled = true;
   });
+
+  self.libagent.delegate.on('sepDropped', function (guid) {
+    var profiler = self.agent.profiler;
+    profiler.sepDropped(guid);
+  });
+
   self.libagent.delegate.on('transactionDropped', function (guid) {
     var profiler = self.agent.profiler;
     profiler.transactionDropped(guid);
@@ -229,6 +235,33 @@ LibagentConnector.prototype.stopBusinessTransaction = function (transaction) {
   self.libagent.stopBusinessTransaction(transaction.btGuid);
 };
 
+LibagentConnector.prototype.startServiceEndpoint = function (entryPointType, request) {
+  var self = this;
+  return self.libagent.startServiceEndpoint(entryPointType, request);
+};
+
+LibagentConnector.prototype.stopServiceEndpoint = function (sep) {
+  var self = this;
+
+  if(!self.agent.profiler.isValidSepThreadId(sep.threadId)) {
+    return;
+  }
+
+  if (sep.error) {
+    var name = self.protobufModel.extractErrorName(sep.error);
+    if (!name) {
+      name = "";
+    }
+    var message = self.protobufModel.extractErrorMessage(sep.error);
+    if (!message) {
+      message = "";
+    }
+
+    self.libagent.addErrorToEndpoint(sep.sepGuid, name, message);
+  }
+
+  self.libagent.stopServiceEndpoint(sep.sepGuid);
+};
 
 LibagentConnector.prototype.startExitCall = function (transaction, exitCall) {
   var self = this;

package/lib/libagent/transaction-sender.js

@@ -22,6 +22,29 @@ TransactionSender.prototype.init = function() {
     self.isEnabled = true;
   });
 
+  self.agent.on("serviceEndpointStart", function(sep, req) {
+    if (!self.isEnabled) {
+      self.agent.logger.warn('serviceEndpointStart sent without enabled sender');
+      return;
+    }
+    var sepData = libagentConnector.startServiceEndpoint('NODEJS_WEB', utility.createBtNamingWrapper(req));
+
+    if (sepData === undefined || sepData.isExcluded) {
+      sep.skip = true;
+      return;
+    }
+
+    sep.skip = false;
+    sep.name = sepData.name;
+    sep.sepGuid = sepData.sepGuid;
+  });
+
+  self.agent.on("serviceEndpointStop", function(sep) {
+    if (!self.isEnabled || sep.skip) {
+      return;
+    }
+    libagentConnector.stopServiceEndpoint(sep);
+  });
 
   self.agent.on("transactionStarted", function(transaction, req) {
     if (!self.isEnabled) {
@@ -47,15 +70,15 @@ TransactionSender.prototype.init = function() {
         if('singularityheader' in req.headers) {
           corrHeader = req.headers.singularityheader || "";
         } else if(self.agent.tracer && transaction.baggageCorrHeader) {
-          /* 
-           * 1: We append the doNotResolveSubHeader when the upstream is a pure OT service to 
+          /*
+           * 1: We append the doNotResolveSubHeader when the upstream is a pure OT service to
            *    prevent resolution to the preceding APPD service
              2: The noTxDetectHeader is treated specially by libagent, so do not append the doNotResolveSubHeader
                 in this case
            */
           const noTxDetectHeader = self.agent.correlation.DISABLE_TRANSACTION_DETECTION + '=true';
           const doNotResolveSubHeader = self.agent.correlation.DONOTRESOLVE + '=true';
-          corrHeader = transaction.baggageCorrHeader != noTxDetectHeader ? transaction.baggageCorrHeader + '*' + 
+          corrHeader = transaction.baggageCorrHeader != noTxDetectHeader ? transaction.baggageCorrHeader + '*' +
                                                         doNotResolveSubHeader : transaction.baggageCorrHeader;
           self.agent.logger.debug(`Using Singularity Header from Opentelemetry Baggage ${corrHeader}`);
         }

package/lib/probes/http-common.js

@@ -10,6 +10,7 @@ module.exports.getHttpStatusCodeConfig = getHttpStatusCodeConfig;
 module.exports.generateError = generateError;
 module.exports.getHttpExitCallError = getHttpExitCallError;
 module.exports.finalizeTransaction = finalizeTransaction;
+module.exports.finalizeRequest = finalizeRequest;
 module.exports.startTransactionHandler = startTransactionHandler;
 
 
@@ -66,10 +67,30 @@ function getHttpExitCallError(statusCode, stack, locals) {
   return error;
 }
 
-
-function finalizeTransaction (err, profiler, time, transaction, req, res, span) {
+function finalizeRequest(err, profiler, time, transaction, req, res, span, sep) {
   if (!time.done()) return;
+  finalizeTransaction(err, profiler, time, transaction, req, res, span);
+  finalizeServiceEndpoint(err, profiler, time, sep, res);
+}
+
+function finalizeServiceEndpoint (err, profiler, time, sep, res) {
+  if(!sep) return;
+  sep.error = sep.error || res.error || err;
+  sep.statusCode = sep.statusCode ||
+    (sep.error && sep.error.statusCode) ||
+    (res && res.statusCode) ||
+    500;
+  sep.stackTrace = sep.stackTrace || profiler.formatStackTrace(sep.error);
+
+  var error = generateError(sep.error, sep.statusCode);
+  if (error) {
+    sep.error = error;
+  }
+  profiler.endServiceEndpoint(time, sep);
+}
+
 
+function finalizeTransaction (err, profiler, time, transaction, req, res, span) {
   transaction.error = transaction.error || res.error || err;
   transaction.statusCode = transaction.statusCode ||
     (transaction.error && transaction.error.statusCode) ||
@@ -108,7 +129,7 @@ function startTransactionHandler(req, res, agent, isHTTPs, tracer, ot_api) {
   var span = undefined;
   var baggageCorrHeader = undefined;
   var otContext = undefined;
-  
+
   if (tracer) {
     otContext = ot_api.propagation.extract(agent.TracerProvider.ot_api.ROOT_CONTEXT, req.headers);
     var baggage = ot_api.propagation.getBaggage(otContext);
@@ -151,10 +172,13 @@ function startTransactionHandler(req, res, agent, isHTTPs, tracer, ot_api) {
     });
   }
 
+  var serviceEndpoint = profiler.startServiceEndpoint(time, req, 'NODEJS_WEB');
+
   proxy.after(res, "end", function () {
-    finalizeTransaction(null, profiler, time, transaction, req, res, span);
+    finalizeRequest(null, profiler, time, transaction, req, res, span, serviceEndpoint);
     transaction = null;
+    serviceEndpoint = null;
   });
 
-  return { transaction, span, otContext };
+  return { transaction, span, otContext, serviceEndpoint };
 }

package/lib/probes/http-entry-probe.js

@@ -115,7 +115,7 @@ HttpEntryProbe.prototype.__createRequestHandler = function (callback, isHTTPs) {
 
     self.agent.metricsManager.addMetric(self.agent.metricsManager.HTTP_INCOMING_COUNT, 1);
 
-    let { transaction, span, otContext } = HttpCommon.startTransactionHandler(req, res, self.agent, isHTTPs, self.tracer, self.ot_api);
+    let { transaction, span, otContext, serviceEndpoint } = HttpCommon.startTransactionHandler(req, res, self.agent, isHTTPs, self.tracer, self.ot_api);
 
     var threadId = transaction.threadId;
     self.agent.context.run(() => {
@@ -127,7 +127,8 @@ HttpEntryProbe.prototype.__createRequestHandler = function (callback, isHTTPs) {
         let threadProxyWrappedCb = self.agent.proxy.wrapWithThreadProxyIfEnabled(callback);
         return invokeOriginal(threadProxyWrappedCb, this, arguments, self.ot_api, span, otContext, req, res);
       } catch (e) {
-        HttpCommon.finalizeTransaction(e, profiler, time, transaction, req, res, span);
+        HttpCommon.finalizeRequest(e, profiler, time, transaction, req, res, span, serviceEndpoint);
+        serviceEndpoint = null;
         transaction = null;
         throw e;
       } finally {
@@ -140,6 +141,6 @@ HttpEntryProbe.prototype.__createRequestHandler = function (callback, isHTTPs) {
   // This is needed as Express attaches a bunch of extra properties and
   // functionality, which may need to be accessed by other modules down stream.
   handler.__proto__ = callback;
-  
+
   return handler;
 };

package/lib/probes/mongodb-probe.js

@@ -283,7 +283,7 @@ MongodbProbe.prototype.attach = function (obj) {
       proxy.before(obj.MongoClient.prototype, 'connect', function(obj){
         obj.monitorCommands = true;
         var newServerPool;
-        var newOpQueue = {};
+        var newOpQueue = new Map();
         var newApmCollectionEvents = ['create', 'drop'];
         var newCollectionCommandMap = {
           'create': 'createCollection',
@@ -306,13 +306,13 @@ MongodbProbe.prototype.attach = function (obj) {
             newServerPool = [event.address];
           }
           if (newServerPool) {
-            if (!newOpQueue[requestId]) {
-              newOpQueue[requestId] = {
+            if (!newOpQueue.has(requestId)) {
+              newOpQueue.set(requestId, {
                 time: profiler.time(),
                 serverPool: newServerPool
-              };
+              });
             }
-            newRequest = newOpQueue[requestId];
+            newRequest = newOpQueue.get(requestId);
             newCommandQuery = event.command.filter;
             if (event.command.filter && Object.prototype.toString.call(event.command.filter) == "[object Object]") {
               newCommandQuery = utility.filterSensitiveDataFromObject(utility.deepCopy(event.command.filter));
@@ -334,18 +334,18 @@ MongodbProbe.prototype.attach = function (obj) {
         });
 
         obj.on('commandSucceeded', function (event) {
-          var requestId = event.requestId, newRequest = newOpQueue[requestId];
+          var requestId = event.requestId, newRequest = newOpQueue.get(requestId);
           if (newRequest) {
             self.addExitCall(newRequest.time, newRequest.exitCall);
-            newOpQueue[requestId] = undefined;
+            newOpQueue.delete(requestId);
           }
         });
 
         obj.on('commandFailed', function (event) {
-          var requestId = event.requestId, newRequest = newOpQueue[requestId];
+          var requestId = event.requestId, newRequest = newOpQueue.get(requestId);
           if (newRequest) {
             self.addExitCall(event.time, event.exitCall, event.failure);
-            newOpQueue[requestId] = undefined;
+            newOpQueue.delete(requestId);
           }
         });
       });

package/lib/profiler/profiler.js

@@ -19,6 +19,7 @@ function Profiler(agent) {
   this.agent = agent;
 
   this.transactions = {};
+  this.serviceEndpoints = {};
   this.stackTraceFilter = /appdynamics/;
 }
 exports.Profiler = Profiler;
@@ -83,6 +84,43 @@ Profiler.prototype.formatStackTrace = function (err) {
   return undefined;
 };
 
+Profiler.prototype.startServiceEndpoint = function(time, req, entryType) {
+  var self = this;
+  var sep = {};
+  sep.time = time;
+  sep.id = time.id;
+  sep.threadId = time.threadId;
+  sep.entryType = entryType;
+
+  self.serviceEndpoints[time.threadId] = sep;
+
+  try {
+    self.agent.emit('serviceEndpointStart', sep, req);
+  } catch (err) {
+    self.agent.logger.warn(err);
+  }
+
+  return sep;
+};
+
+Profiler.prototype.endServiceEndpoint = function (time, sep) {
+  var self = this;
+
+  if (sep.isFinished) {
+    return;
+  }
+
+  sep.isFinished = true;
+  sep.ms = time.ms;
+
+  try {
+    self.agent.emit('serviceEndpointStop', sep);
+  } catch (err) {
+    self.agent.logger.warn(err);
+  }
+
+  delete self.serviceEndpoints[time.threadId];
+};
 
 Profiler.prototype.startTransaction = function(time, req, entryType, baggageCorrHeader) {
   var self = this;
@@ -184,6 +222,11 @@ Profiler.prototype.isValidThreadId = function(threadId) {
   return (threadId && self.transactions[threadId]);
 };
 
+Profiler.prototype.isValidSepThreadId = function(threadId) {
+  var self = this;
+  return (threadId && self.serviceEndpoints[threadId]);
+};
+
 Profiler.prototype._endTransaction = function (time, transaction) {
   var self = this;
 
@@ -217,6 +260,18 @@ Profiler.prototype.transactionDropped = function (guid) {
   }
 };
 
+Profiler.prototype.sepDropped = function (guid) {
+  var self = this;
+
+  for (var threadId in self.serviceEndpoints) {
+    if (self.serviceEndpoints[threadId].sepGuid === guid) {
+      self.agent.logger.info('SEP ' + self.serviceEndpoints[threadId].id + ' dropped');
+      delete self.serviceEndpoints[threadId];
+      break;
+    }
+  }
+};
+
 Profiler.prototype.__getNextSequenceInfo = function (transaction) {
   var self = this;
   transaction.exitCallCounter++;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.10.0",
+    "version": "24.12.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -51,9 +51,9 @@
         "https-proxy-agent": "^5.0.1",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
         "semver": "7.5.4"

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.10.0",
+    "version": "24.12.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -51,9 +51,9 @@
         "https-proxy-agent": "^5.0.1",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.10.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.12.0.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
         "semver": "7.5.4"