appdynamics 24.9.0 → 24.10.0

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "24.9.0.0",
+    "version": "24.10.0.0",
     "sha": "",
     "nodeVersion": "",
-    "buildName": "10247",
+    "buildName": "10391",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -189,7 +189,7 @@ Agent.prototype.isMainThread = function () {
   return isMainThread;
 };
 
-function setMetadataFile(instrumentedStatus) {
+function setMetadataFile(agent, instrumentedStatus) {
   const filePath = process.env.APPDYNAMICS_AGENT_DIR || '/tmp/appd';
   const fileName = path.join(filePath, 'app-metadata.json');
 
@@ -198,7 +198,7 @@ function setMetadataFile(instrumentedStatus) {
     const content = JSON.stringify({ instrumented: instrumentedStatus });
     fs.writeFileSync(fileName, content);
   } catch (err) {
-    this.agent.logger.error(
+    agent.logger.error(
       `Unable to write the file app-metadata.json to path ${filePath} \n`,
       err
     );
@@ -240,7 +240,7 @@ Agent.prototype.init = function (opts) {
     }
 
 
-    self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(isEnabled));
+    self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(self, isEnabled));
 
     self.precompiled = opts.precompiled === undefined || opts.precompiled;
 
@@ -731,3 +731,7 @@ var AppDynamics = function () {
 AppDynamics.Agent = Agent;
 
 exports = module.exports = new AppDynamics();
+
+// export for testing
+exports._setMetadataFile = setMetadataFile;
+

package/lib/core/opentelemetry-tracer.js

@@ -6,7 +6,7 @@ const { BatchSpanProcessor, BasicTracerProvider } = require('@opentelemetry/sdk-
 const { OTLPTraceExporter } = require("@opentelemetry/exporter-trace-otlp-proto");
 const { AsyncHooksContextManager, AsyncLocalStorageContextManager } = require("@opentelemetry/context-async-hooks");
 const { ParentBasedSampler, AlwaysOnSampler, TraceIdRatioBasedSampler } = require("@opentelemetry/core");
-const { Resource } = require('@opentelemetry/resources');
+const { Resource, envDetectorSync, processDetectorSync, hostDetectorSync } = require('@opentelemetry/resources');
 const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const AppdynamicsSpanExporter = require('./appdynamics_span_exporter').AppdynamicsSpanExporter;
 const url = require('url');
@@ -33,15 +33,26 @@ function getSamplerFromConfig(config) {
 }
 
 TracerProvider.prototype.register = function(config) {
+  const envResource = envDetectorSync.detect();
+  const processResource = processDetectorSync.detect();
+  const hostResource = hostDetectorSync.detect();
+
+  const configResourceAttributes = {
+    [SemanticResourceAttributes.SERVICE_NAME]: config.tierName,
+    [SemanticResourceAttributes.SERVICE_NAMESPACE]: config.applicationName,
+    [SemanticResourceAttributes.CONTAINER_ID]: ""
+  };
+  
+  const mergedResource = new Resource(configResourceAttributes)
+  .merge(envResource)
+  .merge(processResource)
+  .merge(hostResource);
+
   const provider = new BasicTracerProvider({
     sampler: new ParentBasedSampler({
       root: getSamplerFromConfig(config.openTelemetry)
     }),
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: config.tierName,
-      [SemanticResourceAttributes.SERVICE_NAMESPACE]: config.applicationName,
-      [SemanticResourceAttributes.CONTAINER_ID]: ""
-    }),
+    resource: mergedResource,
   });
 
   // default collector configuration, can be overridden from agent config

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

@@ -22,7 +22,22 @@ ApolloEntryProbe.prototype.attach = function (obj, moduleName) {
       "createServerInfo",
       (args) => this.addLifeCycleHooks(args)
     );
-  } else {
+  } else if (moduleName === '@apollo/server') {
+
+    const originalObject = obj;
+    const overriddenObject = {};
+
+    overriddenObject.ApolloServer = proxyApolloServer(self, originalObject);
+    return overriddenObject;
+    
+  } else if(moduleName === '@apollo/server/express4') {
+    const originalObject = obj;
+    const overriddenObject = {};
+
+    overriddenObject.expressMiddleware = proxyExpressMiddleware(self, originalObject);
+    overriddenObject.__proto__ = originalObject;
+    return overriddenObject;
+  } else if(moduleName === '@apollo/server/standalone'){
     const originalObject = obj;
     const overriddenObject = {};
   
@@ -80,48 +95,87 @@ ApolloEntryProbe.prototype.addLifeCycleHooks = function (obj) {
   ];
 };
 
-function proxyStartStandaloneServer(self, originalObject) {
+function appDynamicsApolloServerPlugin(self) {
+  const plugin = {
+    async requestDidStart() {
+      return {
+        didResolveOperation(requestContext) {
+          if(!requestContext.contextValue.gqlReq) {
+            requestContext.contextValue.gqlReq = {};
+            requestContext.contextValue.gqlRes = {};
+          }
+          requestContext.contextValue.gqlReq.graphqlop = requestContext.operationName;
+          requestContext.contextValue.gqlReq.transactionStarted = true;
+          
+          HttpCommon.startTransactionHandler(
+            requestContext.contextValue.gqlReq,
+            requestContext.contextValue.gqlRes,
+            self.agent
+          );
+        },
+        didEncounterErrors(requestContext) {
+          if(!requestContext.contextValue.gqlReq) {
+            requestContext.contextValue.gqlReq = {};
+            requestContext.contextValue.gqlRes = {};
+          }
+          requestContext.contextValue.gqlRes.error = requestContext.errors[0];
+          if(requestContext.contextValue.gqlReq.transactionStarted) {
+            return;
+          }
+          HttpCommon.startTransactionHandler(
+            requestContext.contextValue.gqlReq,
+            requestContext.contextValue.gqlRes,
+            self.agent
+          );
+        },
+      };
+    }
+  };
+  return plugin;
+}
+
+function appDymanicsApolloServerOverriddenOptions(options) {
+  const overriddenOptions = options || {};
+
+  const context = options ? options.context : undefined;
+  const overriddenContext = async function (contextParam) {
+    const contextValue =  context ? await context(contextParam) : {};
+    contextParam.req.url = contextParam.req.baseUrl; // For Apollo Server 4
+    contextValue.gqlReq = contextParam.req;
+    contextValue.gqlRes = contextParam.res;
+    return contextValue;
+  };
+  overriddenOptions.context = overriddenContext;
+  return overriddenOptions;
+}
+
+function proxyApolloServer(self, originalObject) {
+  const ApolloServer = originalObject.ApolloServer;
 
+  // Define ApolloServerProxy class
+  class ApolloServerProxy extends ApolloServer {
+    constructor(config) {
+      // Call the ApolloServer constructor
+      super(config);
+
+      // Add the plugin to the plugins array
+      this.addPlugin(appDynamicsApolloServerPlugin(self));
+    }
+  }
+
+  return ApolloServerProxy;
+}
+
+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);
+    const overriddenOptions = appDymanicsApolloServerOverriddenOptions(options);
     return await originalObject.startStandaloneServer(server, overriddenOptions);
   };
 }
+
+function proxyExpressMiddleware(self, originalObject) {
+  return function expressMiddlewareProxy(server, options) {
+    const overriddenOptions = appDymanicsApolloServerOverriddenOptions(options);
+    return originalObject.expressMiddleware(server, overriddenOptions);
+  };
+}

package/lib/probes/http-probe.js

@@ -9,7 +9,7 @@ var HttpEntryProbe = require('./http-entry-probe').HttpEntryProbe;
 var HttpExitProbe = require('./http-exit-probe').HttpExitProbe;
 var ApolloEntryProbe = require('./apollo-entry-probe').ApolloEntryProbe;
 
-const apolloPackages = ['apollo-server', '@apollo/server/standalone'];
+const apolloPackages = ['apollo-server', '@apollo/server/standalone', '@apollo/server/express4', '@apollo/server'];
 
 function HttpProbe(agent) {
   this.agent = agent;
@@ -58,9 +58,21 @@ HttpProbe.prototype.attach = function (obj, moduleName) {
     }
   } else if (moduleName === '@apollo/server/standalone') {
     if(self.agent.opts.enableGraphQL) {
+      obj.__appdynamicsProbeAttached__ = false;
       return this.apolloEntryProbe.attach(obj, moduleName);
     }
-  } else if (moduleName.includes('graphql-http')) {
+  } else if(moduleName === '@apollo/server/express4') {
+    if(self.agent.opts.enableGraphQL) {
+      obj.__appdynamicsProbeAttached__ = false;
+      return this.apolloEntryProbe.attach(obj, moduleName);
+    }
+  } else if(moduleName === '@apollo/server') {
+    if(self.agent.opts.enableGraphQL) {
+      obj.__appdynamicsProbeAttached__ = false;
+      return this.apolloEntryProbe.attach(obj, moduleName);
+    }
+  }
+  else if (moduleName.includes('graphql-http')) {
     if(self.agent.opts.enableGraphQL) {
       this.entryProbe.enableGraphQLHttp(obj);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.9.0",
+    "version": "24.10.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.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"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.9.0",
+    "version": "24.10.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.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"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"