appdynamics 25.12.0 → 26.4.1
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.
- package/LICENSE.txt +5 -7
- package/appdynamics_version.json +3 -3
- package/lib/core/agent.js +25 -6
- package/lib/core/otel-config.js +1 -3
- package/lib/libagent/libagent-connector.js +5 -0
- package/lib/libagent/libagent.js +6 -0
- package/lib/probes/winston-probe.js +6 -0
- package/lib/profiler/profiler.js +3 -2
- package/package.json +5 -6
- package/packageBck.json +5 -6
package/LICENSE.txt
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
APPDYNAMICS
|
|
1
|
+
SPLUNK APPDYNAMICS
|
|
2
2
|
END USER LICENSE AGREEMENT
|
|
3
3
|
|
|
4
|
-
By accessing the
|
|
5
|
-
of
|
|
4
|
+
By accessing the software herein, you (and the organization you represent) acknowledge and agree that the use
|
|
5
|
+
of such software are governed by (as applicable): (1) the Cisco General Terms found at
|
|
6
6
|
https://www.cisco.com/c/dam/en_us/about/doing_business/legal/Cisco_General_Terms.pdf and the applicable Product
|
|
7
|
-
Specific Terms found at https://www.cisco.com/c/en/us/about/legal/cloud-and-software/software-terms.html or (2)
|
|
8
|
-
other superseding agreement between AppDynamics, or its parent company Cisco Systems, Inc., as applicable, and You.
|
|
9
|
-
References to End User in any superseding agreement shall mean You.
|
|
7
|
+
Specific Terms found at https://www.cisco.com/c/en/us/about/legal/cloud-and-software/software-terms.html; or (2) the Splunk General Terms found at https://www.splunk.com/en_us/legal/splunk-general-terms.html and the applicable Specific Offering Terms found at https://www.splunk.com/en_us/legal/splunk-specific-terms.html.
|
|
10
8
|
|
|
11
|
-
|
|
9
|
+
Cisco Proprietary and Confidential * Revision 07.2025
|
package/appdynamics_version.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
3
|
-
"sha": "
|
|
2
|
+
"version": "26.4.1.0",
|
|
3
|
+
"sha": "80b33b5b0d8085c37efb50ef9d41cde6c718a264",
|
|
4
4
|
"nodeVersion": "",
|
|
5
|
-
"buildName": "
|
|
5
|
+
"buildName": "11240",
|
|
6
6
|
"compatibilityVersion": "4.4.1.0"
|
|
7
7
|
}
|
package/lib/core/agent.js
CHANGED
|
@@ -229,8 +229,7 @@ Agent.prototype.init = function (opts) {
|
|
|
229
229
|
self.backendConnector = new LibAgent(this);
|
|
230
230
|
|
|
231
231
|
// agent_deployment_mode = 'appd' || 'dual' || 'hybrid'
|
|
232
|
-
|
|
233
|
-
if(agent_deployment_mode == 'dual' || opts.openTelemetry && opts.openTelemetry.enabled) {
|
|
232
|
+
if(self.opts.agent_deployment_mode == 'dual' || opts.openTelemetry && opts.openTelemetry.enabled) {
|
|
234
233
|
const url = require('url');
|
|
235
234
|
let collectorEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
|
|
236
235
|
let collectorEndpointUrl = url.parse(collectorEndpoint);
|
|
@@ -241,15 +240,32 @@ Agent.prototype.init = function (opts) {
|
|
|
241
240
|
try {
|
|
242
241
|
const { start } = require('@splunk/otel');
|
|
243
242
|
const OtelConfig = require('./otel-config');
|
|
243
|
+
const { Resource } = require('@opentelemetry/resources');
|
|
244
|
+
|
|
244
245
|
start({
|
|
245
|
-
resource: (detectedResource) =>
|
|
246
|
-
|
|
246
|
+
resource: (detectedResource) => {
|
|
247
|
+
const appdResourceAttrs = new OtelConfig(opts).configResource();
|
|
248
|
+
|
|
249
|
+
let detectedAttrs = {};
|
|
250
|
+
if (typeof detectedResource.getRawAttributes === 'function') {
|
|
251
|
+
const rawAttrs = detectedResource.getRawAttributes();
|
|
252
|
+
for (const [key, value] of rawAttrs) {
|
|
253
|
+
detectedAttrs[key] = value;
|
|
254
|
+
}
|
|
255
|
+
} else if (detectedResource.attributes) {
|
|
256
|
+
detectedAttrs = Object.assign({}, detectedResource.attributes);
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
const mergedAttrs = Object.assign({}, appdResourceAttrs, detectedAttrs);
|
|
260
|
+
|
|
261
|
+
return new Resource(mergedAttrs);
|
|
262
|
+
},
|
|
247
263
|
});
|
|
248
264
|
}
|
|
249
265
|
catch (err) {
|
|
250
266
|
self.logger.error('AppDynamics dual mode could not be started ' + err);
|
|
251
267
|
}
|
|
252
|
-
} else if (agent_deployment_mode == 'otel') {
|
|
268
|
+
} else if (self.opts.agent_deployment_mode == 'otel') {
|
|
253
269
|
try {
|
|
254
270
|
const { start } = require('@splunk/otel');
|
|
255
271
|
start();
|
|
@@ -452,7 +468,9 @@ Agent.prototype.initializeOpts = function (opts) {
|
|
|
452
468
|
if (self.opts.analyticsMaxMessageSizeInBytes === undefined && process.env.APPDYNAMICS_ANALYTICS_MAX_MESSAGE_SIZE) {
|
|
453
469
|
self.opts.analyticsMaxMessageSizeInBytes = parseInt(process.env.APPDYNAMICS_ANALYTICS_MAX_MESSAGE_SIZE, 10);
|
|
454
470
|
}
|
|
455
|
-
|
|
471
|
+
if (self.opts.agent_deployment_mode === undefined && process.env.agent_deployment_mode) {
|
|
472
|
+
self.opts.agent_deployment_mode = process.env.agent_deployment_mode;
|
|
473
|
+
}
|
|
456
474
|
};
|
|
457
475
|
|
|
458
476
|
Agent.prototype.fetchMetadata = function (cb) {
|
|
@@ -754,3 +772,4 @@ exports = module.exports = new AppDynamics();
|
|
|
754
772
|
|
|
755
773
|
// export for testing
|
|
756
774
|
exports._setMetadataFile = setMetadataFile;
|
|
775
|
+
exports.Agent = Agent;
|
package/lib/core/otel-config.js
CHANGED
|
@@ -4,8 +4,6 @@ Copyright (c) AppDynamics, Inc., and its affiliates
|
|
|
4
4
|
All Rights Reserved
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
const { Resource } = require('@opentelemetry/resources');
|
|
8
|
-
|
|
9
7
|
module.exports = OtelConfig;
|
|
10
8
|
|
|
11
9
|
function OtelConfig(opts) {
|
|
@@ -37,7 +35,7 @@ OtelConfig.prototype.configResource = function() {
|
|
|
37
35
|
this.updateServiceNamespace(this.resourceAttributes, resource);
|
|
38
36
|
this.updateServiceName(this.resourceAttributes, resource);
|
|
39
37
|
this.updateDeploymentEnviromentName(this.resourceAttributes, resource);
|
|
40
|
-
return
|
|
38
|
+
return resource;
|
|
41
39
|
};
|
|
42
40
|
|
|
43
41
|
OtelConfig.prototype.updateServiceNamespace = function(attrs, resource) {
|
|
@@ -191,6 +191,11 @@ LibagentConnector.prototype.startBusinessTransaction = function (entryPointType,
|
|
|
191
191
|
return self.libagent.startBusinessTransaction(entryPointType, optionalName, corrHeader, callback, isHttpRequest);
|
|
192
192
|
};
|
|
193
193
|
|
|
194
|
+
LibagentConnector.prototype.dropBusinessTransaction = function (transaction) {
|
|
195
|
+
var self = this;
|
|
196
|
+
self.libagent.dropBusinessTransaction(transaction);
|
|
197
|
+
};
|
|
198
|
+
|
|
194
199
|
LibagentConnector.prototype.stopBusinessTransaction = function (transaction) {
|
|
195
200
|
var self = this;
|
|
196
201
|
|
package/lib/libagent/libagent.js
CHANGED
|
@@ -242,6 +242,12 @@ LibAgent.prototype.startProcessSnapshot = function() {
|
|
|
242
242
|
self.agent.libagentConnector.startProcessSnapshot();
|
|
243
243
|
};
|
|
244
244
|
|
|
245
|
+
LibAgent.prototype.dropBusinessTransaction = function(transaction) {
|
|
246
|
+
var self = this;
|
|
247
|
+
self.agent.libagentConnector.dropBusinessTransaction(transaction);
|
|
248
|
+
};
|
|
249
|
+
|
|
250
|
+
|
|
245
251
|
LibAgent.prototype.setRequiresNamingRules = function (flag) {
|
|
246
252
|
var self = this;
|
|
247
253
|
self.agent.setRequiresNamingRules(flag);
|
|
@@ -28,10 +28,12 @@ WinstonProbe.prototype.attach = function (obj) {
|
|
|
28
28
|
"write",
|
|
29
29
|
(obj, args) => this.handleLogWrite(obj, args)
|
|
30
30
|
);
|
|
31
|
+
self.agent.logger.debug('Attached Winston interceptor');
|
|
31
32
|
};
|
|
32
33
|
|
|
33
34
|
WinstonProbe.prototype.handleLogWrite = function (obj, args) {
|
|
34
35
|
let self = this;
|
|
36
|
+
self.agent.logger.debug('Winston log write intercepted');
|
|
35
37
|
|
|
36
38
|
const threadId = self.agent.profiler.time().threadId;
|
|
37
39
|
const txn = self.agent.profiler.getTransaction(threadId);
|
|
@@ -45,10 +47,12 @@ WinstonProbe.prototype.handleLogWrite = function (obj, args) {
|
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
if(!txn) {
|
|
50
|
+
self.agent.logger.debug('Winston Probe: No active txn Skipping');
|
|
48
51
|
return;
|
|
49
52
|
}
|
|
50
53
|
|
|
51
54
|
if(process.env.appdynamics_log_metadata_enrichment || self.agent.libagentConnector.getNodeProperty("enable-log-metadata-enrichment")) {
|
|
55
|
+
self.agent.logger.debug('Winston Probe: Decorate Log message');
|
|
52
56
|
return self.decorateMessage(args, txn, txnBtId);
|
|
53
57
|
}
|
|
54
58
|
};
|
|
@@ -61,8 +65,10 @@ WinstonProbe.prototype.decorateMessage = function (args, txn, btId) {
|
|
|
61
65
|
|
|
62
66
|
let txnGuid = txn && txn.guid ? txn.guid : '';
|
|
63
67
|
if(self.hasMetadataDefined(logMessage)) {
|
|
68
|
+
self.agent.logger.debug('Winston Probe: Log with Metadata');
|
|
64
69
|
self.updateMetadata(logMessage, txnGuid, btId);
|
|
65
70
|
} else {
|
|
71
|
+
self.agent.logger.debug('Winston Probe: No metadata on log, update log message');
|
|
66
72
|
var decorator = self.createDecorator(txnGuid, btId);
|
|
67
73
|
if(decorator) {
|
|
68
74
|
logMessage.message = decorator + ' ' + logMessage.message;
|
package/lib/profiler/profiler.js
CHANGED
|
@@ -34,7 +34,8 @@ Profiler.prototype.init = function () {
|
|
|
34
34
|
var now = Date.now();
|
|
35
35
|
for (var threadId in self.transactions) {
|
|
36
36
|
if (self.transactions[threadId].touched + 300000 < now) {
|
|
37
|
-
self.agent.logger.info('transaction ' + self.transactions[threadId].id + ' dropped');
|
|
37
|
+
self.agent.logger.info('Profiler transaction ' + self.transactions[threadId].id + ' dropped');
|
|
38
|
+
self.agent.backendConnector.dropBusinessTransaction(self.transactions[threadId].btGuid);
|
|
38
39
|
delete self.transactions[threadId];
|
|
39
40
|
}
|
|
40
41
|
}
|
|
@@ -253,7 +254,7 @@ Profiler.prototype.transactionDropped = function (guid) {
|
|
|
253
254
|
|
|
254
255
|
for (var threadId in self.transactions) {
|
|
255
256
|
if (self.transactions[threadId].guid === guid) {
|
|
256
|
-
self.agent.logger.info('transaction ' + self.transactions[threadId].id + ' dropped');
|
|
257
|
+
self.agent.logger.info('Libagent transaction ' + self.transactions[threadId].id + ' dropped');
|
|
257
258
|
delete self.transactions[threadId];
|
|
258
259
|
break;
|
|
259
260
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appdynamics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "26.4.1",
|
|
4
4
|
"description": "Performance Profiler and Monitor",
|
|
5
5
|
"author": "AppDynamics, Inc.",
|
|
6
6
|
"homepage": "https://www.appdynamics.com",
|
|
@@ -49,20 +49,19 @@
|
|
|
49
49
|
"@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
|
|
50
50
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
51
51
|
"body-parser": "^1.20.3",
|
|
52
|
-
"cls-hooked": "4.2.2",
|
|
53
52
|
"https-proxy-agent": "^5.0.1",
|
|
54
53
|
"uuid": "^8.3.2",
|
|
55
54
|
"y18n": "^5.0.8",
|
|
56
|
-
"appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/
|
|
57
|
-
"appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/
|
|
58
|
-
"appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/
|
|
55
|
+
"appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-libagent-napi-node.tgz",
|
|
56
|
+
"appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-native-node.tgz",
|
|
57
|
+
"appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-protobuf-node.tgz"
|
|
59
58
|
},
|
|
60
59
|
"overrides": {
|
|
61
60
|
"semver": "7.5.4",
|
|
62
61
|
"@grpc/grpc-js": ">=1.10.9"
|
|
63
62
|
},
|
|
64
63
|
"engines": {
|
|
65
|
-
"node": ">=12 <=
|
|
64
|
+
"node": ">=12 <=v25.*"
|
|
66
65
|
},
|
|
67
66
|
"engine-strict": true
|
|
68
67
|
}
|
package/packageBck.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appdynamics",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "26.4.1",
|
|
4
4
|
"description": "Performance Profiler and Monitor",
|
|
5
5
|
"author": "AppDynamics, Inc.",
|
|
6
6
|
"homepage": "https://www.appdynamics.com",
|
|
@@ -49,20 +49,19 @@
|
|
|
49
49
|
"@opentelemetry/exporter-trace-otlp-proto": "^0.57.0",
|
|
50
50
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
51
51
|
"body-parser": "^1.20.3",
|
|
52
|
-
"cls-hooked": "4.2.2",
|
|
53
52
|
"https-proxy-agent": "^5.0.1",
|
|
54
53
|
"uuid": "^8.3.2",
|
|
55
54
|
"y18n": "^5.0.8",
|
|
56
|
-
"appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/
|
|
57
|
-
"appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/
|
|
58
|
-
"appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/
|
|
55
|
+
"appdynamics-libagent-napi": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-libagent-napi-node.tgz",
|
|
56
|
+
"appdynamics-native": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-native-node.tgz",
|
|
57
|
+
"appdynamics-protobuf": "https://cdn.appdynamics.com/packages/nodejs/26.4.1.0/appdynamics-protobuf-node.tgz"
|
|
59
58
|
},
|
|
60
59
|
"overrides": {
|
|
61
60
|
"semver": "7.5.4",
|
|
62
61
|
"@grpc/grpc-js": ">=1.10.9"
|
|
63
62
|
},
|
|
64
63
|
"engines": {
|
|
65
|
-
"node": ">=12 <=
|
|
64
|
+
"node": ">=12 <=v25.*"
|
|
66
65
|
},
|
|
67
66
|
"engine-strict": true
|
|
68
67
|
}
|