appdynamics 24.8.2 → 24.9.0

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "24.8.2.0",
-    "sha": "f39e215bb5e0f25f2de0bf45f602264eb0ed9f9b",
+    "version": "24.9.0.0",
+    "sha": "",
     "nodeVersion": "",
-    "buildName": "10147",
+    "buildName": "10247",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -184,10 +184,35 @@ Agent.prototype.setKubernetesConfig = function() {
   }
 };
 
+Agent.prototype.isMainThread = function () {
+  const { isMainThread } = require('worker_threads');
+  return isMainThread;
+};
+
+function setMetadataFile(instrumentedStatus) {
+  const filePath = process.env.APPDYNAMICS_AGENT_DIR || '/tmp/appd';
+  const fileName = path.join(filePath, 'app-metadata.json');
+
+  try {
+    fs.accessSync(filePath, fs.constants.W_OK);
+    const content = JSON.stringify({ instrumented: instrumentedStatus });
+    fs.writeFileSync(fileName, content);
+  } catch (err) {
+    this.agent.logger.error(
+      `Unable to write the file app-metadata.json to path ${filePath} \n`,
+      err
+    );
+  }
+}
+
 /* istanbul ignore next -- requires too much stubbing and mocking to unit test */
 Agent.prototype.init = function (opts) {
   var self = this;
 
+  if(!self.isMainThread()) {
+    return;
+  }
+
   try {
     if (self.initialized)
       return;
@@ -214,6 +239,9 @@ Agent.prototype.init = function (opts) {
       self.tracer = self.TracerProvider.getTracer('appdynamics-tracer');
     }
 
+
+    self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(isEnabled));
+
     self.precompiled = opts.precompiled === undefined || opts.precompiled;
 
     if (self.opts.excludeAgentFromCallGraph === undefined) {
@@ -261,15 +289,6 @@ Agent.prototype.init = function (opts) {
       const filePath = path.join(require.resolve('appdynamics'), '..');
       process.env.APPDYNAMICS_AGENT_DIR = filePath;
 
-      try {
-        fs.accessSync(filePath, fs.constants.W_OK);
-        const fileName = `${filePath}/app-metadata.json`;
-        const content = JSON.stringify({ "nodeName": nodeName });
-        fs.writeFileSync(fileName, content);
-      } catch (err) {
-        self.logger.error(`unable to write the file app-metadata.json file to path ${filePath} \n`, err);
-      }
-
       self.tmpDir = Agent.computeTmpDir(self.rootTmpDir,
         self.opts.controllerHostName,
         self.opts.controllerPort,
@@ -321,7 +340,7 @@ Agent.prototype.init = function (opts) {
     self.cpuProfiler.init();
     self.heapProfiler.init();
 
-    if(self.opts.secureAppEnabled) {
+    if(self.opts.secureAppEnabled || process.env.APPDYNAMICS_SECURE_APP_ENABLED) {
       self.secureApp.init(this);
     }
 

package/lib/libagent/libagent-connector.js

@@ -98,6 +98,18 @@ LibagentConnector.prototype.initLogger = function () {
   self.libagent = new LibAgent(self.agent);
 };
 
+LibagentConnector.prototype.setIsEnabled = function (value) {
+  if (this.isEnabled !== value) {
+    this.isEnabled = value;
+    this.emit('isEnabledChanged', value);
+  }
+};
+
+
+LibagentConnector.prototype.getIsEnabled = function () {
+  return this.isEnabled;
+};
+
 LibagentConnector.prototype.init = function () {
   var self = this;
   // initialize protobuf
@@ -132,13 +144,16 @@ LibagentConnector.prototype.init = function () {
     function () {
       // exception handler: libagent needs no teardown
     });
+
   self.libagent.delegate.on('initialConfigUpdateDone', function () {
-    self.isEnabled = true; // should be API call
+    self.setIsEnabled(true);
     self.initializeTimers();
   });
+
   self.libagent.delegate.on('agentDisabled', function () {
-    self.isEnabled = false;
+    self.setIsEnabled(false);
   });
+
   self.libagent.delegate.on('agentReset', function () {
     self.agent.metricsManager.init();
     self.agent.processStats.init();
@@ -641,3 +656,7 @@ LibagentConnector.prototype.getContainerId = function () {
   var self = this;
   return self.libagent.getContainerId();
 };
+
+LibagentConnector.prototype.subscribeToIsEnabled = function (callback) {
+  this.on('isEnabledChanged', callback);
+};

package/lib/secure_app/secure_app.js

@@ -21,6 +21,14 @@ function SecureApp() {
 
 SecureApp.prototype.init = function(agent) {
   var self = this;
+
+  if(agent.opts.certificateFile)  {
+    try {
+      self.certificateFile = require('fs').readFileSync(agent.opts.certificateFile);
+    } catch (e) {
+      self.agent.logger.WARN('Secure App could not read certificate file');
+    }
+  }
   self.agent = agent;
   self.libraryMetadata = new LibraryMetadata(agent);
   if(!process.env.SKIP_AUTH_FOR_TESTS) {
@@ -115,8 +123,8 @@ SecureApp.prototype._requestOptions = function(path, length, type) {
     'Content-Type': type
   };
 
-  if (self.agent.opts.certificateFile) {
-    requestOptions['ca'] = self.agent.opts.certificateFile;
+  if (self.certificateFile) {
+    requestOptions['ca'] = self.certificateFile;
   }
 
   if(process.env.CONTROLLER_HOST_TEST) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.8.2",
+    "version": "24.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,20 +46,20 @@
         "@opentelemetry/sdk-trace-base": "~1.10.1",
         "@opentelemetry/semantic-conventions": "~1.10.1",
         "@yarnpkg/lockfile": "^1.1.0",
-        "body-parser": "^1.20.2",
+        "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.8.2.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.8.2.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.8.2.0/appdynamics-protobuf-node.tgz"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v21.*"
+        "node": ">=12 <=v22.*"
     },
     "engine-strict": true
 }

package/packageBck.json

@@ -1,6 +1,6 @@
 {
     "name": "appdynamics",
-    "version": "24.8.2",
+    "version": "24.9.0",
     "description": "Performance Profiler and Monitor",
     "author": "AppDynamics, Inc.",
     "homepage": "https://www.appdynamics.com",
@@ -46,20 +46,20 @@
         "@opentelemetry/sdk-trace-base": "~1.10.1",
         "@opentelemetry/semantic-conventions": "~1.10.1",
         "@yarnpkg/lockfile": "^1.1.0",
-        "body-parser": "^1.20.2",
+        "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.8.2.0/appdynamics-libagent-napi-node.tgz",
-        "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/24.8.2.0/appdynamics-native-node.tgz",
-        "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/24.8.2.0/appdynamics-protobuf-node.tgz"
+        "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"
     },
     "overrides": {
         "semver": "7.5.4"
     },
     "engines": {
-        "node": ">=12 <=v21.*"
+        "node": ">=12 <=v22.*"
     },
     "engine-strict": true
 }