Fix typing, add tests

DataDog · May 2, 2024 · b9a145a · b9a145a
1 parent e1347b5
commit b9a145a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ddtrace/internal/telemetry/writer.py b/ddtrace/internal/telemetry/writer.py
@@ -4,6 +4,7 @@
 import sys
 import time
 from types import ModuleType
+from typing import cast
 from typing import TYPE_CHECKING  # noqa:F401
 from typing import Any  # noqa:F401
 from typing import Dict  # noqa:F401
@@ -426,6 +427,7 @@ def _app_started_event(self, register_app_shutdown=True):
         if "DD_INSTRUMENTATION_CONFIG_ID" in os.environ:
             package_source_entry[1] = os.environ["DD_INSTRUMENTATION_CONFIG_ID"]
             package_source_entry[2] = "environment"
+        package_source_entry_t = cast(Tuple[str, str, str], tuple(package_source_entry))
 
         self.add_configurations(
             [
@@ -440,7 +442,7 @@ def _app_started_event(self, register_app_shutdown=True):
                 self._telemetry_entry("trace_http_header_tags"),
                 self._telemetry_entry("tags"),
                 self._telemetry_entry("_tracing_enabled"),
-                package_source_entry,
+                package_source_entry_t,
                 (TELEMETRY_STARTUP_LOGS_ENABLED, config._startup_logs_enabled, "unknown"),
                 (TELEMETRY_DYNAMIC_INSTRUMENTATION_ENABLED, di_config.enabled, "unknown"),
                 (TELEMETRY_EXCEPTION_DEBUGGING_ENABLED, ed_config.enabled, "unknown"),

diff --git a/tests/telemetry/test_writer.py b/tests/telemetry/test_writer.py
@@ -146,6 +146,7 @@ def test_app_started_event(telemetry_writer, test_agent_session, mock_time):
                     {"name": "logs_injection_enabled", "origin": "default", "value": "false"},
                     {"name": "trace_tags", "origin": "default", "value": ""},
                     {"name": "tracing_enabled", "origin": "default", "value": "true"},
+                    {"name": "instrumentation_config_id", "origin": "default", "value": ""},
                 ],
                 key=lambda x: x["name"],
             ),
@@ -229,6 +230,7 @@ def test_app_started_event_configuration_override(
     env["DD_TRACE_WRITER_INTERVAL_SECONDS"] = "30"
     env["DD_TRACE_WRITER_REUSE_CONNECTIONS"] = "True"
     env["DD_TAGS"] = "team:apm,component:web"
+    env["DD_INSTRUMENTATION_CONFIG_ID"] = "abcedf123"
     env[env_var] = value
 
     file = tmpdir.join("moon_ears.json")
@@ -314,6 +316,7 @@ def test_app_started_event_configuration_override(
             {"name": "trace_header_tags", "origin": "default", "value": ""},
             {"name": "trace_tags", "origin": "env_var", "value": "team:apm,component:web"},
             {"name": "tracing_enabled", "origin": "env_var", "value": "false"},
+            {"name": "instrumentation_config_id", "origin": "env_var", "value": "abcedf123"},
         ],
         key=lambda x: x["name"],
     )