appdynamics 23.5.0 → 23.10.0

package/README.md

@@ -63,121 +63,7 @@ For more information, see [Install the Node.js Agent](https://docs.appdynamics.c
 <br />
 
 
-Developer Guide
 --
-<br />
-
-### How to setup project locally
-
-&emsp;Make sure you have stable node version installed ** 12 <= node <= 19 ** 
-&emsp;are current supported versions. 
-
-&emsp;We recommend using 16 or above. 
-
-```sh
-cd agent-dlnative/nodejs
-npm install
-```
-
-<br />
-
-#### Build project
-
-&emsp;We currently build the nodejs project with gradle. For more help https://docs.gradle.org/current/userguide/command_line_interface.html
-
-&emsp;The root gradle file will be one level up i.e in root of agent-dlnative project. 
-&emsp;The **nodejs build.gradle** file has all the task definitions and build logic.
-
-```sh
-../gradlew dev 
-```
-The above will build the project with local node version.
-
-```sh
-../gradlew 
-```
-To run build with configured node version in build.gradle   
-<br />
-
-#### To run agent unit tests
-```sh
-../gradlew unittests_agent --info -Dnodejs.build.debug=true -Dnodejs.coverage.enabled=false
-```
-The above is an example to run unit tests for agent with coverage disabled
-
-More example options for task are : ** unittests, integrationtests_agent, eslint **
-
-Checkout more options : **/nodejs/build.gradle**  
-
-<br />
-
-#### To create standalone build
-
-```sh
-../gradlew :nodejs:createStandAloneAgentForNodeVersion or ../gradlew createStandAloneAgentForNodeVersion
-```
-
-Other options are : **createMasterTarNpmScript, testStandalonePackage**
-
-
-<br />    
-
-#### Where are these build settings / logic
-
-&emsp;The logic to create packages and supported node versions are in **nodejs/buildScripts/src** folder.
-
-&emsp;Check package.json to see what npm-scripts are available. 
-
-&emsp;You can individually run them as a npm command `npm run-script &standAloneAgent`
-
-<br />
-
-#### How to test applications with local changes in a test application
-
-&emsp;Create an npm application 
-&emsp;Install appdynamics pointing to your local build
-```sh
-npm install appdynamics {path_to_your_local_build_folder}/appdynamics
-```
-
-&emsp;Require appdynamics as demonstrated on top section of the readme
-&emsp;example 
-
-```sh
-appd.profile({
-  accountName: 'e2e-customer',
-  accountAccessKey: 'e10aa1c5-29be-474b-bb51-ab0c56eea5e8',
-  controllerHostName: 'master-saas-controller.e2e.appd-test.com',
-  controllerPort: 8090,
-  applicationName: 'upstream-test',
-  tierName: 'enabled',
-  openTelemetry: {
-    enabled: true,
-  },
-  nodeName: 'node__gql',
-  enableGraphQL: true,
-  libagent: true,
-  debug: true,
-});
-```
-
-&emsp; 1. Run your application and make requests  
-&emsp; 2. Go to controller ui - example : https://master-saas-controller.e2e.appd-test.com    
-&emsp; 3. Search for your application - example: upstream-test  
-
-<br />
-
-### Frequently asked questions
-
-1. My Application doesn't show up in the controller  
-&emsp;You probably have to update the access key.
-
-2. My integration tests throw "not able to find a module" running locally   
-&emsp;Go to your integration test folder - find package.json and run npm install there
-<br />
-
-### How do I setup libagent locally    
-&emsp; https://confluence.corp.appdynamics.com/pages/viewpage.action?spaceKey=AMC&title=NodeJS+Agent+with+Local+Libagent      
 
 <br />
 <br />

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "23.5.0.0",
+    "version": "23.10.0.0",
     "sha": "",
     "nodeVersion": "",
-    "buildName": "9232",
+    "buildName": "9494",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -163,6 +163,27 @@ Agent.computeTmpDir = function (rootTmpDir,
   return path.join(rootTmpDir, sha256.digest('hex').slice(0, 32));
 };
 
+Agent.prototype.setKubernetesConfig = function() {
+  var self = this;
+  try {
+    const NSPACE_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/namespace";
+
+    let clusterService = (process.env.APPDYNAMICS_CONTAINERINFO_FETCH_SERVICE).split(":");
+    if(clusterService.length != 2) {
+      return;
+    }
+
+    self.opts.kbHost = clusterService[0];
+    self.opts.kbPort = parseInt(clusterService[1]);
+    self.opts.kbPodName = process.env.HOSTNAME;
+    self.opts.kbContainerName = process.env.APPDYNAMICS_CONTAINER_NAME;
+    self.opts.kbNspace = fs.readFileSync(NSPACE_PATH, 'utf-8').trim();
+    self.opts.kbConfigEnabled = true;
+  } catch(err) {
+    self.logger.warn('Kubernetes containerid disabled due to' + err + '\n' + err.stack);
+  }
+};
+
 /* istanbul ignore next -- requires too much stubbing and mocking to unit test */
 Agent.prototype.init = function (opts) {
   var self = this;
@@ -177,6 +198,10 @@ Agent.prototype.init = function (opts) {
 
     self.opts.clsDisabled = !!self.opts.clsDisabled;
 
+    if(process.env.APPDYNAMICS_CONTAINERINFO_FETCH_SERVICE) {
+      self.setKubernetesConfig();
+    }
+
     self.backendConnector = new LibAgent(this);
 
     if (opts.openTelemetry && opts.openTelemetry.enabled) {
@@ -225,7 +250,7 @@ Agent.prototype.init = function (opts) {
         self.logger.error('AppDynamics agent cannot be started: node name/node name prefix is either missing or empty');
         return;
       }
-      
+
       var nodeName;
       if(self.opts.nodeName && self.opts.nodeName.length) {
         nodeName = self.opts.nodeName;
@@ -363,8 +388,8 @@ 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);
   }
-};
 
+};
 
 Agent.prototype.fetchMetadata = function (cb) {
   var self = this, key;

package/lib/libagent/libagent-connector.js

@@ -99,7 +99,6 @@ LibagentConnector.prototype.initLogger = function () {
 
 LibagentConnector.prototype.init = function () {
   var self = this;
-
   // initialize protobuf
   self.protobufModel = new ProtobufModel(self.agent);
   self.protobufModel.init();
@@ -108,7 +107,6 @@ LibagentConnector.prototype.init = function () {
 
   self.libagent.init(self.agent);
   self.agent.TracerProvider && self.agent.TracerProvider.updateResourceAttributes({ "container.id": self.getContainerId() });
-
   self.exceptionHandlers = new ExceptionHandlers();
   self.exceptionHandlers.init(
     self.agent,
@@ -257,7 +255,7 @@ LibagentConnector.prototype.startExitCall = function (transaction, exitCall) {
 
 LibagentConnector.prototype.disableResolutionForExitCall = function (exitCall) {
   var self = this;
-  
+
   if(!self.agent.profiler.isValidThreadId(exitCall.threadId)) {
     return;
   }
@@ -580,7 +578,7 @@ LibagentConnector.prototype.setupEum = function (agent) {
   var libAgentConnector = this;
   agent.eum.eumCookie.prototype.setFieldValues = function () {
     var self = this;
-    
+
     if(!agent.profiler.isValidThreadId(self.transaction.threadId)) {
       return false;
     }

package/lib/libagent/libagent.js

@@ -18,6 +18,7 @@ function LibAgent(agent) {
     self.agent.libagentConnector.init();
   });
   this.nodeIndexComputed = false;
+
   // For unit-testing
   this.libagent = true;
 }
@@ -50,11 +51,11 @@ LibAgent.prototype.addNodeIndexToNodeName = function() {
         if (process.argv.filter(arg => arg.includes("yarn")).length !== 0) {
           return;
         }
-        
+
         if (process.argv.filter(arg => arg.includes("npm")).length !== 0) {
           return;
         }
-      }      
+      }
       // create or update node name
       var computedNodeName = (self.agent.opts.nodeName || os.hostname());
       if (!self.agent.opts.noNodeNameSuffix) {

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

@@ -12,13 +12,25 @@ function ApolloEntryProbe(agent) {
 
 ApolloEntryProbe.prototype.init = function () {};
 
-ApolloEntryProbe.prototype.attach = function (obj) {
+ApolloEntryProbe.prototype.attach = function (obj, moduleName) {
+
   let self = this;
-  self.agent.proxy.before(
-    obj.ApolloServer.prototype,
-    "createServerInfo",
-    (args) => this.addLifeCycleHooks(args)
-  );
+
+  if(moduleName == 'apollo-server') {
+    self.agent.proxy.before(
+      obj.ApolloServer.prototype,
+      "createServerInfo",
+      (args) => this.addLifeCycleHooks(args)
+    );
+  } else {
+    const originalObject = obj;
+    const overriddenObject = {};
+  
+    overriddenObject.startStandaloneServer = proxyStartStandaloneServer(self, originalObject);
+    overriddenObject.__proto__ = originalObject;
+    return overriddenObject;
+  }
+
 };
 
 ApolloEntryProbe.prototype.addLifeCycleHooks = function (obj) {
@@ -67,3 +79,49 @@ ApolloEntryProbe.prototype.addLifeCycleHooks = function (obj) {
     ...obj.plugins,
   ];
 };
+
+function proxyStartStandaloneServer(self, originalObject) {
+
+  return async function startStandaloneServerProxy(server, options) {
+    const overriddenOptions = options || {};
+
+    const context = options ? options.context : undefined;
+    const overriddenContext = async function (contextParam) {
+      const contextValue =  context ? await context(contextParam) : {};
+      contextValue.gqlReq = contextParam.req;
+      contextValue.gqlRes = contextParam.res;
+      return contextValue;
+    };
+    overriddenOptions.context = overriddenContext;
+
+    const plugin = {
+      async requestDidStart() {
+        return {
+          didResolveOperation(requestContext) {
+            requestContext.contextValue.gqlReq.graphqlop = requestContext.operationName;
+            requestContext.contextValue.gqlReq.transactionStarted = true;
+            
+            HttpCommon.startTransactionHandler(
+              requestContext.contextValue.gqlReq,
+              requestContext.contextValue.gqlRes,
+              self.agent
+            );
+          },
+          didEncounterErrors(requestContext) {
+            requestContext.contextValue.gqlRes.error = requestContext.errors[0];
+            if(requestContext.contextValue.gqlReq.transactionStarted) {
+              return;
+            }
+            HttpCommon.startTransactionHandler(
+              requestContext.contextValue.gqlReq,
+              requestContext.contextValue.gqlRes,
+              self.agent
+            );
+          },
+        };
+      }
+    };
+    server.addPlugin(plugin);
+    return await originalObject.startStandaloneServer(server, overriddenOptions);
+  };
+}

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

@@ -8,6 +8,7 @@ All Rights Reserved
 var utility = require("../utility");
 var HttpCommon = require("./http-common");
 var getGraphQLParams;
+var parseRequestParams;
 
 function HttpEntryProbe(agent) {
   this.agent = agent;
@@ -21,6 +22,10 @@ HttpEntryProbe.prototype.enableGraphQL = function (egql) {
   getGraphQLParams = egql.getGraphQLParams;
 };
 
+HttpEntryProbe.prototype.enableGraphQLHttp = function (obj) {
+  parseRequestParams = obj.parseRequestParams;
+};
+
 HttpEntryProbe.prototype.attach = function (obj, moduleName) {
   var self = this;
 
@@ -71,6 +76,12 @@ HttpEntryProbe.prototype.__createRequestHandler = function (callback, isHTTPs) {
         }
         self.agent.context.run(requestHandler, req, res);
       });
+    } else if (parseRequestParams) {
+      parseRequestParams(req).then(function(params) {
+        const { operationName } = params;
+        req.graphqlop = operationName;
+      });
+      self.agent.context.run(requestHandler, req, res);
     } else {
       if (
         self.agent.opts.enableGraphQL

package/lib/probes/http-probe.js

@@ -9,9 +9,17 @@ var HttpEntryProbe = require('./http-entry-probe').HttpEntryProbe;
 var HttpExitProbe = require('./http-exit-probe').HttpExitProbe;
 var ApolloEntryProbe = require('./apollo-entry-probe').ApolloEntryProbe;
 
+const graphQLHttpImplementationPaths = [
+  'graphql-http/lib/use/http',
+  'graphql-http/lib/use/http2',
+  'graphql-http/lib/use/express'
+];
+
+const apolloPackages = ['apollo-server', '@apollo/server/standalone'];
+
 function HttpProbe(agent) {
   this.agent = agent;
-  this.packages = ['http', 'https', 'express-graphql', 'apollo-server'];
+  this.packages = ['http', 'https', 'express-graphql', ...apolloPackages, ...graphQLHttpImplementationPaths];
 
   this.entryProbe = new HttpEntryProbe(agent);
   this.exitProbe = new HttpExitProbe(agent);
@@ -33,17 +41,19 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
 
   if (obj.__appdynamicsProbeAttached__) return;
   obj.__appdynamicsProbeAttached__ = true;
-  self.agent.on('destroy', function () {
-    if (obj.__appdynamicsProbeAttached__) {
-      delete obj.__appdynamicsProbeAttached__;
-      if (moduleName !== 'express-graphql' && moduleName !== 'apollo-server') {
+
+  if(moduleName == 'http' || moduleName == 'https') {
+    // Skipping destroy for graphql-http modules as we do not modify them
+    self.agent.on('destroy', function () {
+      if (obj.__appdynamicsProbeAttached__) {
+        delete obj.__appdynamicsProbeAttached__;
         proxy.release(obj.Server.prototype.on);
         proxy.release(obj.Server.prototype.addListener);
         proxy.release(obj.request);
       }
-    }
-  });
-
+    });
+  }
+  
   if (moduleName === 'express-graphql') {
     if (self.agent.opts.enableGraphQL) {
       this.entryProbe.enableGraphQL(obj);
@@ -52,6 +62,14 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
     if(self.agent.opts.enableGraphQL) {
       this.apolloEntryProbe.attach(obj, moduleName);
     }
+  } else if (moduleName === '@apollo/server/standalone') {
+    if(self.agent.opts.enableGraphQL) {
+      return this.apolloEntryProbe.attach(obj, moduleName);
+    }
+  } else if (moduleName.includes('graphql-http')) {
+    if(self.agent.opts.enableGraphQL) {
+      this.entryProbe.enableGraphQLHttp(obj);
+    }
   } else {
     this.entryProbe.attach(obj, moduleName);
     this.exitProbe.attach(obj, moduleName);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "23.5.0",
+    "version": "23.10.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,12 +46,15 @@
         "https-proxy-agent": "^5.0.0",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-protobuf-node.tgz"
+    },
+    "overrides": {
+        "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v19.*"
+        "node": ">=12 <=v20.*"
     },
     "engine-strict": true
 }

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "23.5.0",
+    "version": "23.10.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,12 +46,15 @@
         "https-proxy-agent": "^5.0.0",
         "uuid": "^8.3.2",
         "y18n": "^5.0.8",
-        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/23.5.0.0/appdynamics-protobuf-node.tgz"
+        "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-libagent-napi-node.tgz",
+        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-native-node.tgz",
+        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/23.10.0.0/appdynamics-protobuf-node.tgz"
+    },
+    "overrides": {
+        "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v19.*"
+        "node": ">=12 <=v20.*"
     },
     "engine-strict": true
 }