Move parametric utils in docker_fixtures (#5756)

cbeauchesne · web-flow · commit 6ea58fbfb8bf · 2025-11-21T14:40:17.000+01:00
diff --git a/docs/scenarios/parametric.md b/docs/scenarios/parametric.md
@@ -7,7 +7,7 @@ This enables us to write unit/integration-style test cases that can be shared.
 Example:
 
 ```python
-from utils.parametric.spec.trace import find_span, find_trace, find_span_in_traces, find_first_span_in_trace_payload, find_root_span
+from utils.docker_fixtures.spec.trace import find_span, find_trace, find_span_in_traces, find_first_span_in_trace_payload, find_root_span
 
 @pytest.mark.parametrize("library_env", [{"DD_ENV": "prod"}])
 def test_datadog_spans(library_env, test_library, test_agent):
diff --git a/tests/parametric/test_128_bit_traceids.py b/tests/parametric/test_128_bit_traceids.py
@@ -1,6 +1,6 @@
 import pytest
 
-from utils.parametric.spec.trace import find_first_span_in_trace_payload, find_trace, find_only_span
+from utils.docker_fixtures.spec.trace import find_first_span_in_trace_payload, find_trace, find_only_span
 from utils import missing_feature, irrelevant, context, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_config_consistency.py b/tests/parametric/test_config_consistency.py
@@ -5,7 +5,7 @@
 import pytest
 import yaml
 from utils import scenarios, features, context, missing_feature, irrelevant, flaky, bug, rfc, incomplete_test_app
-from utils.parametric.spec.trace import find_span_in_traces, find_only_span
+from utils.docker_fixtures.spec.trace import find_span_in_traces, find_only_span
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary, StableConfigWriter
 
diff --git a/tests/parametric/test_dynamic_configuration.py b/tests/parametric/test_dynamic_configuration.py
@@ -17,7 +17,7 @@
 )
 from utils.docker_fixtures import TestAgentAPI
 from utils.dd_constants import Capabilities, RemoteConfigApplyState
-from utils.parametric.spec.trace import (
+from utils.docker_fixtures.spec.trace import (
     Span,
     assert_trace_has_tags,
     find_trace,
diff --git a/tests/parametric/test_headers_b3.py b/tests/parametric/test_headers_b3.py
@@ -1,8 +1,8 @@
 import pytest
 
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
-from utils.parametric.spec.trace import span_has_no_parent
-from utils.parametric.spec.trace import find_only_span
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
+from utils.docker_fixtures.spec.trace import span_has_no_parent
+from utils.docker_fixtures.spec.trace import find_only_span
 from utils.docker_fixtures import TestAgentAPI, ParametricTestClientApi as APMLibrary
 from utils import missing_feature, context, scenarios, features, irrelevant, logger
 
diff --git a/tests/parametric/test_headers_b3multi.py b/tests/parametric/test_headers_b3multi.py
@@ -1,8 +1,8 @@
 import pytest
 
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
-from utils.parametric.spec.trace import span_has_no_parent
-from utils.parametric.spec.trace import find_only_span
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
+from utils.docker_fixtures.spec.trace import span_has_no_parent
+from utils.docker_fixtures.spec.trace import find_only_span
 from utils import missing_feature, context, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_headers_baggage.py b/tests/parametric/test_headers_baggage.py
@@ -1,5 +1,5 @@
 from utils._decorators import irrelevant
-from utils.parametric.spec.trace import find_only_span
+from utils.docker_fixtures.spec.trace import find_only_span
 from utils import features, scenarios, context
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/parametric/test_headers_datadog.py b/tests/parametric/test_headers_datadog.py
@@ -1,6 +1,6 @@
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
-from utils.parametric.spec.trace import span_has_no_parent
-from utils.parametric.spec.trace import find_only_span
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
+from utils.docker_fixtures.spec.trace import span_has_no_parent
+from utils.docker_fixtures.spec.trace import find_only_span
 from utils import features, scenarios
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/parametric/test_headers_none.py b/tests/parametric/test_headers_none.py
@@ -1,7 +1,7 @@
 import pytest
 
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
-from utils.parametric.spec.trace import find_only_span
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
+from utils.docker_fixtures.spec.trace import find_only_span
 from utils import scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/parametric/test_headers_precedence.py b/tests/parametric/test_headers_precedence.py
@@ -1,6 +1,6 @@
 import pytest
 
-from utils.parametric.spec.tracecontext import get_tracecontext
+from utils.docker_fixtures.spec.tracecontext import get_tracecontext
 from utils import bug, missing_feature, context, irrelevant, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/parametric/test_headers_tracecontext.py b/tests/parametric/test_headers_tracecontext.py
@@ -10,8 +10,8 @@
 
 import pytest
 
-from utils.parametric.spec.tracecontext import get_tracecontext
-from utils.parametric.spec.trace import find_span_in_traces, find_only_span
+from utils.docker_fixtures.spec.tracecontext import get_tracecontext
+from utils.docker_fixtures.spec.trace import find_span_in_traces, find_only_span
 from utils import missing_feature, context, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/parametric/test_headers_tracestate_dd.py b/tests/parametric/test_headers_tracestate_dd.py
@@ -1,6 +1,6 @@
 import pytest
 
-from utils.parametric.spec.tracecontext import get_tracecontext
+from utils.docker_fixtures.spec.tracecontext import get_tracecontext
 from utils import bug, missing_feature, context, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_library_tracestats.py b/tests/parametric/test_library_tracestats.py
@@ -5,9 +5,9 @@
 import pytest
 
 
-from utils.parametric.spec.trace import SPAN_MEASURED_KEY
-from utils.parametric.spec.trace import V06StatsAggr
-from utils.parametric.spec.trace import find_root_span
+from utils.docker_fixtures.spec.trace import SPAN_MEASURED_KEY
+from utils.docker_fixtures.spec.trace import V06StatsAggr
+from utils.docker_fixtures.spec.trace import find_root_span
 from utils import missing_feature, context, scenarios, features, logger, bug
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_otel_api_interoperability.py b/tests/parametric/test_otel_api_interoperability.py
@@ -2,7 +2,7 @@
 
 from utils import scenarios, features
 from opentelemetry.trace import SpanKind
-from utils.parametric.spec.trace import find_trace, find_span, retrieve_span_links, find_only_span, find_root_span
+from utils.docker_fixtures.spec.trace import find_trace, find_span, retrieve_span_links, find_only_span, find_root_span
 from utils.docker_fixtures import TestAgentAPI, ParametricTestClientApi as APMLibrary
 
 
diff --git a/tests/parametric/test_otel_logs.py b/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.parametric.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:
diff --git a/tests/parametric/test_otel_span_methods.py b/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.parametric.spec.trace import find_span
-from utils.parametric.spec.trace import find_trace
-from utils.parametric.spec.trace import retrieve_span_events
-from utils.parametric.spec.trace import retrieve_span_links
-from utils.parametric.spec.trace import find_first_span_in_trace_payload
-from utils import bug, features, missing_feature, irrelevant, context, scenarios
+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.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.
diff --git a/tests/parametric/test_otel_tracer.py b/tests/parametric/test_otel_tracer.py
@@ -1,7 +1,7 @@
 import pytest
 
-from utils.parametric.spec.trace import find_trace
-from utils.parametric.spec.trace import find_span
+from utils.docker_fixtures.spec.trace import find_trace
+from utils.docker_fixtures.spec.trace import find_span
 from utils import missing_feature, irrelevant, context, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_parametric_endpoints.py b/tests/parametric/test_parametric_endpoints.py
@@ -9,16 +9,17 @@
 import pytest
 import time
 
-from utils.parametric.spec.trace import find_trace
-from utils.parametric.spec.trace import find_span
-from utils.parametric.spec.trace import find_span_in_traces
-from utils.parametric.spec.trace import retrieve_span_links
-from utils.parametric.spec.trace import retrieve_span_events
-from utils.parametric.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 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.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.
diff --git a/tests/parametric/test_partial_flushing.py b/tests/parametric/test_partial_flushing.py
@@ -1,5 +1,5 @@
 import pytest
-from utils.parametric.spec.trace import find_span, find_trace
+from utils.docker_fixtures.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
diff --git a/tests/parametric/test_sampling_span_tags.py b/tests/parametric/test_sampling_span_tags.py
@@ -2,14 +2,14 @@
 
 import pytest
 from utils import bug, context, scenarios, features
-from utils.parametric.spec.trace import MANUAL_DROP_KEY
-from utils.parametric.spec.trace import MANUAL_KEEP_KEY
-from utils.parametric.spec.trace import SAMPLING_AGENT_PRIORITY_RATE
-from utils.parametric.spec.trace import SAMPLING_DECISION_MAKER_KEY
-from utils.parametric.spec.trace import SAMPLING_LIMIT_PRIORITY_RATE
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY
-from utils.parametric.spec.trace import SAMPLING_RULE_PRIORITY_RATE
-from utils.parametric.spec.trace import find_span_in_traces, find_only_span
+from utils.docker_fixtures.spec.trace import MANUAL_DROP_KEY
+from utils.docker_fixtures.spec.trace import MANUAL_KEEP_KEY
+from utils.docker_fixtures.spec.trace import SAMPLING_AGENT_PRIORITY_RATE
+from utils.docker_fixtures.spec.trace import SAMPLING_DECISION_MAKER_KEY
+from utils.docker_fixtures.spec.trace import SAMPLING_LIMIT_PRIORITY_RATE
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY
+from utils.docker_fixtures.spec.trace import SAMPLING_RULE_PRIORITY_RATE
+from utils.docker_fixtures.spec.trace import find_span_in_traces, find_only_span
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
 
diff --git a/tests/parametric/test_span_events.py b/tests/parametric/test_span_events.py
@@ -2,7 +2,7 @@
 import pytest
 
 from utils import scenarios, features, rfc, irrelevant
-from utils.parametric.spec.trace import find_span, find_trace
+from utils.docker_fixtures.spec.trace import find_span, find_trace
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
 
diff --git a/tests/parametric/test_span_links.py b/tests/parametric/test_span_links.py
@@ -1,13 +1,13 @@
 import json
 import pytest
 
-from utils.parametric.spec.trace import ORIGIN
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY
-from utils.parametric.spec.trace import AUTO_DROP_KEY
-from utils.parametric.spec.trace import span_has_no_parent
-from utils.parametric.spec.tracecontext import TRACECONTEXT_FLAGS_SET
+from utils.docker_fixtures.spec.trace import ORIGIN
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY
+from utils.docker_fixtures.spec.trace import AUTO_DROP_KEY
+from utils.docker_fixtures.spec.trace import span_has_no_parent
+from utils.docker_fixtures.spec.tracecontext import TRACECONTEXT_FLAGS_SET
 from utils import scenarios, missing_feature, features
-from utils.parametric.spec.trace import retrieve_span_links, find_span, find_trace, find_span_in_traces
+from utils.docker_fixtures.spec.trace import retrieve_span_links, find_span, find_trace, find_span_in_traces
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
 
diff --git a/tests/parametric/test_span_sampling.py b/tests/parametric/test_span_sampling.py
@@ -1,14 +1,14 @@
 import time
 import json
 import pytest
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY
-from utils.parametric.spec.trace import SINGLE_SPAN_SAMPLING_MAX_PER_SEC
-from utils.parametric.spec.trace import SINGLE_SPAN_SAMPLING_MECHANISM
-from utils.parametric.spec.trace import SINGLE_SPAN_SAMPLING_MECHANISM_VALUE
-from utils.parametric.spec.trace import SINGLE_SPAN_SAMPLING_RATE
-from utils.parametric.spec.trace import MANUAL_DROP_KEY
-from utils.parametric.spec.trace import USER_KEEP
-from utils.parametric.spec.trace import (
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY
+from utils.docker_fixtures.spec.trace import SINGLE_SPAN_SAMPLING_MAX_PER_SEC
+from utils.docker_fixtures.spec.trace import SINGLE_SPAN_SAMPLING_MECHANISM
+from utils.docker_fixtures.spec.trace import SINGLE_SPAN_SAMPLING_MECHANISM_VALUE
+from utils.docker_fixtures.spec.trace import SINGLE_SPAN_SAMPLING_RATE
+from utils.docker_fixtures.spec.trace import MANUAL_DROP_KEY
+from utils.docker_fixtures.spec.trace import USER_KEEP
+from utils.docker_fixtures.spec.trace import (
     find_span_in_traces,
     find_trace,
     find_span,
diff --git a/tests/parametric/test_trace_sampling.py b/tests/parametric/test_trace_sampling.py
@@ -3,9 +3,9 @@
 import pytest
 import random
 
-from utils.parametric.spec.trace import find_only_span, find_span_in_traces
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, SAMPLING_RULE_PRIORITY_RATE, ORIGIN
-from utils.parametric.spec.trace import MANUAL_KEEP_KEY
+from utils.docker_fixtures.spec.trace import find_only_span, find_span_in_traces
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, SAMPLING_RULE_PRIORITY_RATE, ORIGIN
+from utils.docker_fixtures.spec.trace import MANUAL_KEEP_KEY
 from utils import rfc, scenarios, missing_feature, flaky, features, bug, context
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
diff --git a/tests/parametric/test_tracer.py b/tests/parametric/test_tracer.py
@@ -1,9 +1,9 @@
 import pytest
 
-from utils.parametric.spec.trace import find_trace
-from utils.parametric.spec.trace import find_span
-from utils.parametric.spec.trace import find_first_span_in_trace_payload
-from utils.parametric.spec.trace import find_root_span
+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_first_span_in_trace_payload
+from utils.docker_fixtures.spec.trace import find_root_span
 from utils import missing_feature, context, rfc, scenarios, features
 from utils.docker_fixtures import TestAgentAPI
 
diff --git a/tests/test_distributed.py b/tests/test_distributed.py
@@ -4,7 +4,7 @@
 
 import json
 from utils import weblog, interfaces, scenarios, features, bug, context, missing_feature, logger
-from utils.parametric.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
+from utils.docker_fixtures.spec.trace import SAMPLING_PRIORITY_KEY, ORIGIN
 
 
 @scenarios.trace_propagation_style_w3c
diff --git a/utils/docker_fixtures/__init__.py b/utils/docker_fixtures/__init__.py
@@ -1,7 +1,11 @@
 from ._core import get_host_port, docker_run, compute_volumes
 from ._test_agent import TestAgentAPI, TestAgentFactory
-from ._test_client_parametric import ParametricTestClientFactory, ParametricTestClientApi
-from ._test_client_framework_integrations import FrameworkTestClientApi, FrameworkTestClientFactory
+from ._test_clients import (
+    ParametricTestClientFactory,
+    ParametricTestClientApi,
+    FrameworkTestClientApi,
+    FrameworkTestClientFactory,
+)
 
 __all__ = [
     "FrameworkTestClientApi",
diff --git a/utils/docker_fixtures/_test_agent.py b/utils/docker_fixtures/_test_agent.py
@@ -17,10 +17,10 @@
 
 from utils._logger import logger
 from utils.dd_constants import RemoteConfigApplyState, Capabilities
-from utils.parametric.spec import remoteconfig
-from utils.parametric.spec.trace import V06StatsPayload
-from utils.parametric.spec.trace import decode_v06_stats
-from utils.parametric.spec.trace import Trace
+from .spec import remoteconfig
+from .spec.trace import V06StatsPayload
+from .spec.trace import decode_v06_stats
+from .spec.trace import Trace
 
 from ._core import get_host_port, get_docker_client, docker_run
 
diff --git a/utils/docker_fixtures/_test_client_parametric.py b/utils/docker_fixtures/_test_client_parametric.py
diff --git a/utils/docker_fixtures/_test_clients/__init__.py b/utils/docker_fixtures/_test_clients/__init__.py
diff --git a/utils/docker_fixtures/_test_clients/_core.py b/utils/docker_fixtures/_test_clients/_core.py
diff --git a/utils/docker_fixtures/_test_clients/_test_client_framework_integrations.py b/utils/docker_fixtures/_test_clients/_test_client_framework_integrations.py
diff --git a/utils/docker_fixtures/_test_clients/_test_client_parametric.py b/utils/docker_fixtures/_test_clients/_test_client_parametric.py
diff --git a/utils/docker_fixtures/parametric.py b/utils/docker_fixtures/parametric.py
diff --git a/utils/docker_fixtures/spec/__init__.py b/utils/docker_fixtures/spec/__init__.py
diff --git a/utils/docker_fixtures/spec/otel_trace.py b/utils/docker_fixtures/spec/otel_trace.py
diff --git a/utils/docker_fixtures/spec/remoteconfig.py b/utils/docker_fixtures/spec/remoteconfig.py
diff --git a/utils/docker_fixtures/spec/trace.py b/utils/docker_fixtures/spec/trace.py
diff --git a/utils/docker_fixtures/spec/tracecontext.py b/utils/docker_fixtures/spec/tracecontext.py
diff --git a/utils/parametric/spec/__init__.py b/utils/parametric/spec/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`)`
`18`	`18`	`from utils.docker_fixtures import TestAgentAPI`
`19`	`19`	`from utils.dd_constants import Capabilities, RemoteConfigApplyState`
`20`		`-from utils.parametric.spec.trace import (`
	`20`	`+from utils.docker_fixtures.spec.trace import (`
`21`	`21`	`Span,`
`22`	`22`	`assert_trace_has_tags,`
`23`	`23`	`find_trace,`