Skip to content

[APM] Add 'deactivate_...' agent configuration settings for EDOT Node.js #224502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trentm merged 2 commits into from
Jun 20, 2025
Merged

[APM] Add 'deactivate_...' agent configuration settings for EDOT Node.js #224502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b11cd3
[APM] Add 'deactivate_...' agent configuration settings for EDOT Node.js
trentm Jun 18, 2025
75859e0
Merge branch 'main' into trentm-edot-nodejs-central-config-vars
trentm Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ...rvability/plugins/apm/common/agent_configuration/setting_definitions/edot_sdk_settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@ export const edotSDKSettings: RawSettingDefinition[] = [
'xpack.apm.agentConfig.edot.deactivate_instrumentations.description',
{
defaultMessage:
'Comma-separated list of modules to disable instrumentation for.\n' +
'When instrumentation is disabled for a module, no spans will be collected for that module.\n' +
'\n' +
'The up-to-date list of modules for which instrumentation can be disabled is language specific ' +
'and can be found under the following links: ' +
'[opentelemetry/java/elastic](https://ela.st/otel-agent-instructions)',
'Comma-separated list of instrumentation names to disable. When an instrumentation is disabled, no telemetry will be collected for the library/module it instruments. ' +
'The list of supported instrumentation names is language specific:\n' +
'- [EDOT Java](https://ela.st/otel-agent-instructions): for example "akka-http,grpc"\n' +
'- [EDOT Node.js](https://ela.st/edot-node-disable-instrs): for example "net,dns,http"',
Copy link
Copy Markdown
Member Author

@trentm trentm Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jackshirazi Are you okay with the re-wording here?

@intuibase @SergeyKleyman In the APM agents meeting yesterday, my understanding was that EDOT PHP was going to want deactivate_instrumentations and deactivate_all_instrumentations settings. Shall I add PHP to this PR as well?

If so, can you provide an appropriate link listing supported instrumentation names? For:

- [EDOT PHP](https://ela.st/???): for example "???"

}
),
includeAgents: ['opentelemetry/java/elastic'],
includeAgents: ['opentelemetry/java/elastic', 'opentelemetry/nodejs/elastic'],
},
{
key: 'deactivate_all_instrumentations',
Expand All @@ -41,10 +39,10 @@ export const edotSDKSettings: RawSettingDefinition[] = [
description: i18n.translate(
'xpack.apm.agentConfig.edot.deactivate_all_instrumentations.description',
{
defaultMessage: 'No spans will be collected for any instrumentation modules.\n' + '\n',
defaultMessage: 'No spans will be collected for any instrumentation modules.',
}
),
includeAgents: ['opentelemetry/java/elastic'],
includeAgents: ['opentelemetry/java/elastic', 'opentelemetry/nodejs/elastic'],
},
{
key: 'logging_level',
Expand All @@ -55,7 +53,7 @@ export const edotSDKSettings: RawSettingDefinition[] = [
defaultMessage: 'Logging level',
}),
description: i18n.translate('xpack.apm.agentConfig.loggingLevel.description', {
defaultMessage: 'Sets the logging level for the agent',
defaultMessage: 'Sets the logging level for the agent.',
}),
options: [
{ text: 'trace', value: 'trace' },
Expand Down