Activate ANN001 on all endtoend and parametric scenarios (#5661)

Author: cbeauchesne

pyproject.toml

@@ -175,18 +175,6 @@ ignore = [
     "ANN201",    # missing-return-type-undocumented-public-function: allow test_method to not declare their return type
 ]
 
-"tests/parametric/test_parametric_endpoints.py"= [ "ANN001" ]
-"tests/parametric/test_partial_flushing.py"= [ "ANN001" ]
-"tests/parametric/test_process_discovery.py"= [ "ANN001" ]
-"tests/parametric/test_sampling_delegation.py"= [ "ANN001" ]
-"tests/parametric/test_sampling_span_tags.py"= [ "ANN001" ]
-"tests/parametric/test_span_events.py"= [ "ANN001" ]
-"tests/parametric/test_span_links.py"= [ "ANN001" ]
-"tests/parametric/test_span_sampling.py"= [ "ANN001" ]
-"tests/parametric/test_telemetry.py"= [ "ANN001" ]
-"tests/parametric/test_trace_sampling.py"= [ "ANN001" ]
-"tests/parametric/test_tracer_flare.py"= [ "ANN001" ]
-
 "tests/debugger/test_debugger_exception_replay.py" = [
     "ANN001",    # missing-type-function-argument: TODO
 ]

tests/parametric/test_parametric_endpoints.py

@@ -1,6 +1,8 @@
 import pytest
 from utils.parametric.spec.trace import find_span, find_trace
 from utils import missing_feature, features, context, scenarios
+from utils.docker_fixtures import TestAgentAPI
+from .conftest import APMLibrary
 
 
 @features.partial_flush
@@ -12,7 +14,7 @@ class Test_Partial_Flushing:
     @missing_feature(
         context.library == "java", reason="java uses '>' so it needs one more span to force a partial flush"
     )
-    def test_partial_flushing_one_span(self, test_agent, test_library):
+    def test_partial_flushing_one_span(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and a single child. Finish the child, and ensure
         partial flushing triggers. This test explicitly enables partial flushing.
         """
@@ -24,7 +26,7 @@ def test_partial_flushing_one_span(self, test_agent, test_library):
     )
     @missing_feature(context.library == "golang", reason="partial flushing not enabled by default")
     @missing_feature(context.library == "dotnet", reason="partial flushing not enabled by default")
-    def test_partial_flushing_one_span_default(self, test_agent, test_library):
+    def test_partial_flushing_one_span_default(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and a single child. Finish the child, and ensure
         partial flushing triggers. This test assumes partial flushing is enabled by default.
         """
@@ -33,7 +35,7 @@ def test_partial_flushing_one_span_default(self, test_agent, test_library):
     @pytest.mark.parametrize(
         "library_env", [{"DD_TRACE_PARTIAL_FLUSH_MIN_SPANS": "5", "DD_TRACE_PARTIAL_FLUSH_ENABLED": "true"}]
     )
-    def test_partial_flushing_under_limit_one_payload(self, test_agent, test_library):
+    def test_partial_flushing_under_limit_one_payload(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and a single child. Finish the child, and ensure
         partial flushing does NOT trigger, since the partial flushing min spans is set to 5.
         """
@@ -42,13 +44,13 @@ def test_partial_flushing_under_limit_one_payload(self, test_agent, test_library
     @pytest.mark.parametrize(
         "library_env", [{"DD_TRACE_PARTIAL_FLUSH_MIN_SPANS": "1", "DD_TRACE_PARTIAL_FLUSH_ENABLED": "false"}]
     )
-    def test_partial_flushing_disabled(self, test_agent, test_library):
+    def test_partial_flushing_disabled(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and a single child. Finish the child, and ensure
         partial flushing does NOT trigger, since it's explicitly disabled.
         """
         self.no_partial_flush_test(test_agent, test_library)
 
-    def do_partial_flush_test(self, test_agent, test_library):
+    def do_partial_flush_test(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and a single child. Finish the child, and ensure
         partial flushing triggers.
         """
@@ -70,7 +72,7 @@ def do_partial_flush_test(self, test_agent, test_library):
         assert len(traces) == 1
         assert root_span["name"] == "root"
 
-    def no_partial_flush_test(self, test_agent, test_library):
+    def no_partial_flush_test(self, test_agent: TestAgentAPI, test_library: APMLibrary):
         """Create a trace with a root span and one child. Finish the child, and ensure
         partial flushing does NOT trigger.
         """

tests/parametric/test_partial_flushing.py

@@ -7,9 +7,10 @@
 from jsonschema import validate as validation_jsonschema
 from utils import features, scenarios, context, missing_feature
 from utils._context.component_version import Version
+from .conftest import APMLibrary
 
 
-def find_dd_memfds(test_library, pid: int) -> list[str]:
+def find_dd_memfds(test_library: APMLibrary, pid: int) -> list[str]:
     rc, out = test_library.container_exec_run(f"find /proc/{pid}/fd -lname '/memfd:datadog-tracer-info-*'")
     if not rc:
         return []
@@ -35,7 +36,7 @@ def validate_schema(payload: str) -> bool:
         return False
 
 
-def read_memfd(test_library, memfd_path: str):
+def read_memfd(test_library: APMLibrary, memfd_path: str):
     rc, output = test_library.container_exec_run_raw(f"cat {memfd_path}")
     if not rc:
         return rc, output
@@ -61,7 +62,7 @@ def get_context_tracer_version():
         return context.library.version
 
 
-def assert_v1(tracer_metadata, test_library, library_env):
+def assert_v1(tracer_metadata: dict, test_library: APMLibrary, library_env: dict[str, str]):
     assert tracer_metadata["runtime_id"]
     # assert tracer_metadata["hostname"]
 
@@ -75,7 +76,7 @@ def assert_v1(tracer_metadata, test_library, library_env):
     assert version == get_context_tracer_version()
 
 
-def assert_v2(tracer_metadata, test_library, library_env):
+def assert_v2(tracer_metadata: dict, test_library: APMLibrary, library_env: dict[str, str]):
     assert_v1(tracer_metadata, test_library, library_env)
     if library_env["DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"] == "true":
         assert "entrypoint.name" in tracer_metadata["process_tags"]
@@ -86,7 +87,7 @@ def assert_v2(tracer_metadata, test_library, library_env):
 asserters = {1: assert_v1, 2: assert_v2}
 
 
-def assert_metadata_content(test_library, library_env):
+def assert_metadata_content(test_library: APMLibrary, library_env: dict[str, str]):
     # NOTE(@dmehala): the server is started on container is always pid 1.
     # That's a strong assumption :hehe:
     # Maybe we should use `pidof pidof parametric-http-server` instead.
@@ -124,7 +125,7 @@ class Test_ProcessDiscovery:
             }
         ],
     )
-    def test_metadata_content_without_process_tags(self, test_library, library_env):
+    def test_metadata_content_without_process_tags(self, test_library: APMLibrary, library_env: dict[str, str]):
         """Verify the content of the memfd file matches the expected metadata format and structure"""
         with test_library:
             assert_metadata_content(test_library, library_env)
@@ -143,7 +144,7 @@ def test_metadata_content_without_process_tags(self, test_library, library_env):
             }
         ],
     )
-    def test_metadata_content_with_process_tags(self, test_library, library_env):
+    def test_metadata_content_with_process_tags(self, test_library: APMLibrary, library_env: dict[str, str]):
         """Verify the content of the memfd file matches the expected metadata format and structure"""
         with test_library:
             assert_metadata_content(test_library, library_env)

tests/parametric/test_process_discovery.py

@@ -8,6 +8,8 @@
 
 import pytest
 from utils import features, rfc, scenarios
+from utils.docker_fixtures import TestAgentAPI
+from .conftest import APMLibrary
 
 
 @features.decisionless_extraction
@@ -34,7 +36,9 @@ class Test_Decisionless_Extraction:
             }
         ],
     )
-    def test_sampling_delegation_extract_neither_decision_nor_delegation(self, test_agent, test_library):
+    def test_sampling_delegation_extract_neither_decision_nor_delegation(
+        self, test_agent: TestAgentAPI, test_library: APMLibrary
+    ):
         """Make your own sampling decision when the client doesn't send one.
 
         The behavior tested here is not specified in the sampling delegation
@@ -55,18 +59,15 @@ def test_sampling_delegation_extract_neither_decision_nor_delegation(self, test_
         parent_id = 34343434
         test_library.dd_extract_headers(
             [
-                ["x-datadog-trace-id", str(trace_id)],
-                ["x-datadog-parent-id", str(parent_id)],
-                ["x-datadog-origin", "rum"],
+                ("x-datadog-trace-id", str(trace_id)),
+                ("x-datadog-parent-id", str(parent_id)),
+                ("x-datadog-origin", "rum"),
             ]
         )
-        span_args = {
-            "name": "name",
-            "service": "service",
-            "resource": "resource",
-            "parent_id": parent_id,
-        }
-        with test_library, test_library.dd_start_span(**span_args):
+        with (
+            test_library,
+            test_library.dd_start_span(name="name", service="service", resource="resource", parent_id=parent_id),
+        ):
             pass
 
         (trace,) = test_agent.wait_for_num_traces(1)