diff --git a/src/platform/packages/shared/kbn-elastic-agent-utils/src/agent_names.ts b/src/platform/packages/shared/kbn-elastic-agent-utils/src/agent_names.ts index c27f4b50fbf28..67a727205dd83 100644 --- a/src/platform/packages/shared/kbn-elastic-agent-utils/src/agent_names.ts +++ b/src/platform/packages/shared/kbn-elastic-agent-utils/src/agent_names.ts @@ -73,7 +73,10 @@ export const OPEN_TELEMETRY_AGENT_NAMES: OpenTelemetryAgentName[] = [ 'otlp/webjs', ]; -export const EDOT_AGENT_NAMES: OpenTelemetryAgentName[] = ['opentelemetry/java/elastic']; +export const EDOT_AGENT_NAMES: OpenTelemetryAgentName[] = [ + 'opentelemetry/java/elastic', + 'opentelemetry/nodejs/elastic', +]; export type JavaAgentName = 'java' | 'opentelemetry/java' | 'otlp/java'; export const JAVA_AGENT_NAMES: JavaAgentName[] = ['java', 'opentelemetry/java', 'otlp/java']; diff --git a/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/edot_sdk_settings.ts b/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/edot_sdk_settings.ts index 30a77750c6b32..c32b4b4f64ef8 100644 --- a/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/edot_sdk_settings.ts +++ b/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/edot_sdk_settings.ts @@ -66,7 +66,7 @@ export const edotSDKSettings: RawSettingDefinition[] = [ { text: 'fatal', value: 'fatal' }, { text: 'off', value: 'off' }, ], - includeAgents: ['opentelemetry/java/elastic'], + includeAgents: ['opentelemetry/java/elastic', 'opentelemetry/nodejs/elastic'], }, { key: 'send_traces', diff --git a/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts index 9a2addd618e1f..474d22b59ec55 100644 --- a/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts +++ b/x-pack/solutions/observability/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts @@ -203,6 +203,12 @@ describe('filterByAgent', () => { ); }); + it('opentelemetry/nodejs/elastic', () => { + expect(getSettingKeysForAgent('opentelemetry/nodejs/elastic')).toEqual( + expect.arrayContaining(['logging_level']) + ); + }); + it('"All" services (no agent name)', () => { expect(getSettingKeysForAgent(undefined)).toEqual( expect.arrayContaining(['transaction_max_spans', 'transaction_sample_rate']) diff --git a/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap b/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap index 2561325ca7760..fc3c40711153e 100644 --- a/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap +++ b/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap @@ -344,6 +344,29 @@ Object { }, }, }, + "opentelemetry/nodejs/elastic": Object { + "agent": Object { + "activation_method": Array [], + "version": Array [], + }, + "service": Object { + "framework": Object { + "composite": Array [], + "name": Array [], + "version": Array [], + }, + "language": Object { + "composite": Array [], + "name": Array [], + "version": Array [], + }, + "runtime": Object { + "composite": Array [], + "name": Array [], + "version": Array [], + }, + }, + }, "otlp": Object { "agent": Object { "activation_method": Array [ @@ -1207,6 +1230,7 @@ Object { "opentelemetry": 4, "opentelemetry/java": 5, "opentelemetry/java/elastic": 6, + "opentelemetry/nodejs/elastic": 7, "otlp": 1, "otlp/java": 2, "otlp/java/elastic": 3, diff --git a/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts b/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts index 6d71377663ae3..c1a323aebba3a 100644 --- a/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts +++ b/x-pack/solutions/observability/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts @@ -921,6 +921,10 @@ describe('data telemetry collection tasks', () => { key: 'opentelemetry/java/elastic', services: { value: 6 }, }, + { + key: 'opentelemetry/nodejs/elastic', + services: { value: 7 }, + }, ], }, },