Fix imports

Author: cbeauchesne

tests/parametric/test_otel_logs.py

@@ -1,13 +1,15 @@
-import pytest
 import base64
+from collections.abc import Generator
+from urllib.parse import urlparse
+
+import pytest
 
 from utils import scenarios, features, logger, irrelevant, context
-from utils.parametric._library_client import LogLevel
-from utils.docker_fixtures.spec.trace import find_only_span
-from urllib.parse import urlparse
+from utils.docker_fixtures.parametric import LogLevel
 from utils.docker_fixtures import TestAgentAPI
+from utils.docker_fixtures.spec.trace import find_only_span
+
 from .conftest import APMLibrary
-from collections.abc import Generator
 
 
 def find_log_record(log_payloads: list[dict], logger_name: str, log_message: str) -> dict | None:

tests/parametric/test_otel_span_methods.py

@@ -2,16 +2,16 @@
 
 import pytest
 
-from utils.parametric._library_client import Link
 from opentelemetry.trace import StatusCode
 from opentelemetry.trace import SpanKind
+from utils.docker_fixtures.parametric import Link
 from utils.docker_fixtures.spec.trace import find_span
 from utils.docker_fixtures.spec.trace import find_trace
 from utils.docker_fixtures.spec.trace import retrieve_span_events
 from utils.docker_fixtures.spec.trace import retrieve_span_links
 from utils.docker_fixtures.spec.trace import find_first_span_in_trace_payload
-from utils import bug, features, missing_feature, irrelevant, context, scenarios
 from utils.docker_fixtures import TestAgentAPI
+from utils import bug, features, missing_feature, irrelevant, context, scenarios
 from .conftest import APMLibrary
 
 # this global mark applies to all tests in this file.

tests/parametric/test_parametric_endpoints.py

@@ -9,16 +9,17 @@
 import pytest
 import time
 
+from opentelemetry.trace import SpanKind
+from opentelemetry.trace import StatusCode
+
+from utils import irrelevant, bug, incomplete_test_app, scenarios, features, context
 from utils.docker_fixtures.spec.trace import find_trace
 from utils.docker_fixtures.spec.trace import find_span
 from utils.docker_fixtures.spec.trace import find_span_in_traces
 from utils.docker_fixtures.spec.trace import retrieve_span_links
 from utils.docker_fixtures.spec.trace import retrieve_span_events
 from utils.docker_fixtures.spec.trace import find_only_span
-from utils import irrelevant, bug, incomplete_test_app, scenarios, features, context
-from opentelemetry.trace import SpanKind
-from opentelemetry.trace import StatusCode
-from utils.parametric._library_client import Link, LogLevel
+from utils.docker_fixtures.parametric import Link, LogLevel
 from utils.docker_fixtures import TestAgentAPI, ParametricTestClientApi as APMLibrary
 
 # this global mark applies to all tests in this file.

utils/docker_fixtures/_test_clients/_test_client_parametric.py

@@ -1,10 +1,9 @@
 from collections.abc import Generator, Iterable
 import contextlib
-from enum import Enum
 from http import HTTPStatus
 import time
 from types import TracebackType
-from typing import TextIO, TypedDict, NotRequired
+from typing import TextIO, TypedDict
 import urllib.parse
 
 from _pytest.outcomes import Failed
@@ -16,6 +15,7 @@
 from utils.docker_fixtures._core import get_host_port, docker_run
 from utils.docker_fixtures._test_agent import TestAgentAPI
 from utils.docker_fixtures.spec.otel_trace import OtelSpanContext
+from utils.docker_fixtures.parametric import LogLevel, Link
 from utils._logger import logger
 
 from ._core import TestClientFactory
@@ -89,13 +89,6 @@ def get_apm_library(
             yield client
 
 
-class LogLevel(Enum):
-    DEBUG = "DEBUG"
-    INFO = "INFO"
-    WARNING = "WARNING"
-    ERROR = "ERROR"
-
-
 def _fail(message: str):
     """Used to mak a test as failed"""
     logger.error(message)
@@ -112,11 +105,6 @@ class SpanResponse(TypedDict):
     trace_id: int
 
 
-class Link(TypedDict):
-    parent_id: int
-    attributes: NotRequired[dict]
-
-
 class Event(TypedDict):
     time_unix_nano: int
     name: str

utils/docker_fixtures/parametric.py

@@ -0,0 +1,14 @@
+from enum import Enum
+from typing import TypedDict, NotRequired
+
+
+class LogLevel(Enum):
+    DEBUG = "DEBUG"
+    INFO = "INFO"
+    WARNING = "WARNING"
+    ERROR = "ERROR"
+
+
+class Link(TypedDict):
+    parent_id: int
+    attributes: NotRequired[dict]