make telemetry_mapping a string; include DD_TRACE_DEBUG for golang key

Author: mtoffl01

tests/parametric/test_telemetry.py

@@ -83,7 +83,7 @@
         "java": "trace_debug",
         "ruby": "DD_TRACE_DEBUG",
         "python": "DD_TRACE_DEBUG",
-        "golang": "DD_TRACE_DEBUG",  # Before v2.5.0-dev, the telemetry name was "trace_debug_enabled" — see _mapped_telemetry_name
+        "golang": ["trace_debug_enabled", "DD_TRACE_DEBUG"],
     },
     "tags": {
         "java": "trace_tags",
@@ -98,18 +98,14 @@
 }
 
 
-def _mapped_telemetry_name(apm_telemetry_name: str):
+def _mapped_telemetry_name(apm_telemetry_name: str) -> list[str]:
     if apm_telemetry_name in telemetry_name_mapping:
         mapped_name = telemetry_name_mapping[apm_telemetry_name].get(context.library.name)
         if mapped_name is not None:
-            if (
-                apm_telemetry_name == "trace_debug_enabled"
-                and context.library.name == "golang"
-                and context.library <= "[email protected]"
-            ):
-                return "trace_debug_enabled"
-            return mapped_name
-    return apm_telemetry_name
+            if isinstance(mapped_name, list):
+                return mapped_name
+            return [mapped_name]
+    return [apm_telemetry_name]
 
 
 def _find_configuration_by_origin(config_list: list[dict], origin: str) -> dict | None:
@@ -225,22 +221,26 @@ def test_library_settings(self, library_env: dict[str, str], test_agent: TestAge
             if context.library == "python" and apm_telemetry_name in ("trace_sample_rate",):
                 # DD_TRACE_SAMPLE_RATE is not supported in ddtrace>=3.x
                 continue
-            mapped_apm_telemetry_name = _mapped_telemetry_name(apm_telemetry_name)
+            mapped_apm_telemetry_names = _mapped_telemetry_name(apm_telemetry_name)
 
-            cfg_item = test_agent.get_telemetry_config_by_origin(
-                configuration_by_name, mapped_apm_telemetry_name, "default"
-            )
+            cfg_item = None
+            for mapped_name in mapped_apm_telemetry_names:
+                cfg_item = test_agent.get_telemetry_config_by_origin(
+                    configuration_by_name, mapped_name, "default"
+                )
+                if cfg_item is not None:
+                    break
             assert (
                 cfg_item is not None
-            ), f"No configuration found for '{mapped_apm_telemetry_name}' with origin 'default'"
+            ), f"No configuration found for any of '{mapped_apm_telemetry_names}' with origin 'default'"
             assert isinstance(cfg_item, dict)
             if isinstance(value, tuple):
                 assert (
                     cfg_item.get("value") in value
-                ), f"Unexpected value for '{mapped_apm_telemetry_name}' ('{context.library}')"
+                ), f"Unexpected value for '{mapped_apm_telemetry_names}' ('{context.library}')"
             else:
-                assert cfg_item.get("value") == value, f"Unexpected value for '{mapped_apm_telemetry_name}'"
-            assert cfg_item.get("origin") == "default", f"Unexpected origin for '{mapped_apm_telemetry_name}'"
+                assert cfg_item.get("value") == value, f"Unexpected value for '{mapped_apm_telemetry_names}'"
+            assert cfg_item.get("origin") == "default", f"Unexpected origin for '{mapped_apm_telemetry_names}'"
 
 
 @scenarios.parametric
@@ -438,17 +438,21 @@ def test_library_settings(self, library_env: dict[str, str], test_agent: TestAge
                 # DD_TRACE_SAMPLE_RATE is not supported in ddtrace>=3.x
                 continue
 
-            mapped_apm_telemetry_name = _mapped_telemetry_name(apm_telemetry_name)
-            cfg_item = test_agent.get_telemetry_config_by_origin(
-                configuration_by_name, mapped_apm_telemetry_name, "env_var"
-            )
-            assert cfg_item is not None, f"Missing telemetry config item for '{mapped_apm_telemetry_name}'"
+            mapped_apm_telemetry_names = _mapped_telemetry_name(apm_telemetry_name)
+            cfg_item = None
+            for mapped_name in mapped_apm_telemetry_names:
+                cfg_item = test_agent.get_telemetry_config_by_origin(
+                    configuration_by_name, mapped_name, "env_var"
+                )
+                if cfg_item is not None:
+                    break
+            assert cfg_item is not None, f"Missing telemetry config item for any of '{mapped_apm_telemetry_names}'"
             assert isinstance(cfg_item, dict)
             if isinstance(environment_value, tuple):
-                assert cfg_item.get("value") in environment_value, f"Unexpected value for '{mapped_apm_telemetry_name}'"
+                assert cfg_item.get("value") in environment_value, f"Unexpected value for '{mapped_apm_telemetry_names}'"
             else:
-                assert cfg_item.get("value") == environment_value, f"Unexpected value for '{mapped_apm_telemetry_name}'"
-            assert cfg_item.get("origin") == "env_var", f"Unexpected origin for '{mapped_apm_telemetry_name}'"
+                assert cfg_item.get("value") == environment_value, f"Unexpected value for '{mapped_apm_telemetry_names}'"
+            assert cfg_item.get("origin") == "env_var", f"Unexpected origin for '{mapped_apm_telemetry_names}'"
 
     @missing_feature(context.library == "dotnet", reason="Not implemented")
     @missing_feature(context.library == "java", reason="Not implemented")
@@ -694,13 +698,17 @@ def test_stable_configuration_origin(
             # The Go tracer does not support logs injection.
             if context.library == "golang" and cfg_name == "logs_injection_enabled":
                 continue
-            apm_telemetry_name = _mapped_telemetry_name(cfg_name)
-            telemetry_item = test_agent.get_telemetry_config_by_origin(
-                configuration_by_name, apm_telemetry_name, expected_origin
-            )
+            apm_telemetry_names = _mapped_telemetry_name(cfg_name)
+            telemetry_item = None
+            for apm_name in apm_telemetry_names:
+                telemetry_item = test_agent.get_telemetry_config_by_origin(
+                    configuration_by_name, apm_name, expected_origin
+                )
+                if telemetry_item is not None:
+                    break
             assert (
                 telemetry_item is not None
-            ), f"No configuration found for '{apm_telemetry_name}' with origin '{expected_origin}'"
+            ), f"No configuration found for any of '{apm_telemetry_names}' with origin '{expected_origin}'"
             assert isinstance(telemetry_item, dict)
             assert telemetry_item["origin"] == expected_origin, f"wrong origin for {telemetry_item}"
             assert telemetry_item["value"]
@@ -755,25 +763,33 @@ def test_stable_configuration_config_id(
             test_library.dd_start_span("test")
         configuration_by_name = test_agent.wait_for_telemetry_configurations()
         # Configuration set via fleet config should have the config_id set
-        apm_telemetry_name = _mapped_telemetry_name("trace_debug_enabled")
-        telemetry_item = test_agent.get_telemetry_config_by_origin(
-            configuration_by_name, apm_telemetry_name, "fleet_stable_config"
-        )
+        apm_telemetry_names = _mapped_telemetry_name("trace_debug_enabled")
+        telemetry_item = None
+        for apm_name in apm_telemetry_names:
+            telemetry_item = test_agent.get_telemetry_config_by_origin(
+                configuration_by_name, apm_name, "fleet_stable_config"
+            )
+            if telemetry_item is not None:
+                break
         assert (
             telemetry_item is not None
-        ), f"No configuration found for '{apm_telemetry_name}' with origin 'fleet_stable_config'"
+        ), f"No configuration found for any of '{apm_telemetry_names}' with origin 'fleet_stable_config'"
         assert isinstance(telemetry_item, dict)
         assert telemetry_item["origin"] == "fleet_stable_config"
         assert telemetry_item["config_id"] == fleet_config_id
 
         # Configuration set via local config should not have the config_id set
-        apm_telemetry_name = _mapped_telemetry_name("dynamic_instrumentation_enabled")
-        telemetry_item = test_agent.get_telemetry_config_by_origin(
-            configuration_by_name, apm_telemetry_name, "local_stable_config"
-        )
+        apm_telemetry_names = _mapped_telemetry_name("dynamic_instrumentation_enabled")
+        telemetry_item = None
+        for apm_name in apm_telemetry_names:
+            telemetry_item = test_agent.get_telemetry_config_by_origin(
+                configuration_by_name, apm_name, "local_stable_config"
+            )
+            if telemetry_item is not None:
+                break
         assert (
             telemetry_item is not None
-        ), f"No configuration found for '{apm_telemetry_name}' with origin 'local_stable_config'"
+        ), f"No configuration found for any of '{apm_telemetry_names}' with origin 'local_stable_config'"
         assert isinstance(telemetry_item, dict)
         assert telemetry_item["origin"] == "local_stable_config"
         assert "config_id" not in telemetry_item or telemetry_item["config_id"] is None
@@ -842,13 +858,17 @@ def test_stable_configuration_origin_extended_configs_good_use_case(
             test_library.dd_start_span("test")
         configuration_by_name = test_agent.wait_for_telemetry_configurations()
         for cfg_name, expected_origin in expected_origins.items():
-            apm_telemetry_name = _mapped_telemetry_name(cfg_name)
-            telemetry_item = test_agent.get_telemetry_config_by_origin(
-                configuration_by_name, apm_telemetry_name, expected_origin
-            )
+            apm_telemetry_names = _mapped_telemetry_name(cfg_name)
+            telemetry_item = None
+            for apm_name in apm_telemetry_names:
+                telemetry_item = test_agent.get_telemetry_config_by_origin(
+                    configuration_by_name, apm_name, expected_origin
+                )
+                if telemetry_item is not None:
+                    break
             assert (
                 telemetry_item is not None
-            ), f"No configuration found for '{apm_telemetry_name}' with origin '{expected_origin}'. Full configuration_by_name: {configuration_by_name}"
+            ), f"No configuration found for any of '{apm_telemetry_names}' with origin '{expected_origin}'. Full configuration_by_name: {configuration_by_name}"
 
             assert isinstance(telemetry_item, dict)
             actual_origin = telemetry_item.get("origin", "<missing>")
@@ -929,13 +949,17 @@ def test_stable_configuration_origin_extended_configs_temporary_use_case(
             elif cfg_name == "tags" and context.library.name in ["ruby"]:
                 continue
             else:
-                apm_telemetry_name = _mapped_telemetry_name(cfg_name)
-                telemetry_item = test_agent.get_telemetry_config_by_origin(
-                    configuration_by_name, apm_telemetry_name, expected_origin
-                )
+                apm_telemetry_names = _mapped_telemetry_name(cfg_name)
+                telemetry_item = None
+                for apm_name in apm_telemetry_names:
+                    telemetry_item = test_agent.get_telemetry_config_by_origin(
+                        configuration_by_name, apm_name, expected_origin
+                    )
+                    if telemetry_item is not None:
+                        break
                 assert (
                     telemetry_item is not None
-                ), f"No configuration found for '{apm_telemetry_name}' with origin '{expected_origin}'. Full configuration_by_name: {configuration_by_name}"
+                ), f"No configuration found for any of '{apm_telemetry_names}' with origin '{expected_origin}'. Full configuration_by_name: {configuration_by_name}"
                 assert isinstance(telemetry_item, dict)
                 actual_origin = telemetry_item.get("origin", "<missing>")
                 assert (
@@ -1087,11 +1111,15 @@ def test_injection_enabled(
         test_agent.wait_for_telemetry_configurations()
 
         configuration_by_name = test_agent.wait_for_telemetry_configurations(service="service_test")
-        ssi_enabled_telemetry_name = _mapped_telemetry_name("ssi_injection_enabled")
-        inject_enabled = test_agent.get_telemetry_config_by_origin(
-            configuration_by_name, ssi_enabled_telemetry_name, "env_var", fallback_to_first=(expected_value is None)
-        )
-        assert inject_enabled is not None, f"No configuration found for '{ssi_enabled_telemetry_name}'"
+        ssi_enabled_telemetry_names = _mapped_telemetry_name("ssi_injection_enabled")
+        inject_enabled = None
+        for ssi_name in ssi_enabled_telemetry_names:
+            inject_enabled = test_agent.get_telemetry_config_by_origin(
+                configuration_by_name, ssi_name, "env_var", fallback_to_first=(expected_value is None)
+            )
+            if inject_enabled is not None:
+                break
+        assert inject_enabled is not None, f"No configuration found for any of '{ssi_enabled_telemetry_names}'"
         assert isinstance(inject_enabled, dict)
         assert inject_enabled.get("value") == expected_value
         if expected_value is not None:
@@ -1138,11 +1166,15 @@ def test_inject_force(
         test_agent.wait_for_telemetry_configurations()
         configuration_by_name = test_agent.wait_for_telemetry_configurations(service="service_test")
         # # Check that the tags name match the expected value
-        inject_force_telemetry_name = _mapped_telemetry_name("ssi_forced_injection_enabled")
-        inject_force = test_agent.get_telemetry_config_by_origin(
-            configuration_by_name, inject_force_telemetry_name, "env_var", fallback_to_first=(expected_value == "none")
-        )
-        assert inject_force is not None, f"No configuration found for '{inject_force_telemetry_name}'"
+        inject_force_telemetry_names = _mapped_telemetry_name("ssi_forced_injection_enabled")
+        inject_force = None
+        for inject_force_name in inject_force_telemetry_names:
+            inject_force = test_agent.get_telemetry_config_by_origin(
+                configuration_by_name, inject_force_name, "env_var", fallback_to_first=(expected_value == "none")
+            )
+            if inject_force is not None:
+                break
+        assert inject_force is not None, f"No configuration found for any of '{inject_force_telemetry_names}'"
         assert isinstance(inject_force, dict)
         assert str(inject_force.get("value")).lower() == expected_value
         if expected_value != "none":
@@ -1160,14 +1192,18 @@ def test_instrumentation_source_non_ssi(
         test_agent.wait_for_telemetry_configurations()
         configuration_by_name = test_agent.wait_for_telemetry_configurations(service="service_test")
         # Check that the tags name match the expected value
-        instrumentation_source_telemetry_name = _mapped_telemetry_name("instrumentation_source")
+        instrumentation_source_telemetry_names = _mapped_telemetry_name("instrumentation_source")
         # Take any configuration (origin doesn't matter for this test)
-        instrumentation_source = test_agent.get_telemetry_config_by_origin(
-            configuration_by_name, instrumentation_source_telemetry_name, "default", fallback_to_first=True
-        )
+        instrumentation_source = None
+        for instrumentation_source_name in instrumentation_source_telemetry_names:
+            instrumentation_source = test_agent.get_telemetry_config_by_origin(
+                configuration_by_name, instrumentation_source_name, "default", fallback_to_first=True
+            )
+            if instrumentation_source is not None:
+                break
         assert (
             instrumentation_source is not None
-        ), f"No configuration found for '{instrumentation_source_telemetry_name}'"
+        ), f"No configuration found for any of '{instrumentation_source_telemetry_names}'"
         assert isinstance(instrumentation_source, dict)
         value: str | None = instrumentation_source.get("value")
         assert value is not None