[Fleet] add use_apm if dynamic_signal_types are enabled

x-pack/platform/plugins/shared/fleet/common/services/policy_template.test.ts

@@ -379,6 +379,31 @@ describe('getNormalizedDataStreams', () => {
     expect(useApmVar?.default).toEqual(true);
     expect(useApmVar?.title).toEqual('Enable Elastic APM Enrichment');
   });
+
+  it('should add use_apm var when otel input has dynamic_signal_types true', () => {
+    const result = getNormalizedDataStreams({
+      ...integrationPkg,
+      type: 'input',
+      policy_templates: [
+        {
+          input: 'otelcol',
+          type: 'logs',
+          name: 'otel-dynamic',
+          template_path: 'some/path.hbl',
+          title: 'OTel Dynamic',
+          description: 'OTel with dynamic signal types',
+          dynamic_signal_types: true,
+          vars: [],
+        },
+      ],
+    });
+    expect(result).toHaveLength(1);
+    expect(result[0].streams).toHaveLength(1);
+    const vars = result[0].streams![0].vars;
+    const useApmVar = vars?.find((v) => v.name === 'use_apm');
+    expect(useApmVar).toBeDefined();
+    expect(useApmVar?.default).toEqual(true);
+  });
 });
 
 describe('filterPolicyTemplatesTiles', () => {

x-pack/platform/plugins/shared/fleet/common/services/policy_template.ts

@@ -113,9 +113,11 @@ export const getNormalizedDataStreams = (
     const dataset = datasetName || createDefaultDatasetName(packageInfo, policyTemplate);
 
     let vars = addDatasetVarIfNotPresent(policyTemplate.vars, policyTemplate.name);
+    const isOtelTraces = (dataStreamType || policyTemplate.type) === dataTypes.Traces;
+    const isOtelDynamicSignalTypes = policyTemplate.dynamic_signal_types === true;
     if (
       policyTemplate.input === OTEL_COLLECTOR_INPUT_TYPE &&
-      (dataStreamType || policyTemplate.type) === dataTypes.Traces
+      (isOtelTraces || isOtelDynamicSignalTypes)
     ) {
       vars = addUseAPMVarIfNotPresent(vars);
     }

x-pack/platform/plugins/shared/fleet/server/services/agent_policies/otel_collector.ts

@@ -89,7 +89,7 @@ export function generateOtelcolConfig(
 
         otelConfig = appendOtelComponents(otelConfig, 'processors', [attributesTransform]);
 
-        if (stream.data_stream.type === dataTypes.Traces && stream[USE_APM_VAR_NAME] === true) {
+        if (shouldAddAPMConfig) {
           if (!otelConfig?.connectors) {
             otelConfig.connectors = {};
           }