appdynamics 24.12.0 → 25.9.0

package/README.md

@@ -70,4 +70,3 @@ For more information, see [Install the Node.js Agent](https://docs.appdynamics.c
 <br />
 
 Copyright (c) AppDynamics, Inc. 2021 CA. All rights reserved.
-

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "24.12.0.0",
-    "sha": "9ace834212bd2d285a9d19f2e69af5f771a8acc6",
+    "version": "25.9.0.0",
+    "sha": "3e946d481b36d94a72add4b68a061585c2e7e168",
     "nodeVersion": "",
-    "buildName": "10453",
+    "buildName": "10973",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -55,7 +55,7 @@ function Agent() {
   this.initialized = false;
   this.version = agentVersion.version;
   this.compatibilityVersion = agentVersion.compatibilityVersion;
-  this.nextId = Math.round(Math.random() * Math.pow(10, 6));
+  this.nextId = parseInt(crypto.randomBytes(4).toString('hex'), 16) % 1e6;
   this.appdNative = undefined;
   this.meta = [];
 
@@ -124,8 +124,7 @@ Agent.prototype.recursiveMkDir = function (dir) {
   var dirsToMake = [];
   var currDir = path.normalize(dir);
   var parentDir = path.dirname(currDir);
-  var controlVar = true;
-  while (controlVar) {
+  while (currDir !== parentDir) {
     if (fs.existsSync(currDir))
       break;
     dirsToMake.push(currDir);
@@ -229,17 +228,25 @@ Agent.prototype.init = function (opts) {
 
     self.backendConnector = new LibAgent(this);
 
-    if (opts.openTelemetry && opts.openTelemetry.enabled) {
-      var TracerProvider = require('./opentelemetry-tracer');
-      self.TracerProvider = new TracerProvider(self.logger);
-      if (!self.TracerProvider.register(opts)) {
-        self.logger.error('AppDynamics agent cannot be started: Tracer Provider registration has failed');
-        return;
+    // 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) {
+      const url = require('url');
+      let collectorEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
+      let collectorEndpointUrl = url.parse(collectorEndpoint);
+      self.opts.dualModeConfig = {
+        collectorHost: collectorEndpointUrl.hostname,
+        collectorPort: collectorEndpointUrl.port,
+      };
+      try {
+        const { start } = require('@splunk/otel');
+        start();
+      }
+      catch (err) {
+        self.logger.error('AppDynamics dual mode could not be started ' + err);
       }
-      self.tracer = self.TracerProvider.getTracer('appdynamics-tracer');
     }
 
-
     self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(self, isEnabled));
 
     self.precompiled = opts.precompiled === undefined || opts.precompiled;
@@ -734,4 +741,3 @@ exports = module.exports = new AppDynamics();
 
 // export for testing
 exports._setMetadataFile = setMetadataFile;
-

package/lib/core/opentelemetry-tracer.js

@@ -17,7 +17,8 @@ module.exports = TracerProvider;
 function TracerProvider(logger) {
   this.host = 'localhost';
   this.port = '4318';
-  this.url = `http://${this.host}:${this.port}/v1/traces`;
+  this.url = process.env.OTEL_EXPORTER_OTLP_ENDPOINT ? process.env.OTEL_EXPORTER_OTLP_ENDPOINT + '/v1/traces'
+             : `http://${this.host}:${this.port}/v1/traces`;
   this.ot_api = opentelemetry_api;
   this.ROOT_CONTEXT = ROOT_CONTEXT;
   this.logger = logger;
@@ -42,7 +43,7 @@ TracerProvider.prototype.register = function(config) {
     [SemanticResourceAttributes.SERVICE_NAMESPACE]: config.applicationName,
     [SemanticResourceAttributes.CONTAINER_ID]: ""
   };
-  
+
   const mergedResource = new Resource(configResourceAttributes)
   .merge(envResource)
   .merge(processResource)

package/lib/libagent/transaction-sender.js

@@ -102,6 +102,7 @@ TransactionSender.prototype.init = function() {
     transaction.eumEnabled = txData.eumEnabled;
     transaction.isHttpRequest = isHttpRequest;
 
+    self.agent.logger.debug('Started Txn with TxnGuid: ' + transaction.guid + ' id: ' + transaction.id);
     if (libagentConnector.isSnapshotRequired(transaction)) {
       libagentConnector.emit("autoProcessSnapshot");
     }
@@ -122,6 +123,7 @@ TransactionSender.prototype.init = function() {
       }
     }
 
+    self.agent.logger.debug('Stopped Txn with TxnGuid: ' + transaction.guid + ' id: ' + transaction.id);
     libagentConnector.stopBusinessTransaction(transaction);
   });
 
@@ -131,6 +133,7 @@ TransactionSender.prototype.init = function() {
       return;
     }
 
+    self.agent.logger.debug('Started Exitcall with TxnGuid: ' + transaction.guid + ' id: ' + transaction.id);
     libagentConnector.startExitCall(transaction, exitCall);
   });
 
@@ -140,6 +143,7 @@ TransactionSender.prototype.init = function() {
       return;
     }
 
+    self.agent.logger.debug('Stopped Exitcall with TxnGuid: ' + transaction.guid + ' id: ' + transaction.id);
     libagentConnector.stopExitCall(exitCall, error);
   });
 };

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

@@ -1,5 +1,5 @@
 /*
-This is for apollo-server entry probe 
+This is for apollo-server entry probe
 */
 
 let HttpCommon = require("./http-common");
@@ -16,6 +16,10 @@ ApolloEntryProbe.prototype.attach = function (obj, moduleName) {
 
   let self = this;
 
+  if(process.env.APPDYNAMICS_APOLLO_PROBE_DISABLE == true || process.env.APPDYNAMICS_APOLLO_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(moduleName == 'apollo-server') {
     self.agent.proxy.before(
       obj.ApolloServer.prototype,
@@ -29,7 +33,7 @@ ApolloEntryProbe.prototype.attach = function (obj, moduleName) {
 
     overriddenObject.ApolloServer = proxyApolloServer(self, originalObject);
     return overriddenObject;
-    
+
   } else if(moduleName === '@apollo/server/express4') {
     const originalObject = obj;
     const overriddenObject = {};
@@ -40,7 +44,7 @@ ApolloEntryProbe.prototype.attach = function (obj, moduleName) {
   } else if(moduleName === '@apollo/server/standalone'){
     const originalObject = obj;
     const overriddenObject = {};
-  
+
     overriddenObject.startStandaloneServer = proxyStartStandaloneServer(self, originalObject);
     overriddenObject.__proto__ = originalObject;
     return overriddenObject;
@@ -106,7 +110,7 @@ function appDynamicsApolloServerPlugin(self) {
           }
           requestContext.contextValue.gqlReq.graphqlop = requestContext.operationName;
           requestContext.contextValue.gqlReq.transactionStarted = true;
-          
+
           HttpCommon.startTransactionHandler(
             requestContext.contextValue.gqlReq,
             requestContext.contextValue.gqlRes,

package/lib/probes/cassandra-probe.js

@@ -20,6 +20,10 @@ CassandraProbe.prototype.attach = function(obj) {
   var proxy = self.agent.proxy;
   var profiler = self.agent.profiler;
 
+  if(process.env.APPDYNAMICS_CASSANDRA_PROBE_DISABLE == true || process.env.APPDYNAMICS_CASSANDRA_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/cluster-probe.js

@@ -20,6 +20,10 @@ exports.ClusterProbe = ClusterProbe;
 ClusterProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_CLUSTER_PROBE_DISABLE == true || process.env.APPDYNAMICS_CLUSTER_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/couchbase-probe.js

@@ -18,6 +18,10 @@ exports.CouchBaseProbe = CouchBaseProbe;
 CouchBaseProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_COUCHBASE_PROBE_DISABLE == true || process.env.APPDYNAMICS_COUCHBASE_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {
@@ -49,12 +53,15 @@ CouchBaseProbe.prototype.attach = function(obj) {
         function(obj, args, locals) {
           locals.time = self.agent.profiler.time();
           locals.methodHasCb = proxy.callback(args, -1, function() {}, null, self.agent.thread.current());
-  
+
           var bucketName, addresses;
           var couchBaseBucket = obj._scope._bucket; // ???
           bucketName = couchBaseBucket.name;
           addresses = couchBaseBucket._cluster._connStr || '';
-          addresses = (addresses.match(/(?:.*:\/\/)?([^/?]+)/)[1] || '').split(',');
+
+          var matches = addresses.match(/^(?:https?:\/\/)?([^/?]+)/);
+          var domain = matches ? matches[1] : '';
+          addresses = domain.split(',');
   
           var command = cmd;
           var commandArgs = args;
@@ -74,7 +81,9 @@ CouchBaseProbe.prototype.attach = function(obj) {
         var addresses;
         var bucketName = Object.keys(obj._conns);
         addresses = obj._connStr || '';
-        addresses = (addresses.match(/(?:.*:\/\/)?([^/?]+)/)[1] || '').split(',');
+        var matches = addresses.match(/^(?:https?:\/\/)?([^/?]+)/);
+        var domain = matches ? matches[1] : '';
+        addresses = domain.split(',');
 
         var command = 'query';
         var commandArgs = args;

package/lib/probes/disk-probe.js

@@ -18,6 +18,10 @@ exports.DiskProbe = DiskProbe;
 DiskProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_DISK_PROBE_DISABLE == true || process.env.APPDYNAMICS_DISK_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/dynamodb-probe.js

@@ -16,6 +16,10 @@ exports.DynamoDbProbe = DynamoDbProbe;
 DynamoDbProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_DYNAMODB_PROBE_DISABLE == true || process.env.APPDYNAMICS_DYNAMODB_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/express-probe.js

@@ -28,6 +28,10 @@ ExpressProbe.prototype.attach = function(obj) {
   var self = this,
     proxy = self.agent.proxy;
 
+  if(process.env.APPDYNAMICS_EXPRESS_PROBE_DISABLE == true || process.env.APPDYNAMICS_EXPRESS_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) {
     return obj.__appdynamicsWrapperFn;
   }

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

@@ -42,6 +42,10 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
     obj = obj.globalAgent;
   }
 
+  if (typeof global.fetch === 'function' && !global.fetch.__appdynamicsProxyInfo__) {
+    self.instrumentFetch();
+  }
+
   function clientCallback(locals) {
     if (!locals.time.done()) return;
 
@@ -70,7 +74,7 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
 
     var [input, options] = args;
 
-    if (typeof(input) != 'string' && !(input instanceof url.URL)) {
+    if (typeof (input) != 'string' && !(input instanceof url.URL)) {
       options = input;
       input = null;
     } else if (!options) {
@@ -78,7 +82,7 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
       args[1] = options;
     }
 
-    if(typeof(options) == 'function') {
+    if (typeof (options) == 'function') {
       args[2] = options;
       options = {};
       args[1] = options;
@@ -110,15 +114,17 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
     }
 
     var isOtPath = self.agent.TracerProvider && locals.opts.hostname == self.agent.TracerProvider.host
-                   && locals.opts.port == self.agent.TracerProvider.port;
+      && locals.opts.port == self.agent.TracerProvider.port;
+    var isDualMode = self.agent.opts.dualModeConfig && self.agent.opts.dualModeConfig.collectorHost == locals.opts.hostname;
     var isDynamoDBReq = options.headers && options.headers['X-Amz-Target'] && options.headers['X-Amz-Target'].indexOf('DynamoDB') > -1;
-    if (options.appdIgnore || isDynamoDBReq || isRepeatForHttps || isOtPath) {
+    if (options.appdIgnore || isDynamoDBReq || isRepeatForHttps || isOtPath || isDualMode) {
       // (ignore internal HTTP calls, e.g. to Analytics Agent, DynamoDB calls)
       self.agent.logger.debug('Skipping HTTP exit call for the transaction.' +
         'AppdIgnore is: ' + options.appdIgnore + ' ' +
         'DynamoDB call is:' + isDynamoDBReq + ' ' +
         'HTTPS call is:' + isRepeatForHttps + ' ' +
-        'isOtPath is :' + isOtPath);
+        'isOtPath is :' + isOtPath + ' ' +
+        'isDualMode is :' + isDualMode);
     } else {
       self.agent.logger.debug('Gatheing HTTP exit call information.');
       var threadId = self.agent.thread.current();
@@ -144,8 +150,8 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
       var span = {};
       if (self.tracer) {
         const currentSpan = self.ot_api.trace.getSpan(self.ot_api.context.active());
-        if(currentSpan) {
-          var method = locals.opts.method ? locals.opts.method  : 'GET';
+        if (currentSpan) {
+          var method = locals.opts.method ? locals.opts.method : 'GET';
           span = self.tracer.startSpan(method + ' ' + path, {
             kind: self.ot_api.SpanKind.CLIENT,
             attributes: HttpOTUtils.getOutgoingRequestAttributes(locals.opts, args[0].headers)
@@ -211,7 +217,7 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
     function (obj, args, ret, locals) {
       var [input, options] = args;
 
-      if (typeof(input) != 'string' && !(input instanceof url.URL)) {
+      if (typeof (input) != 'string' && !(input instanceof url.URL)) {
         options = input;
         input = null;
       }
@@ -245,7 +251,7 @@ HttpExitProbe.prototype.attach = function (obj, moduleName) {
             var ot_context = self.ot_api.context.active();
             if (correlationHeaderValue) {
               var baggage = self.ot_api.propagation.getBaggage(ot_context) || {};
-              baggage[self.agent.correlation.HEADER_NAME] = {value: correlationHeaderValue};
+              baggage[self.agent.correlation.HEADER_NAME] = { value: correlationHeaderValue };
               ot_context = self.ot_api.propagation.setBaggage(ot_context, self.ot_api.propagation.createBaggage(baggage));
             }
 
@@ -321,3 +327,98 @@ HttpExitProbe.prototype.setHttpDefaults = function (locals, spec, opts, protocol
     || ((protocol === 'https') ? 443 : 80);
   locals.opts.path = locals.opts.path || '/';
 };
+
+
+HttpExitProbe.prototype.instrumentFetch = function () {
+  const self = this;
+
+  const profiler = self.agent.profiler;
+  const proxy = self.agent.proxy;
+
+  proxy.around(
+    global,
+    ['fetch'],
+    function beforeFetch(_, args, locals) {
+      let [input, options = {}] = args;
+      const parsedUrl = typeof input === 'string' ? new url.URL(input) : input instanceof url.URL ? input : new url.URL(input.url);
+      const method = (options.method || 'GET').toUpperCase();
+
+      self.setHttpDefaults(locals, parsedUrl, args[1], parsedUrl.protocol === 'https:' ? 'https' : 'http');
+
+      locals.time = profiler.time();
+
+      self.agent.logger.debug('Instrumenting fetch request for endpoint: ' +
+        `${method} ${parsedUrl.hostname}:${parsedUrl.port || (parsedUrl.protocol === 'https:' ? 443 : 80)}${parsedUrl.pathname}`);
+      self.agent.metricsManager.addMetric(self.agent.metricsManager.HTTP_OUTGOING_COUNT, 1);
+
+      locals.exitCall = profiler.createExitCall(locals.time, {
+        exitType: 'EXIT_HTTP',
+        supportedProperties: {
+          'HOST': locals.opts.hostname,
+          'PORT': locals.opts.port,
+          'URL': locals.opts.path,
+        },
+        stackTrace: profiler.stackTrace(),
+        group: method,
+        method,
+        command: `${locals.opts.hostname}:${locals.opts.port}${locals.opts.path}`,
+        category: ['POST', 'PUT'].includes(method) ? 'write' : 'read',
+        protocol: parsedUrl.protocol,
+      });
+
+      if (!locals.exitCall) return;
+
+      Error.captureStackTrace(locals.exitCall);
+
+      let correlationHeaderValue = undefined;
+      if (locals.exitCall) {
+        correlationHeaderValue = self.agent.backendConnector.getCorrelationHeader(locals.exitCall);
+      }
+
+      if ((typeof options === 'object' && options.headers == undefined)) {
+        options.headers = {};
+      }
+
+      if (correlationHeaderValue) {
+        args[1].headers = Object.assign(args[1].headers, {
+          [self.agent.correlation.HEADER_NAME]: correlationHeaderValue
+        });
+      }
+
+      return args;
+    },
+    function afterFetch(_, args, response, locals) {
+      if (!response || !response.data) {
+        return;
+      }
+
+      const res = response.data;
+      locals.res = res;
+
+      if (res.status < 200 || res.status >= 400) {
+        locals.error = new Error(`HTTP error! Status: ${res.status} - ${res.statusText}`);
+      }
+      self.finalizeClientCallback(profiler, locals);
+      return;
+    }
+  );
+};
+
+//replace the original function with this in the next commit after 24.12 release
+HttpExitProbe.prototype.finalizeClientCallback = function (profiler, locals) {
+  if (!locals.time.done()) return;
+
+  var exitCall = locals.exitCall;
+  var error = locals.error;
+
+  if (exitCall) {
+    if (locals.res) {
+      exitCall.responseHeaders = locals.res.headers;
+      exitCall.statusCode = ~~locals.res.status || ~~locals.res.statusCode;
+      if ((!error) && ((exitCall.statusCode < 200) || (exitCall.statusCode >= 400))) {
+        error = HttpCommon.getHttpExitCallError(exitCall.statusCode, exitCall.stack, locals);
+      }
+    }
+    profiler.addExitCall(locals.time, exitCall, error);
+  }
+};

package/lib/probes/http-probe.js

@@ -33,6 +33,10 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
   var self = this;
   var proxy = this.agent.proxy;
 
+  if(process.env.APPDYNAMICS_HTTP_PROBE_DISABLE == 'true' || process.env.APPDYNAMICS_HTTP_PROBE_DISABLE == true) {
+    return;
+  }
+
   if (obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
 
@@ -47,7 +51,7 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
       }
     });
   }
-  
+
   if (moduleName === 'express-graphql') {
     if (self.agent.opts.enableGraphQL) {
       this.entryProbe.enableGraphQL(obj);
@@ -77,7 +81,11 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
       this.entryProbe.enableGraphQLHttp(obj);
     }
   } else {
-    this.entryProbe.attach(obj, moduleName);
-    this.exitProbe.attach(obj, moduleName);
+    if(process.env.APPDYNAMICS_HTTP_ENTRY_PROBE_DISABLE != 'true' && process.env.APPDYNAMICS_HTTP_ENTRY_PROBE_DISABLE != true) {
+      this.entryProbe.attach(obj, moduleName);
+    }
+    if(process.env.APPDYNAMICS_HTTP_EXIT_PROBE_DISABLE != 'true' && process.env.APPDYNAMICS_HTTP_EXIT_PROBE_DISABLE != true) {
+      this.exitProbe.attach(obj, moduleName);
+    }
   }
 };

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

@@ -69,7 +69,7 @@ function buildEumCookie(agent, transaction, responseHeaders, request)
 {
   var response = {headers: responseHeaders,
                   setHeader: function(key, value) { this.headers[key] = value; },
-                  getHeader: function(key) { this.headers[key]; }};
+                  getHeader: function(key) { return this.headers[key]; }};
   var eumCookie = agent.eum.newEumCookie(transaction, request, response, request.headers[":scheme"] == 'https');
   eumCookie.build();
 }

package/lib/probes/ioredis-probe.js

@@ -33,6 +33,10 @@ exports.IoredisProbe = IoredisProbe;
 IoredisProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_IOREDIS_PROBE_DISABLE == true || process.env.APPDYNAMICS_IOREDIS_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/memcached-probe.js

@@ -47,6 +47,10 @@ exports.MemcachedProbe = MemcachedProbe;
 MemcachedProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_MEMCACHED_PROBE_DISABLE == true || process.env.APPDYNAMICS_MEMCACHED_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/mongodb-probe.js

@@ -21,6 +21,10 @@ MongodbProbe.prototype.attach = function (obj) {
   var profiler = self.agent.profiler;
   var mongoObj = obj;
 
+  if(process.env.APPDYNAMICS_MONGODB_PROBE_DISABLE == true || process.env.APPDYNAMICS_MONGODB_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if (obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
 
@@ -148,7 +152,7 @@ MongodbProbe.prototype.attach = function (obj) {
     });
 
     supportedCommands.forEach(function (command) {
-      proxy.before(obj.Collection.prototype, command, withAPMBeforeHandler); 
+      proxy.before(obj.Collection.prototype, command, withAPMBeforeHandler);
       proxy.before(obj.Server.prototype, command, withAPMBeforeHandler);
       proxy.before(obj.ReplSet.prototype, command, withAPMBeforeHandler);
     });

package/lib/probes/mssql-probe.js

@@ -18,6 +18,10 @@ MssqlProbe.prototype.attach = function(obj) {
   var proxy = self.agent.proxy;
   var profiler = self.agent.profiler;
 
+  if(process.env.APPDYNAMICS_MSSQL_PROBE_DISABLE == true || process.env.APPDYNAMICS_MSSQL_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/mysql-probe.js

@@ -102,6 +102,10 @@ MysqlProbe.prototype.attach = function(obj, name) {
   var cmds = ['createClient', 'createConnection', 'createPool'];
   var mysqlConnection;
 
+  if(process.env.APPDYNAMICS_MYSQL_PROBE_DISABLE == true || process.env.APPDYNAMICS_MYSQL_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/net-probe.js

@@ -19,6 +19,10 @@ exports.NetProbe = NetProbe;
 NetProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_NET_PROBE_DISABLE == true || process.env.APPDYNAMICS_NET_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/nsolid-probe.js

@@ -20,6 +20,10 @@ NSolidProbe.prototype.attach = function(obj) {
   var agent = self.agent;
   self.nsolid = obj;
 
+  if(process.env.APPDYNAMICS_NSOLID_PROBE_DISABLE == true || process.env.APPDYNAMICS_NSOLID_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if (!agent.nsolidEnabled) return;
 
   if(obj.__appdynamicsProbeAttached__) return;

package/lib/probes/pg-probe.js

@@ -18,6 +18,10 @@ exports.PgProbe = PgProbe;
 PgProbe.prototype.attach = function(obj) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_PG_PROBE_DISABLE == true || process.env.APPDYNAMICS_PG_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/process-probe.js

@@ -17,6 +17,10 @@ ProcessProbe.prototype.attach = function(obj) {
   var proxy = this.agent.proxy;
   var thread = this.agent.thread;
 
+  if(process.env.APPDYNAMICS_PROCESS_PROBE_DISABLE == true || process.env.APPDYNAMICS_PROCESS_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   this.agent.on('destroy', function() {

package/lib/probes/redis-probe.js

@@ -46,6 +46,11 @@ function proxyAttachCommands(self, originalObject) {
 
 RedisProbe.prototype.attachRelative = function(mod, args, obj) {
   var self = this;
+
+  if(process.env.APPDYNAMICS_REDIS_PROBE_DISABLE == true || process.env.APPDYNAMICS_REDIS_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if (args[0] == '../commander') {
     var parentMod = mod.filename.split('@');
     if (parentMod.length < 2

package/lib/probes/socket.io-probe.js

@@ -20,6 +20,10 @@ SocketioProbe.prototype.attach = function(obj) {
   var self = this;
   var socketIOServer;
 
+  if(process.env.APPDYNAMICS_SOCKETIO_PROBE_DISABLE == true || process.env.APPDYNAMICS_SOCKETIO_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   self.agent.on('destroy', function() {

package/lib/probes/tedious-probe.js

@@ -11,6 +11,10 @@ TediousProbe.prototype.attach = function (obj) {
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
 
+  if(process.env.APPDYNAMICS_TEDIOUS_PROBE_DISABLE == true || process.env.APPDYNAMICS_TEDIOUS_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   let self = this;
   self.agent.on('destroy', function() {
     if(obj.__appdynamicsProbeAttached__) {

package/lib/probes/winston-probe.js

@@ -8,6 +8,11 @@ function WinstonProbe(agent) {
 WinstonProbe.prototype.init = function () {};
 
 WinstonProbe.prototype.attach = function (obj) {
+
+  if(process.env.APPDYNAMICS_WINSTON_PROBE_DISABLE == true || process.env.APPDYNAMICS_WINSTON_PROBE_DISABLE == 'true') {
+    return;
+  }
+
   if(obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
   let self = this;

package/lib/transactions/cookie-util.js

@@ -4,7 +4,7 @@ Copyright (c) AppDynamics, Inc., and its affiliates
 All Rights Reserved
  */
 function trim(str) {
-  return str.replace(/^\s+|\s+$/g, '');
+  return str.trim();
 }
 
 function parseCookies(req) {

package/lib/v8/cpu-profiler.js

@@ -47,6 +47,10 @@ CpuProfiler.prototype.onAgentDestroy = function () {
 CpuProfiler.prototype.startCpuProfiler = function(seconds, callback, threadId) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_CPU_PROFILER_DISABLED == 'true' || process.env.APPDYNAMICS_CPU_PROFILER_DISABLED == true) {
+    return callback("CPU Profiling Disabled.");
+  }
+
   if(!self.agent.appdNative) {
     return callback("V8 tools are not loaded.");
   }

package/lib/v8/gc-stats.js

@@ -15,6 +15,8 @@ exports.GCStats = GCStats;
 
 GCStats.prototype.init = function() {
   /* istanbul ignore next */
+  if(process.env.APPDYNAMICS_GC_STATS_DISABLED == 'true' || process.env.APPDYNAMICS_GC_STATS_DISABLED == true) return;
+
   if (!this.agent.appdNative) return;
 
   var mm = this.agent.metricsManager;

package/lib/v8/heap-profiler.js

@@ -32,6 +32,10 @@ HeapProfiler.prototype.isObjectTrackingSupported = function() {
 HeapProfiler.prototype.trackAllocations = function(duration, callback) {
   var self = this;
 
+  if(process.env.APPDYNAMICS_HEAP_PROFILER_DISABLED == 'true' || process.env.APPDYNAMICS_HEAP_PROFILER_DISABLED == true) {
+    return callback("Heap Profiling Disabled.");
+  }
+
   if(!self.agent.appdNative) {
     return callback("V8 tools are not loaded.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.12.0",
+    "version": "25.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -31,29 +31,19 @@
         "lib": "./lib"
     },
     "optionalDependencies": {
-        "n": "^6.8.0"
+        "n": "^6.8.0",
+        "@splunk/otel": "3.0.1"
     },
     "dependencies": {
-        "@opentelemetry/api": "~1.4.1",
-        "@opentelemetry/api-logs": "^0.45.1",
-        "@opentelemetry/context-async-hooks": "~1.10.1",
-        "@opentelemetry/core": "~1.10.1",
-        "@opentelemetry/exporter-logs-otlp-grpc": "^0.45.1",
-        "@opentelemetry/exporter-logs-otlp-proto": "^0.45.1",
-        "@opentelemetry/exporter-trace-otlp-proto": "^0.36.1",
-        "@opentelemetry/resources": "~1.10.1",
-        "@opentelemetry/sdk-logs": "^0.45.1",
-        "@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.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"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.12.0",
+    "version": "25.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -31,29 +31,19 @@
         "lib": "./lib"
     },
     "optionalDependencies": {
-        "n": "^6.8.0"
+        "n": "^6.8.0",
+        "@splunk/otel": "3.0.1"
     },
     "dependencies": {
-        "@opentelemetry/api": "~1.4.1",
-        "@opentelemetry/api-logs": "^0.45.1",
-        "@opentelemetry/context-async-hooks": "~1.10.1",
-        "@opentelemetry/core": "~1.10.1",
-        "@opentelemetry/exporter-logs-otlp-grpc": "^0.45.1",
-        "@opentelemetry/exporter-logs-otlp-proto": "^0.45.1",
-        "@opentelemetry/exporter-trace-otlp-proto": "^0.36.1",
-        "@opentelemetry/resources": "~1.10.1",
-        "@opentelemetry/sdk-logs": "^0.45.1",
-        "@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.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"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"