appdynamics 25.9.0 → 25.12.1

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "25.9.0.0",
-    "sha": "3e946d481b36d94a72add4b68a061585c2e7e168",
+    "version": "25.12.1.0",
+    "sha": "b6a0faadd4b9487291a9f9adee325eff24432d63",
     "nodeVersion": "",
-    "buildName": "10973",
+    "buildName": "11096",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -229,8 +229,7 @@ Agent.prototype.init = function (opts) {
     self.backendConnector = new LibAgent(this);
 
     // agent_deployment_mode = 'appd' || 'dual' || 'hybrid'
-    let agent_deployment_mode = opts.agent_deployment_mode || process.env.agent_deployment_mode;
-    if(agent_deployment_mode == 'dual' || opts.openTelemetry && opts.openTelemetry.enabled) {
+    if(self.opts.agent_deployment_mode == 'dual' || opts.openTelemetry && opts.openTelemetry.enabled) {
       const url = require('url');
       let collectorEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
       let collectorEndpointUrl = url.parse(collectorEndpoint);
@@ -240,11 +239,24 @@ Agent.prototype.init = function (opts) {
       };
       try {
         const { start } = require('@splunk/otel');
-        start();
+        const OtelConfig = require('./otel-config');
+        start({
+          resource: (detectedResource) =>
+            detectedResource.merge(new OtelConfig(opts).configResource()),
+        });
       }
       catch (err) {
         self.logger.error('AppDynamics dual mode could not be started ' + err);
       }
+    } else if (self.opts.agent_deployment_mode == 'otel') {
+      try {
+        const { start } = require('@splunk/otel');
+        start();
+      }
+      catch (err) {
+        self.logger.error('AppDynamics splunk mode could not be started ' + err);
+      }
+      return;
     }
 
     self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(self, isEnabled));
@@ -439,7 +451,9 @@ Agent.prototype.initializeOpts = function (opts) {
   if (self.opts.analyticsMaxMessageSizeInBytes === undefined && process.env.APPDYNAMICS_ANALYTICS_MAX_MESSAGE_SIZE) {
     self.opts.analyticsMaxMessageSizeInBytes = parseInt(process.env.APPDYNAMICS_ANALYTICS_MAX_MESSAGE_SIZE, 10);
   }
-
+  if (self.opts.agent_deployment_mode === undefined && process.env.agent_deployment_mode) {
+    self.opts.agent_deployment_mode = process.env.agent_deployment_mode;
+  }
 };
 
 Agent.prototype.fetchMetadata = function (cb) {

package/lib/core/otel-config.js

@@ -0,0 +1,65 @@
+/*
+Copyright (c) AppDynamics, Inc., and its affiliates
+2015
+All Rights Reserved
+ */
+
+const { Resource } = require('@opentelemetry/resources');
+
+module.exports = OtelConfig;
+
+function OtelConfig(opts) {
+  this.resourceAttributes = this.parseResourceAtributes();
+  this.tierName = opts.tierName || process.env.APPDYNAMICS_AGENT_TIER_NAME;
+  this.applicationName = opts.applicationName || process.env.APPDYNAMICS_AGENT_APPLICATION_NAME;
+  this.accountName = opts.accountName || process.env.APPDYNAMICS_AGENT_ACCOUNT_NAME;
+  this.DEPLOYMENT_ENVIRONMENT_NAME = "deployment.environment.name";
+  this.SERVICE_NAME = "service.name";
+  this.SERVICE_NAMESPACE = "service.namespace";
+}
+
+OtelConfig.prototype.parseResourceAtributes = function() {
+  let resourceAttributes = {};
+  if(process.env.OTEL_RESOURCE_ATTRIBUTES != null) {
+    let parseResourceAttrs = process.env.OTEL_RESOURCE_ATTRIBUTES.split(',');
+    for(const attr of parseResourceAttrs) {
+      let pairs = attr.split('=');
+      if(pairs.length == 2) {
+        resourceAttributes[pairs[0]] = pairs[1];
+      }
+    }
+  }
+  return resourceAttributes;
+};
+
+OtelConfig.prototype.configResource = function() {
+  let resource = {};
+  this.updateServiceNamespace(this.resourceAttributes, resource);
+  this.updateServiceName(this.resourceAttributes, resource);
+  this.updateDeploymentEnviromentName(this.resourceAttributes, resource);
+  return new Resource(resource);
+};
+
+OtelConfig.prototype.updateServiceNamespace = function(attrs, resource) {
+  if(attrs[this.SERVICE_NAMESPACE] != null) {
+    return;
+  } else {
+    resource[this.SERVICE_NAMESPACE] = this.applicationName;
+  }
+};
+
+OtelConfig.prototype.updateServiceName = function(attrs, resource) {
+  if(process.env['OTEL_SERVICE_NAME'] != null || attrs[this.SERVICE_NAME] != null) {
+    return;
+  } else {
+    resource[this.SERVICE_NAME] = this.tierName;
+  }
+};
+
+OtelConfig.prototype.updateDeploymentEnviromentName = function(attrs, resource) {
+  if(attrs[this.DEPLOYMENT_ENVIRONMENT_NAME] != null) {
+    return;
+  } else {
+    resource[this.DEPLOYMENT_ENVIRONMENT_NAME] = this.accountName;
+  }
+};

package/lib/libagent/libagent-connector.js

@@ -191,6 +191,11 @@ LibagentConnector.prototype.startBusinessTransaction = function (entryPointType,
   return self.libagent.startBusinessTransaction(entryPointType, optionalName, corrHeader, callback, isHttpRequest);
 };
 
+LibagentConnector.prototype.dropBusinessTransaction = function (transaction) {
+  var self = this;
+  self.libagent.dropBusinessTransaction(transaction);
+};
+
 LibagentConnector.prototype.stopBusinessTransaction = function (transaction) {
   var self = this;
 

package/lib/libagent/libagent.js

@@ -242,6 +242,12 @@ LibAgent.prototype.startProcessSnapshot = function() {
   self.agent.libagentConnector.startProcessSnapshot();
 };
 
+LibAgent.prototype.dropBusinessTransaction = function(transaction) {
+  var self = this;
+  self.agent.libagentConnector.dropBusinessTransaction(transaction);
+};
+
+
 LibAgent.prototype.setRequiresNamingRules = function (flag) {
   var self = this;
   self.agent.setRequiresNamingRules(flag);

package/lib/probes/redis-probe.js

@@ -21,9 +21,8 @@ function wrapExecutor(self, executor) {
     var locals = {};
     locals.time = profiler.time();
     locals.args = args;
-    var urlParsed = new url.URL(this.options.url);
-    var host = urlParsed.host;
-    locals.exitCall = self.createExitCall(host, name, args);
+    var address = self.getAddress(this.options);
+    locals.exitCall = self.createExitCall(address, name, args);
 
     var val = executor.call(this, command, args, name);
     var currentCtxt = self.agent.thread.current();
@@ -44,6 +43,19 @@ function proxyAttachCommands(self, originalObject) {
   };
 }
 
+RedisProbe.prototype.getAddress = function(options) {
+  var address = 'localhost:6379';
+  if(options && options.url) {
+    var urlParsed = new url.URL(options.url);
+    address = urlParsed.host;
+  } else if (options && options.socket) {
+    var host = options.socket.host || 'localhost';
+    var port = options.socket.port || '6379';
+    address = host + ':' + port;
+  }
+  return address;
+};
+
 RedisProbe.prototype.attachRelative = function(mod, args, obj) {
   var self = this;
 

package/lib/probes/winston-probe.js

@@ -28,10 +28,12 @@ WinstonProbe.prototype.attach = function (obj) {
     "write",
     (obj, args) => this.handleLogWrite(obj, args)
   );
+  self.agent.logger.debug('Attached Winston interceptor');
 };
 
 WinstonProbe.prototype.handleLogWrite = function (obj, args) {
   let self = this;
+  self.agent.logger.debug('Winston log write intercepted');
 
   const threadId =  self.agent.profiler.time().threadId;
   const txn = self.agent.profiler.getTransaction(threadId);
@@ -45,10 +47,12 @@ WinstonProbe.prototype.handleLogWrite = function (obj, args) {
   }
 
   if(!txn) {
+    self.agent.logger.debug('Winston Probe: No active txn Skipping');
     return;
   }
 
   if(process.env.appdynamics_log_metadata_enrichment  || self.agent.libagentConnector.getNodeProperty("enable-log-metadata-enrichment")) {
+    self.agent.logger.debug('Winston Probe: Decorate Log message');
     return self.decorateMessage(args, txn, txnBtId);
   }
 };
@@ -61,8 +65,10 @@ WinstonProbe.prototype.decorateMessage = function (args, txn, btId) {
 
     let txnGuid = txn && txn.guid ? txn.guid : '';
     if(self.hasMetadataDefined(logMessage)) {
+      self.agent.logger.debug('Winston Probe: Log with Metadata');
       self.updateMetadata(logMessage, txnGuid, btId);
     } else {
+      self.agent.logger.debug('Winston Probe: No metadata on log, update log message');
       var decorator = self.createDecorator(txnGuid, btId);
       if(decorator) {
         logMessage.message = decorator + ' ' + logMessage.message;

package/lib/profiler/profiler.js

@@ -34,7 +34,8 @@ Profiler.prototype.init = function () {
     var now = Date.now();
     for (var threadId in self.transactions) {
       if (self.transactions[threadId].touched + 300000 < now) {
-        self.agent.logger.info('transaction ' + self.transactions[threadId].id + ' dropped');
+        self.agent.logger.info('Profiler transaction ' + self.transactions[threadId].id + ' dropped');
+        self.agent.backendConnector.dropBusinessTransaction(self.transactions[threadId].btGuid);
         delete self.transactions[threadId];
       }
     }
@@ -253,7 +254,7 @@ Profiler.prototype.transactionDropped = function (guid) {
 
   for (var threadId in self.transactions) {
     if (self.transactions[threadId].guid === guid) {
-      self.agent.logger.info('transaction ' + self.transactions[threadId].id + ' dropped');
+      self.agent.logger.info('Libagent transaction ' + self.transactions[threadId].id + ' dropped');
       delete self.transactions[threadId];
       break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "25.9.0",
+    "version": "25.12.1",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -25,28 +25,40 @@
     ],
     "main": "./index.js",
     "scripts": {
-        "preinstall": "node preInstallScript.js"
+        "compileDependency": "node buildScripts/dest/compileDependency.js",
+        "standAloneAgent": "node buildScripts/dest/createStandAloneAgent.js",
+        "runGradleTask": "node buildScripts/dest/runGradleTask.js",
+        "createMasterTar": "node buildScripts/dest/createMasterTarFile.js",
+        "testStandalone": "node buildScripts/dest/runStandaloneAgent.js",
+        "testAgentInstallBeforePublish": "node buildScripts/dest/testAgentInstallBeforePublish.js"
     },
     "directories": {
         "lib": "./lib"
     },
     "optionalDependencies": {
-        "n": "^6.8.0",
-        "@splunk/otel": "3.0.1"
+        "n": "^6.8.0"
     },
     "dependencies": {
+        "@opentelemetry/api": "^1.8.0",
+        "@opentelemetry/api-logs": "^0.57.0",
+        "@opentelemetry/context-async-hooks": "^2.0.1",
+        "@opentelemetry/core": "^1.3.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.57.0",
+        "@opentelemetry/exporter-logs-otlp-proto": "^0.57.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
+        "@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
         "@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/25.9.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
-        "semver": "7.5.4"
+        "semver": "7.5.4",
+        "@grpc/grpc-js": ">=1.10.9"
     },
     "engines": {
         "node": ">=12 <=v22.*"

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "25.9.0",
+    "version": "25.12.1",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -25,28 +25,40 @@
     ],
     "main": "./index.js",
     "scripts": {
-        "preinstall": "node preInstallScript.js"
+        "compileDependency": "node buildScripts/dest/compileDependency.js",
+        "standAloneAgent": "node buildScripts/dest/createStandAloneAgent.js",
+        "runGradleTask": "node buildScripts/dest/runGradleTask.js",
+        "createMasterTar": "node buildScripts/dest/createMasterTarFile.js",
+        "testStandalone": "node buildScripts/dest/runStandaloneAgent.js",
+        "testAgentInstallBeforePublish": "node buildScripts/dest/testAgentInstallBeforePublish.js"
     },
     "directories": {
         "lib": "./lib"
     },
     "optionalDependencies": {
-        "n": "^6.8.0",
-        "@splunk/otel": "3.0.1"
+        "n": "^6.8.0"
     },
     "dependencies": {
+        "@opentelemetry/api": "^1.8.0",
+        "@opentelemetry/api-logs": "^0.57.0",
+        "@opentelemetry/context-async-hooks": "^2.0.1",
+        "@opentelemetry/core": "^1.3.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.57.0",
+        "@opentelemetry/exporter-logs-otlp-proto": "^0.57.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
+        "@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
         "@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/25.9.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.12.1.0/appdynamics-protobuf-node.tgz"
     },
     "overrides": {
-        "semver": "7.5.4"
+        "semver": "7.5.4",
+        "@grpc/grpc-js": ">=1.10.9"
     },
     "engines": {
         "node": ">=12 <=v22.*"

package/preInstallScript.js

@@ -1,6 +0,0 @@
-var nodeVersionParts = process.version.split(".");
-if(parseInt(nodeVersionParts[0].substring(1), 10) < 8) {
-  console.log("This version of Appdynamics agent only supports Node.js 8.0 and above. \n"
-            + "For older versions of Node.js please use the AppDynamics agent 4.5.11 by installing with 'npm install appdynamics@4.5.11'");
-  process.exit(1);
-}