appdynamics 25.9.0 → 25.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/appdynamics_version.json +3 -3
  2. package/lib/core/agent.js +14 -1
  3. package/lib/core/otel-config.js +65 -0
  4. package/lib/probes/redis-probe.js +15 -3
  5. package/package.json +22 -9
  6. package/packageBck.json +22 -9
  7. package/preInstallScript.js +0 -6
package/appdynamics_version.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
- "version": "25.9.0.0",
3
- "sha": "3e946d481b36d94a72add4b68a061585c2e7e168",
2
+ "version": "25.12.0.0",
3
+ "sha": "026c94f9b567a3d3b88cfb54a02110a55ca93ffa",
4
4
  "nodeVersion": "",
5
- "buildName": "10973",
5
+ "buildName": "11054",
6
6
  "compatibilityVersion": "4.4.1.0"
7
7
  }
package/lib/core/agent.js CHANGED
@@ -240,11 +240,24 @@ Agent.prototype.init = function (opts) {
240
240
  };
241
241
  try {
242
242
  const { start } = require('@splunk/otel');
243
- start();
243
+ const OtelConfig = require('./otel-config');
244
+ start({
245
+ resource: (detectedResource) =>
246
+ detectedResource.merge(new OtelConfig(opts).configResource()),
247
+ });
244
248
  }
245
249
  catch (err) {
246
250
  self.logger.error('AppDynamics dual mode could not be started ' + err);
247
251
  }
252
+ } else if (agent_deployment_mode == 'otel') {
253
+ try {
254
+ const { start } = require('@splunk/otel');
255
+ start();
256
+ }
257
+ catch (err) {
258
+ self.logger.error('AppDynamics splunk mode could not be started ' + err);
259
+ }
260
+ return;
248
261
  }
249
262
 
250
263
  self.libagentConnector.subscribeToIsEnabled((isEnabled) => setMetadataFile(self, isEnabled));
package/lib/core/otel-config.js ADDED
@@ -0,0 +1,65 @@
1
+ /*
2
+ Copyright (c) AppDynamics, Inc., and its affiliates
3
+ 2015
4
+ All Rights Reserved
5
+ */
6
+
7
+ const { Resource } = require('@opentelemetry/resources');
8
+
9
+ module.exports = OtelConfig;
10
+
11
+ function OtelConfig(opts) {
12
+ this.resourceAttributes = this.parseResourceAtributes();
13
+ this.tierName = opts.tierName || process.env.APPDYNAMICS_AGENT_TIER_NAME;
14
+ this.applicationName = opts.applicationName || process.env.APPDYNAMICS_AGENT_APPLICATION_NAME;
15
+ this.accountName = opts.accountName || process.env.APPDYNAMICS_AGENT_ACCOUNT_NAME;
16
+ this.DEPLOYMENT_ENVIRONMENT_NAME = "deployment.environment.name";
17
+ this.SERVICE_NAME = "service.name";
18
+ this.SERVICE_NAMESPACE = "service.namespace";
19
+ }
20
+
21
+ OtelConfig.prototype.parseResourceAtributes = function() {
22
+ let resourceAttributes = {};
23
+ if(process.env.OTEL_RESOURCE_ATTRIBUTES != null) {
24
+ let parseResourceAttrs = process.env.OTEL_RESOURCE_ATTRIBUTES.split(',');
25
+ for(const attr of parseResourceAttrs) {
26
+ let pairs = attr.split('=');
27
+ if(pairs.length == 2) {
28
+ resourceAttributes[pairs[0]] = pairs[1];
29
+ }
30
+ }
31
+ }
32
+ return resourceAttributes;
33
+ };
34
+
35
+ OtelConfig.prototype.configResource = function() {
36
+ let resource = {};
37
+ this.updateServiceNamespace(this.resourceAttributes, resource);
38
+ this.updateServiceName(this.resourceAttributes, resource);
39
+ this.updateDeploymentEnviromentName(this.resourceAttributes, resource);
40
+ return new Resource(resource);
41
+ };
42
+
43
+ OtelConfig.prototype.updateServiceNamespace = function(attrs, resource) {
44
+ if(attrs[this.SERVICE_NAMESPACE] != null) {
45
+ return;
46
+ } else {
47
+ resource[this.SERVICE_NAMESPACE] = this.applicationName;
48
+ }
49
+ };
50
+
51
+ OtelConfig.prototype.updateServiceName = function(attrs, resource) {
52
+ if(process.env['OTEL_SERVICE_NAME'] != null || attrs[this.SERVICE_NAME] != null) {
53
+ return;
54
+ } else {
55
+ resource[this.SERVICE_NAME] = this.tierName;
56
+ }
57
+ };
58
+
59
+ OtelConfig.prototype.updateDeploymentEnviromentName = function(attrs, resource) {
60
+ if(attrs[this.DEPLOYMENT_ENVIRONMENT_NAME] != null) {
61
+ return;
62
+ } else {
63
+ resource[this.DEPLOYMENT_ENVIRONMENT_NAME] = this.accountName;
64
+ }
65
+ };
package/lib/probes/redis-probe.js CHANGED
@@ -21,9 +21,8 @@ function wrapExecutor(self, executor) {
21
21
  var locals = {};
22
22
  locals.time = profiler.time();
23
23
  locals.args = args;
24
- var urlParsed = new url.URL(this.options.url);
25
- var host = urlParsed.host;
26
- locals.exitCall = self.createExitCall(host, name, args);
24
+ var address = self.getAddress(this.options);
25
+ locals.exitCall = self.createExitCall(address, name, args);
27
26
 
28
27
  var val = executor.call(this, command, args, name);
29
28
  var currentCtxt = self.agent.thread.current();
@@ -44,6 +43,19 @@ function proxyAttachCommands(self, originalObject) {
44
43
  };
45
44
  }
46
45
 
46
+ RedisProbe.prototype.getAddress = function(options) {
47
+ var address = 'localhost:6379';
48
+ if(options && options.url) {
49
+ var urlParsed = new url.URL(options.url);
50
+ address = urlParsed.host;
51
+ } else if (options && options.socket) {
52
+ var host = options.socket.host || 'localhost';
53
+ var port = options.socket.port || '6379';
54
+ address = host + ':' + port;
55
+ }
56
+ return address;
57
+ };
58
+
47
59
  RedisProbe.prototype.attachRelative = function(mod, args, obj) {
48
60
  var self = this;
49
61
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appdynamics",
3
- "version": "25.9.0",
3
+ "version": "25.12.0",
4
4
  "description": "Performance Profiler and Monitor",
5
5
  "author": "AppDynamics, Inc.",
6
6
  "homepage": "https://www.appdynamics.com",
@@ -25,31 +25,44 @@
25
25
  ],
26
26
  "main": "./index.js",
27
27
  "scripts": {
28
- "preinstall": "node preInstallScript.js"
28
+ "compileDependency": "node buildScripts/dest/compileDependency.js",
29
+ "standAloneAgent": "node buildScripts/dest/createStandAloneAgent.js",
30
+ "runGradleTask": "node buildScripts/dest/runGradleTask.js",
31
+ "createMasterTar": "node buildScripts/dest/createMasterTarFile.js",
32
+ "testStandalone": "node buildScripts/dest/runStandaloneAgent.js",
33
+ "testAgentInstallBeforePublish": "node buildScripts/dest/testAgentInstallBeforePublish.js"
29
34
  },
30
35
  "directories": {
31
36
  "lib": "./lib"
32
37
  },
33
38
  "optionalDependencies": {
34
- "n": "^6.8.0",
35
- "@splunk/otel": "3.0.1"
39
+ "n": "^6.8.0"
36
40
  },
37
41
  "dependencies": {
42
+ "@opentelemetry/api": "^1.8.0",
43
+ "@opentelemetry/api-logs": "^0.57.0",
44
+ "@opentelemetry/context-async-hooks": "^2.0.1",
45
+ "@opentelemetry/core": "^1.3.0",
46
+ "@opentelemetry/exporter-logs-otlp-http": "^0.57.0",
47
+ "@opentelemetry/exporter-logs-otlp-proto": "^0.57.0",
48
+ "@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
49
+ "@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
38
50
  "@yarnpkg/lockfile": "^1.1.0",
39
51
  "body-parser": "^1.20.3",
40
52
  "cls-hooked": "4.2.2",
41
53
  "https-proxy-agent": "^5.0.1",
42
54
  "uuid": "^8.3.2",
43
55
  "y18n": "^5.0.8",
44
- "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-libagent-napi-node.tgz",
45
- "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-native-node.tgz",
46
- "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-protobuf-node.tgz"
56
+ "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-libagent-napi-node.tgz",
57
+ "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-native-node.tgz",
58
+ "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-protobuf-node.tgz"
47
59
  },
48
60
  "overrides": {
49
- "semver": "7.5.4"
61
+ "semver": "7.5.4",
62
+ "@grpc/grpc-js": ">=1.10.9"
50
63
  },
51
64
  "engines": {
52
- "node": ">=12 <=v22.*"
65
+ "node": ">=12 <=v24.*"
53
66
  },
54
67
  "engine-strict": true
55
68
  }
package/packageBck.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appdynamics",
3
- "version": "25.9.0",
3
+ "version": "25.12.0",
4
4
  "description": "Performance Profiler and Monitor",
5
5
  "author": "AppDynamics, Inc.",
6
6
  "homepage": "https://www.appdynamics.com",
@@ -25,31 +25,44 @@
25
25
  ],
26
26
  "main": "./index.js",
27
27
  "scripts": {
28
- "preinstall": "node preInstallScript.js"
28
+ "compileDependency": "node buildScripts/dest/compileDependency.js",
29
+ "standAloneAgent": "node buildScripts/dest/createStandAloneAgent.js",
30
+ "runGradleTask": "node buildScripts/dest/runGradleTask.js",
31
+ "createMasterTar": "node buildScripts/dest/createMasterTarFile.js",
32
+ "testStandalone": "node buildScripts/dest/runStandaloneAgent.js",
33
+ "testAgentInstallBeforePublish": "node buildScripts/dest/testAgentInstallBeforePublish.js"
29
34
  },
30
35
  "directories": {
31
36
  "lib": "./lib"
32
37
  },
33
38
  "optionalDependencies": {
34
- "n": "^6.8.0",
35
- "@splunk/otel": "3.0.1"
39
+ "n": "^6.8.0"
36
40
  },
37
41
  "dependencies": {
42
+ "@opentelemetry/api": "^1.8.0",
43
+ "@opentelemetry/api-logs": "^0.57.0",
44
+ "@opentelemetry/context-async-hooks": "^2.0.1",
45
+ "@opentelemetry/core": "^1.3.0",
46
+ "@opentelemetry/exporter-logs-otlp-http": "^0.57.0",
47
+ "@opentelemetry/exporter-logs-otlp-proto": "^0.57.0",
48
+ "@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
49
+ "@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
38
50
  "@yarnpkg/lockfile": "^1.1.0",
39
51
  "body-parser": "^1.20.3",
40
52
  "cls-hooked": "4.2.2",
41
53
  "https-proxy-agent": "^5.0.1",
42
54
  "uuid": "^8.3.2",
43
55
  "y18n": "^5.0.8",
44
- "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-libagent-napi-node.tgz",
45
- "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-native-node.tgz",
46
- "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.9.0.0/appdynamics-protobuf-node.tgz"
56
+ "appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-libagent-napi-node.tgz",
57
+ "appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-native-node.tgz",
58
+ "appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/25.12.0.0/appdynamics-protobuf-node.tgz"
47
59
  },
48
60
  "overrides": {
49
- "semver": "7.5.4"
61
+ "semver": "7.5.4",
62
+ "@grpc/grpc-js": ">=1.10.9"
50
63
  },
51
64
  "engines": {
52
- "node": ">=12 <=v22.*"
65
+ "node": ">=12 <=v24.*"
53
66
  },
54
67
  "engine-strict": true
55
68
  }
package/preInstallScript.js DELETED
@@ -1,6 +0,0 @@
1
- var nodeVersionParts = process.version.split(".");
2
- if(parseInt(nodeVersionParts[0].substring(1), 10) < 8) {
3
- console.log("This version of Appdynamics agent only supports Node.js 8.0 and above. \n"
4
- + "For older versions of Node.js please use the AppDynamics agent 4.5.11 by installing with 'npm install appdynamics@4.5.11'");
5
- process.exit(1);
6
- }