Add end-to-end Test_ExtendedHeartbeat for app-extended-heartbeat telemetry event

manifests/cpp.yml

@@ -267,6 +267,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Consistent_Configs: missing_feature
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: missing_feature
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: missing_feature
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_good_use_case
   : missing_feature (extended configs are not supported)

manifests/dotnet.yml

@@ -995,6 +995,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Environment: v2.49.0
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: v3.39.0
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: v3.28.0
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_config_id: missing_feature (Not implemented)
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_temporary_use_case

manifests/golang.yml

@@ -1182,6 +1182,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Consistent_Configs: missing_feature (APMAPI-745)
   tests/parametric/test_telemetry.py::Test_Defaults: missing_feature
   tests/parametric/test_telemetry.py::Test_Environment: missing_feature
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: missing_feature
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: v2.1.0-dev.2
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_good_use_case
   : missing_feature (extended configs are not supported)

manifests/java.yml

@@ -3732,6 +3732,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Environment: v1.61.0-SNAPSHOT  # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: v1.23.0  # Java supports configurable extended heartbeat interval
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: 1.61.0-SNAPSHOT  # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_config_id: 1.61.0-SNAPSHOT  # Normalization of telemetry keys updated in https://github.com/DataDog/dd-trace-java/pull/10823
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_temporary_use_case

manifests/nodejs.yml

@@ -87,6 +87,7 @@ refs:
   - &ref_5_88_0 '>=5.88.0'
   - &ref_5_89_0 '>=5.89.0'
   - &ref_5_90_0 '>=5.90.0'
+  - &ref_5_94_0 '>=5.94.0'
   - &ref_6_0_0 '>=6.0.0-pre'
 manifest:
   tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts:
@@ -2078,6 +2079,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Defaults: *ref_5_6_0
   tests/parametric/test_telemetry.py::Test_Environment: *ref_5_6_0
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (does not collect otel_env.invalid metrics for otel_resource_attributes)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: *ref_5_94_0
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: *ref_5_41_0
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_config_id: missing_feature (Not implemented)
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_good_use_case

manifests/php.yml

@@ -840,6 +840,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Environment: missing_feature
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: missing_feature
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: v1.9.0
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_temporary_use_case
   : irrelevant (temporary use case for python, ruby and nodejs)

manifests/python.yml

@@ -1771,6 +1771,7 @@ manifest:
       component_version: <=2.16.0
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (OTEL Sampling config is mapped to a different datadog config)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (OTEL Sampling config is mapped to a different datadog config)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: v4.6.5
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: v3.7.0.dev
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_good_use_case
   : bug (APMAPI-1630)

manifests/ruby.yml

@@ -1534,6 +1534,7 @@ manifest:
   tests/parametric/test_telemetry.py::Test_Environment: missing_feature
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_hiding: missing_feature (Not implemented)
   tests/parametric/test_telemetry.py::Test_Environment::test_telemetry_otel_env_invalid: missing_feature (Not implemented)
+  tests/parametric/test_telemetry.py::Test_ExtendedHeartbeat: missing_feature
   tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: v2.31.0-dev
   ? tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin::test_stable_configuration_origin_extended_configs_good_use_case
   : bug (APMAPI-1631)

tests/parametric/test_telemetry.py

@@ -1304,3 +1304,67 @@ def test_telemetry_sca_enabled_not_propagated(self, test_agent: TestAgentAPI, te
             assert cfg_appsec_enabled[0].get("value") is None
         else:
             assert all(config_name not in configuration_by_name for config_name in dd_appsec_sca_enabled_names)
+
+
+@scenarios.parametric
+@rfc("https://datadoghq.atlassian.net/wiki/spaces/AP/pages/")
+@features.app_extended_heartbeat_event
+class Test_ExtendedHeartbeat:
+    """Test app-extended-heartbeat telemetry event"""
+
+    @pytest.mark.parametrize(
+        "library_env",
+        [
+            {
+                "DD_TELEMETRY_HEARTBEAT_INTERVAL": "1",
+                "_DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": "2",
+                "DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": "2",
+            }
+        ],
+    )
+    def test_extended_heartbeat_config_matches(self, test_agent: TestAgentAPI, test_library: APMLibrary):
+        """Test that app-extended-heartbeat configuration is a superset of app-started
+        and includes any updates from app-client-configuration-change.
+        """
+
+        with test_library.dd_start_span("test"):
+            pass
+
+        time.sleep(5)
+
+        events = test_agent.telemetry(clear=False)
+
+        app_started = None
+        extended_hb = None
+        config_changes = []
+
+        for event in events:
+            if test_agent._get_telemetry_event(event, "app-started"):  # noqa: SLF001
+                app_started = test_agent._get_telemetry_event(event, "app-started")  # noqa: SLF001
+            if test_agent._get_telemetry_event(event, "app-extended-heartbeat"):  # noqa: SLF001
+                extended_hb = test_agent._get_telemetry_event(event, "app-extended-heartbeat")  # noqa: SLF001
+            if test_agent._get_telemetry_event(event, "app-client-configuration-change"):  # noqa: SLF001
+                config_changes.append(test_agent._get_telemetry_event(event, "app-client-configuration-change"))  # noqa: SLF001
+
+        assert app_started is not None, "app-started event not found"
+        assert extended_hb is not None, "app-extended-heartbeat event not found"
+
+        started_config = {c["name"]: c.get("value") for c in app_started["payload"].get("configuration", [])}
+        extended_config = {c["name"]: c.get("value") for c in extended_hb["payload"].get("configuration", [])}
+
+        # Build expected config: start with app-started, then apply any config changes on top
+        expected_config = dict(started_config)
+        for change_event in config_changes:
+            change_config = {c["name"]: c.get("value") for c in change_event["payload"].get("configuration", [])}
+            expected_config.update(change_config)
+
+        # All expected configs should be present in app-extended-heartbeat with matching values
+        for name, value in expected_config.items():
+            assert name in extended_config, (
+                f"Config '{name}' missing in app-extended-heartbeat. "
+                f"Expected keys: {sorted(expected_config.keys())}, "
+                f"Got keys: {sorted(extended_config.keys())}"
+            )
+            assert extended_config[name] == value, (
+                f"Config '{name}' value mismatch. Expected: {value}, Got: {extended_config[name]}"
+            )