Merge branch 'main' into tyler.finethy/DEBUG-4341

Author: tylfin

pyproject.toml

@@ -174,11 +174,7 @@ ignore = [
 "tests/*test_*.py" = [
     "ANN201",    # missing-return-type-undocumented-public-function: allow test_method to not declare their return type
 ]
-
-"tests/{parametric,apm_tracing_e2e,appsec,debugger,serverless,remote_config,k8,integrations}*/test_*.py" = [
-    "ANN001",    # missing-type-function-argument: TODO
-]
-"tests/{test_te,test_b,test_c,test_d,test_g,test_i,test_l,test_n,test_p,test_s}*.py" = [
+"tests/{parametric,appsec,debugger,remote_config}*/test_*.py" = [
     "ANN001",    # missing-type-function-argument: TODO
 ]
 "tests/*" = [

tests/apm_tracing_e2e/test_otel.py

@@ -80,14 +80,14 @@ def test_distributed_otel_trace(self):
         assert len(spans) == 3
 
 
-def _get_span_by_name(spans, span_name):
+def _get_span_by_name(spans: list[dict], span_name: str):
     for s in spans:
         if s["name"] == span_name:
             return s
     return {}
 
 
-def _get_span_by_resource(spans, resource_name):
+def _get_span_by_resource(spans: list[dict], resource_name: str):
     for s in spans:
         if s["resource"] == resource_name:
             return s

tests/apm_tracing_e2e/test_single_span.py

@@ -67,7 +67,7 @@ def test_child_span_is_single_span(self):
         _assert_single_span_event(spans[0], "child.span.single_span_submitted", is_root=False)
 
 
-def _assert_single_span_event(event, name, is_root):
+def _assert_single_span_event(event: dict, name: str, *, is_root: bool):
     assert event["operation_name"] == name
     assert event["single_span"] is True
     assert event["ingestion_reason"] == "single_span"
@@ -79,7 +79,7 @@ def _assert_single_span_event(event, name, is_root):
         assert len(parent_id) > 0, f"In a child span the parent_id should be specified. Actual: {parent_id}"
 
 
-def _assert_single_span_metrics(span):
+def _assert_single_span_metrics(span: dict):
     assert span["metrics"][SAMPLING_PRIORITY_KEY] == -1  # due to the global sampling rate = 0
     assert span["metrics"][SINGLE_SPAN_SAMPLING_RATE] == 1.0
     assert span["metrics"][SINGLE_SPAN_SAMPLING_MECHANISM] == SINGLE_SPAN_SAMPLING_MECHANISM_VALUE

tests/auto_inject/test_auto_inject_install.py

@@ -109,7 +109,7 @@ class TestContainerAutoInjectInstallScriptProfiling(base.AutoInjectBaseTest):
     )
     @bug(
         context.weblog_variant == "test-app-nodejs-container-25",
-        reason="APMSP-2331",
+        reason="PROF-12765",
     )
     def test_profiling(self):
         self._test_install(context.virtual_machine, profile=True)
@@ -221,10 +221,6 @@ def test_no_world_writeable(self):
 @scenarios.simple_installer_auto_injection
 @scenarios.multi_installer_auto_injection
 class TestSimpleInstallerAutoInjectManual(base.AutoInjectBaseTest):
-    @irrelevant(
-        context.library > "python@2.21.0" and context.installed_language_runtime < "3.8.0",
-        reason="python 3.7 is not supported on ddtrace >= 3.x",
-    )
     def test_install(self):
         virtual_machine = context.virtual_machine
         logger.info(

tests/debugger/test_debugger_probe_snapshot.py

@@ -6,7 +6,7 @@
 import tests.debugger.utils as debugger
 
 
-from utils import scenarios, features, missing_feature, context, irrelevant
+from utils import scenarios, features, missing_feature, context, irrelevant, bug
 from utils.interfaces._library.miscs import validate_process_tags
 
 
@@ -213,6 +213,7 @@ class Test_Debugger_Line_Probe_Snaphots(BaseDebuggerProbeSnaphotTest):
     def setup_log_line_snapshot(self):
         self._setup("probe_snapshot_log_line", "/debugger/log", "log", lines=None)
 
+    @bug(context.library == "nodejs", reason="DEBUG-4611")
     def test_log_line_snapshot(self):
         self._assert()
         self._validate_snapshots()
@@ -223,7 +224,6 @@ def setup_log_line_snapshot_debug_track(self):
 
     @missing_feature(context.library == "ruby", reason="DEBUG-4343")
     @missing_feature(context.library == "nodejs", reason="DEBUG-4345")
-    @missing_feature(context.library == "java", reason="APMRP-360")
     def test_log_line_snapshot_debug_track(self):
         """Test that the library sends snapshots to the debug track endpoint (fallback or not)"""
         self._assert()
@@ -235,7 +235,7 @@ def setup_log_line_snapshot_new_destination(self):
 
     @missing_feature(context.library == "ruby", reason="DEBUG-4343")
     @missing_feature(context.library == "nodejs", reason="DEBUG-4345")
-    @missing_feature(context.library == "java", reason="APMRP-360")
+    @missing_feature(context.agent_version < "7.72.0", reason="Endpoint was introduced in 7.72.0", force_skip=True)
     def test_log_line_snapshot_new_destination(self):
         """Test that the library sends snapshots to the debugger/v2/input endpoint"""
         self._assert()
@@ -298,6 +298,7 @@ class Test_Debugger_Line_Probe_Snaphots_With_SCM(BaseDebuggerProbeSnaphotTest):
     def setup_log_line_snapshot(self):
         self._setup("probe_snapshot_log_line", "/debugger/log", "log", lines=None)
 
+    @bug(context.library == "nodejs", reason="DEBUG-4611")
     def test_log_line_snapshot(self):
         self._assert()
         self._validate_snapshots()

tests/debugger/utils/probes/probe_snapshot_log_line.json

@@ -4,6 +4,7 @@
         "type": "",
         "id": "",
         "version": 0,
+        "captureSnapshot": true,
         "where": {
             "typeName": null,
             "sourceFile": "ACTUAL_SOURCE_FILE",

tests/docker_ssi/test_docker_ssi_appsec.py

@@ -17,6 +17,7 @@ def setup_telemetry_source_ssi(self):
     @missing_feature(condition=context.library in ("nodejs", "java", "php", "dotnet"), reason="No implemented")
     @missing_feature(context.library < "python@3.15.0", reason="No implemented")
     @irrelevant(context.library == "python" and context.installed_language_runtime < "3.8.0")
+    @irrelevant(context.library >= "python@3.32.0" and context.installed_language_runtime < "3.9.0")
     def test_telemetry_source_ssi(self):
         root_span = interfaces.test_agent.get_traces(request=self.r)
         assert root_span, f"No traces found for request {self.r.get_rid()}"

tests/integrations/crossed_integrations/test_kafka.py

@@ -15,7 +15,7 @@ class _BaseKafka:
     buddy_interface: interfaces.LibraryInterfaceValidator
 
     @classmethod
-    def get_span(cls, interface, span_kind, topic) -> dict | None:
+    def get_span(cls, interface: interfaces.LibraryInterfaceValidator, span_kind: str, topic: str) -> dict | None:
         logger.debug(f"Trying to find traces with span kind: {span_kind} and topic: {topic} in {interface}")
 
         for data, trace in interface.get_traces():
@@ -36,7 +36,7 @@ def get_span(cls, interface, span_kind, topic) -> dict | None:
         return None
 
     @staticmethod
-    def get_topic(span) -> str | None:
+    def get_topic(span: dict) -> str | None:
         """Extracts the topic from a span by trying various fields"""
         topic = span["meta"].get("kafka.topic")  # this is in python
         if topic is None:
@@ -131,7 +131,12 @@ def test_consume_trace_equality(self):
         assert consumer_span is not None
         assert producer_span["trace_id"] == consumer_span["trace_id"]
 
-    def validate_kafka_spans(self, producer_interface, consumer_interface, topic):
+    def validate_kafka_spans(
+        self,
+        producer_interface: interfaces.LibraryInterfaceValidator,
+        consumer_interface: interfaces.LibraryInterfaceValidator,
+        topic: str,
+    ):
         """Validates production/consumption of kafka message.
         It works the same for both test_produce and test_consume
         """

tests/integrations/crossed_integrations/test_kinesis.py

@@ -15,7 +15,9 @@ class _BaseKinesis:
     unique_id: str
 
     @classmethod
-    def get_span(cls, interface, span_kind, stream, operation) -> dict | None:
+    def get_span(
+        cls, interface: interfaces.LibraryInterfaceValidator, span_kind: list[str], stream: str, operation: str
+    ) -> dict | None:
         logger.debug(f"Trying to find traces with span kind: {span_kind} and stream: {stream} in {interface}")
 
         for data, trace in interface.get_traces():
@@ -53,7 +55,7 @@ def get_span(cls, interface, span_kind, stream, operation) -> dict | None:
         return None
 
     @staticmethod
-    def get_stream(span) -> str | None:
+    def get_stream(span: dict) -> str | None:
         """Extracts the stream from a span by trying various fields"""
         stream = span["meta"].get("streamname", None)  # this is in nodejs, java, python
 
@@ -187,7 +189,12 @@ def test_consume_trace_equality(self):
         assert consumer_span is not None
         assert producer_span["trace_id"] == consumer_span["trace_id"]
 
-    def validate_kinesis_spans(self, producer_interface, consumer_interface, stream):
+    def validate_kinesis_spans(
+        self,
+        producer_interface: interfaces.LibraryInterfaceValidator,
+        consumer_interface: interfaces.LibraryInterfaceValidator,
+        stream: str,
+    ):
         """Validates production/consumption of Kinesis message.
         It works the same for both test_produce and test_consume
         """

tests/integrations/crossed_integrations/test_rabbitmq.py

@@ -19,7 +19,14 @@ class _BaseRabbitMQ:
     buddy_interface: interfaces.LibraryInterfaceValidator
 
     @classmethod
-    def get_span(cls, interface, span_kind, queue, exchange, operation) -> dict | None:
+    def get_span(
+        cls,
+        interface: interfaces.LibraryInterfaceValidator,
+        span_kind: str,
+        queue: str,
+        exchange: str,
+        operation: list[str],
+    ) -> dict | None:
         logger.debug(f"Trying to find traces with span kind: {span_kind} and queue: {queue} in {interface}")
 
         for data, trace in interface.get_traces():
@@ -32,17 +39,17 @@ def get_span(cls, interface, span_kind, queue, exchange, operation) -> dict | No
 
                 operation_found = False
                 for op in operation:
-                    if op.lower() in span.get("resource").lower() or op.lower() in span.get("name").lower():
+                    if op.lower() in span["resource"].lower() or op.lower() in span["name"].lower():
                         operation_found = True
                         break
 
                 if not operation_found:
                     continue
 
-                meta = span.get("meta")
+                meta: dict[str, str] = span["meta"]
                 if (
-                    queue.lower() not in span.get("resource").lower()
-                    and exchange.lower() not in span.get("resource").lower()
+                    queue.lower() not in span["resource"].lower()
+                    and exchange.lower() not in span["resource"].lower()
                     and queue.lower() not in meta.get("rabbitmq.routing_key", "").lower()
                     # this is where we find the queue name in dotnet 👇
                     and queue.lower() not in meta.get("amqp.routing_key", "").lower()
@@ -188,7 +195,13 @@ def test_consume_trace_equality(self):
         assert consumer_span is not None
         assert producer_span["trace_id"] == consumer_span["trace_id"]
 
-    def validate_rabbitmq_spans(self, producer_interface, consumer_interface, queue, exchange):
+    def validate_rabbitmq_spans(
+        self,
+        producer_interface: interfaces.LibraryInterfaceValidator,
+        consumer_interface: interfaces.LibraryInterfaceValidator,
+        queue: str,
+        exchange: str,
+    ):
         """Validates production/consumption of RabbitMQ message.
         It works the same for both test_produce and test_consume
         """