Manifests migration

conftest.py

@@ -5,28 +5,28 @@
 # keep this import at the top of the file
 from utils.proxy import scrubber  # noqa: F401
 
-from collections.abc import Sequence, Generator
 import json
 import os
-from pathlib import Path
 import time
 import types
-from typing import Any
 import xml.etree.ElementTree as ET
+from collections.abc import Generator, Sequence
+from typing import Any
 
 import pytest
 from _pytest.junitxml import xml_key
-from pytest_jsonreport.plugin import JSONReport
 from pluggy._result import _Result as Result
+from pytest_jsonreport.plugin import JSONReport
 
-from manifests.parser.core import load as load_manifests
 from utils import context
-from utils.properties_serialization import SetupProperties
-from utils._context._scenarios import scenarios, Scenario
+from utils._context._scenarios import Scenario, scenarios
 from utils._context.component_version import ComponentVersion
-from utils._decorators import released, configure as configure_decorators, parse_skip_declaration, add_pytest_marker
+from utils._decorators import add_pytest_marker
+from utils._decorators import configure as configure_decorators
 from utils._features import NOT_REPORTED_ID as NOT_REPORTED_FEATURE_ID
 from utils._logger import logger
+from utils.manifest import Manifest
+from utils.properties_serialization import SetupProperties
 
 # Monkey patch JSON-report plugin to avoid noise in report
 JSONReport.pytest_terminal_summary = lambda *args, **kwargs: None  # noqa: ARG005
@@ -259,69 +259,25 @@ def _collect_item_metadata(item: pytest.Item):
     return metadata
 
 
-def pytest_pycollect_makemodule(module_path: Path, parent: pytest.Session) -> None | pytest.Module:
-    # As now, declaration only works for tracers at module level
-
-    library = context.library.name
-
-    manifests = load_manifests()
-
-    path = module_path.relative_to(module_path.cwd())
-
-    full_declaration: str | None = None
-    nodeid: str
-
-    # look in manifests for any declaration of this file, or on one of its parents
-    while str(path) != ".":
-        nodeid = f"{path!s}/" if path.is_dir() else str(path)
-
-        if nodeid in manifests and library in manifests[nodeid]:
-            full_declaration = manifests[nodeid][library]
-            break
-
-        path = path.parent
-
-    if full_declaration is None:
-        return None
-
-    logger.info(f"Manifest declaration found for module {nodeid}: {full_declaration}")
-
-    declaration, details = parse_skip_declaration(full_declaration)
-
-    mod: pytest.Module = pytest.Module.from_parent(parent, path=module_path)
-
-    add_pytest_marker(mod, declaration, details)
-
-    return mod
-
-
-@pytest.hookimpl(tryfirst=True)
-def pytest_pycollect_makeitem(collector: pytest.Module | pytest.Class, name: str, obj: object) -> None:
-    if collector.istestclass(obj, name):
-        if obj is None:
-            message = f"""{collector.nodeid} is not properly collected.
-            You may have forgotten to return a value in a decorator like @features"""
-            raise ValueError(message)
-
-        manifest = load_manifests()
-
-        nodeid = f"{collector.nodeid}::{name}"
-
-        if nodeid in manifest:
-            declaration = manifest[nodeid]
-            logger.info(f"Manifest declaration found for {nodeid}: {declaration}")
-
-            try:
-                released(**declaration)(obj)
-            except Exception as e:
-                raise ValueError(f"Unexpected error for {nodeid}: {declaration}") from e
-
-
 def pytest_collection_modifyitems(session: pytest.Session, config: pytest.Config, items: list[pytest.Item]) -> None:
-    """Unselect items that are not included in the current scenario"""
+    """Unselect items that were deactivated in the manifests or that are not included in the current scenario"""
 
     logger.debug("pytest_collection_modifyitems")
 
+    manifest = Manifest(
+        context.library.name,
+        context.library.version,
+        context.weblog_variant,
+        context.agent_version,
+        context.dd_apm_inject_version,
+        context.k8s_cluster_agent_version,
+    )
+    for item in items:
+        assert isinstance(item, pytest.Function)
+        declarations = manifest.get_declarations(item.nodeid)
+        for declaration in declarations:
+            add_pytest_marker(item, declaration.value, declaration.details)
+
     selected = []
     deselected = []
 

format.sh

@@ -133,7 +133,7 @@ if ! ./venv/bin/yamllint -s manifests/; then
 fi
 
 echo "Running parser checks..."
-if ! python ./manifests/parser/core.py; then
+if ! python utils/manifest/validate.py; then
   echo "Manifest parser failed. Please fix the errors above. 💥 💔 💥"
   exit 1
 fi

manifests/agent.yml

@@ -1,11 +1,6 @@
 ---
-tests/:
-  otel_tracing_e2e/:
-    test_e2e.py:
-      Test_OTelLogE2E: v7.48.0
-  test_sampling_rates.py:
-    Test_SamplingRates: v7.33.0
-  test_telemetry.py:
-    Test_APMOnboardingInstallID: v7.50.0
-  test_v1_payloads.py:
-    Test_V1Payloads: v7.73.0-devel
+manifest:
+  tests/otel_tracing_e2e/test_e2e.py::Test_OTelLogE2E: v7.48.0
+  tests/test_sampling_rates.py::Test_SamplingRates: v7.33.0
+  tests/test_telemetry.py::Test_APMOnboardingInstallID: v7.50.0
+  tests/test_v1_payloads.py::Test_V1Payloads: v7.73.0-devel

manifests/cpp.yml

@@ -6,96 +6,70 @@
 # For example, if the latest release is `v1.0.0` and a feature like Baggage
 # is only supported on the `main` branch and in the upcoming release,
 # use `>1.0.0` to indicate that requirement.
-tests/:
-  parametric/:
-    test_feature_flag_exposure/:
-      test_feature_flag_exposure.py:
-        Test_Feature_Flag_Exposure: missing_feature
-    test_128_bit_traceids.py:
-      Test_128_Bit_Traceids: ">1.0.0"
-    test_config_consistency.py:
-      Test_Config_Dogstatsd: missing_feature
-      Test_Config_RateLimit: ">1.0.0"
-      Test_Config_Tags: '>=2.0.0'  # auto activation: might not be the earliest working version
-      Test_Config_TraceAgentURL: ">1.0.0"
-      Test_Config_TraceEnabled: ">1.0.0"
-      Test_Config_TraceLogDirectory: missing_feature
-      Test_Config_UnifiedServiceTagging: ">1.0.0"
-      Test_Stable_Config_Default: missing_feature
-      Test_Stable_Config_Rules: missing_feature
-    test_crashtracking.py: missing_feature
-    test_dynamic_configuration.py:
-      TestDynamicConfigV1_EmptyServiceTargets: ">1.0.0"
-    test_headers_b3multi.py:
-      Test_Headers_B3multi: ">1.0.0"
-    test_headers_baggage.py:
-      Test_Headers_Baggage: missing_feature
-      Test_Headers_Baggage_Span_Tags: missing_feature
-    test_headers_datadog.py:
-      Test_Headers_Datadog: ">1.0.0"
-    test_headers_none.py:
-      Test_Headers_None: ">1.0.0"
-    test_headers_precedence.py:
-      Test_Headers_Precedence: ">1.0.0"
-    test_headers_tracecontext.py:
-      Test_Headers_Tracecontext: ">1.0.0"
-    test_headers_tracestate_dd.py:
-      Test_Headers_Tracestate_DD: ">1.0.0"
-    test_otel_api_interoperability.py: irrelevant (library does not implement OpenTelemetry)
-    test_otel_env_vars.py:
-      Test_Otel_Env_Vars: missing_feature
-    test_otel_logs.py: missing_feature
-    test_otel_metrics.py: missing_feature
-    test_otel_span_methods.py: irrelevant (library does not implement OpenTelemetry)
-    test_otel_span_with_baggage.py:
-      Test_Otel_Span_With_Baggage: missing_feature
-    test_parametric_endpoints.py:
-      Test_Parametric_DDSpan_Add_Link: missing_feature (add_link is not supported)
-      Test_Parametric_DDSpan_Set_Error: bug (APMAPI-778)  # The expected error status is not set
-      Test_Parametric_DDSpan_Set_Metric: missing_feature (Tracer does not provide a public method for directly setting a span metric)
-      Test_Parametric_DDSpan_Set_Resource: incomplete_test_app (set_resource endpoint is not implemented)
-      Test_Parametric_DDSpan_Start: '>=2.0.0'  # auto activation: might not be the earliest working version
-      Test_Parametric_DDTrace_Baggage: missing_feature (baggage is not supported)
-      Test_Parametric_DDTrace_Config: '>=2.0.0'  # auto activation: might not be the earliest working version
-      Test_Parametric_DDTrace_Crash: incomplete_test_app (crash endpoint is not implemented)
-      Test_Parametric_DDTrace_Current_Span: incomplete_test_app (current_span endpoint is not implemented)
-      Test_Parametric_DDTrace_Extract_Headers: ">1.0.0"
-      Test_Parametric_FFE_Start: missing_feature
-      # cpp tracer does not support the OpenTelemetry API, otel parametric endpoints are not implemented
-
-      Test_Parametric_OtelSpan_End: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Events: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Is_Recording: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Set_Attribute: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Set_Name: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Set_Status: missing_feature (otel api is not supported)
-      Test_Parametric_OtelSpan_Start: missing_feature (otel api is not supported)
-      Test_Parametric_Otel_Baggage: missing_feature (otel api is not supported)
-      Test_Parametric_Otel_Current_Span: missing_feature (otel api is not supported)
-      Test_Parametric_Otel_Trace_Flush: missing_feature (otel api is not supported)
-      Test_Parametric_Write_Log: missing_feature
-    test_partial_flushing.py:
-      Test_Partial_Flushing: missing_feature
-    test_process_discovery.py:
-      Test_ProcessDiscovery: ">1.0.0"
-    test_sampling_delegation.py:
-      Test_Decisionless_Extraction: ">1.0.0"
-    test_sampling_span_tags.py:
-      Test_Knuth_Sample_Rate: missing_feature
-    test_span_events.py: missing_feature
-    test_span_links.py: missing_feature
-    test_telemetry.py:
-      Test_Consistent_Configs: missing_feature
-      Test_Stable_Configuration_Origin: missing_feature
-      Test_TelemetryInstallSignature: ">1.0.0"
-      Test_TelemetrySCAEnvVar: missing_feature
-      Test_TelemetrySSIConfigs: missing_feature
-    test_tracer.py:
-      Test_TracerSCITagging: missing_feature
-    test_tracer_flare.py: missing_feature
-  test_feature_flag_exposures.py:
-    Test_FFE_Exposure_Events: missing_feature
-    Test_FFE_Exposure_Events_Empty: missing_feature
-    Test_FFE_Exposure_Events_Errors: missing_feature
-  test_telemetry.py:
-    Test_TelemetryEnhancedConfigReporting: missing_feature
+manifest:
+  tests/parametric/test_128_bit_traceids.py::Test_128_Bit_Traceids: ">1.0.0"
+  tests/parametric/test_config_consistency.py::Test_Config_Dogstatsd: missing_feature
+  tests/parametric/test_config_consistency.py::Test_Config_RateLimit: ">1.0.0"
+  tests/parametric/test_config_consistency.py::Test_Config_Tags: ">=2.0.0"  # auto activation: might not be the earliest working version
+  tests/parametric/test_config_consistency.py::Test_Config_TraceAgentURL: ">1.0.0"
+  tests/parametric/test_config_consistency.py::Test_Config_TraceEnabled: ">1.0.0"
+  tests/parametric/test_config_consistency.py::Test_Config_TraceLogDirectory: missing_feature
+  tests/parametric/test_config_consistency.py::Test_Config_UnifiedServiceTagging: ">1.0.0"
+  tests/parametric/test_config_consistency.py::Test_Stable_Config_Default: missing_feature
+  tests/parametric/test_config_consistency.py::Test_Stable_Config_Rules: missing_feature
+  tests/parametric/test_crashtracking.py: missing_feature
+  tests/parametric/test_dynamic_configuration.py::TestDynamicConfigV1_EmptyServiceTargets: ">1.0.0"
+  tests/parametric/test_feature_flag_exposure/test_feature_flag_exposure.py::Test_Feature_Flag_Exposure: missing_feature
+  tests/parametric/test_headers_b3multi.py::Test_Headers_B3multi: ">1.0.0"
+  tests/parametric/test_headers_baggage.py::Test_Headers_Baggage: missing_feature
+  tests/parametric/test_headers_baggage.py::Test_Headers_Baggage_Span_Tags: missing_feature
+  tests/parametric/test_headers_datadog.py::Test_Headers_Datadog: ">1.0.0"
+  tests/parametric/test_headers_none.py::Test_Headers_None: ">1.0.0"
+  tests/parametric/test_headers_precedence.py::Test_Headers_Precedence: ">1.0.0"
+  tests/parametric/test_headers_tracecontext.py::Test_Headers_Tracecontext: ">1.0.0"
+  tests/parametric/test_headers_tracestate_dd.py::Test_Headers_Tracestate_DD: ">1.0.0"
+  tests/parametric/test_otel_api_interoperability.py: irrelevant (library does not implement OpenTelemetry)
+  tests/parametric/test_otel_env_vars.py::Test_Otel_Env_Vars: missing_feature
+  tests/parametric/test_otel_logs.py: missing_feature
+  tests/parametric/test_otel_metrics.py: missing_feature
+  tests/parametric/test_otel_span_methods.py: irrelevant (library does not implement OpenTelemetry)
+  tests/parametric/test_otel_span_with_baggage.py::Test_Otel_Span_With_Baggage: missing_feature
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDSpan_Add_Link: missing_feature (add_link is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDSpan_Set_Error: bug (APMAPI-778)  # The expected error status is not set
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDSpan_Set_Metric: missing_feature (Tracer does not provide a public method for directly setting a span metric)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDSpan_Set_Resource: incomplete_test_app (set_resource endpoint is not implemented)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDSpan_Start: ">=2.0.0"  # auto activation: might not be the earliest working version
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDTrace_Baggage: missing_feature (baggage is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDTrace_Config: ">=2.0.0"  # auto activation: might not be the earliest working version
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDTrace_Crash: incomplete_test_app (crash endpoint is not implemented)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDTrace_Current_Span: incomplete_test_app (current_span endpoint is not implemented)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_DDTrace_Extract_Headers: ">1.0.0"
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_FFE_Start: missing_feature  # cpp tracer does not support the OpenTelemetry API, otel parametric endpoints are not implemented
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_End: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Events: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Is_Recording: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Set_Attribute: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Set_Name: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Set_Status: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_OtelSpan_Start: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_Otel_Baggage: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_Otel_Current_Span: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_Otel_Trace_Flush: missing_feature (otel api is not supported)
+  tests/parametric/test_parametric_endpoints.py::Test_Parametric_Write_Log: missing_feature
+  tests/parametric/test_partial_flushing.py::Test_Partial_Flushing: missing_feature
+  tests/parametric/test_process_discovery.py::Test_ProcessDiscovery: ">1.0.0"
+  tests/parametric/test_sampling_delegation.py::Test_Decisionless_Extraction: ">1.0.0"
+  tests/parametric/test_sampling_span_tags.py::Test_Knuth_Sample_Rate: missing_feature
+  tests/parametric/test_span_events.py: missing_feature
+  tests/parametric/test_span_links.py: missing_feature
+  tests/parametric/test_telemetry.py::Test_Consistent_Configs: missing_feature
+  tests/parametric/test_telemetry.py::Test_Stable_Configuration_Origin: missing_feature
+  tests/parametric/test_telemetry.py::Test_TelemetryInstallSignature: ">1.0.0"
+  tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar: missing_feature
+  tests/parametric/test_telemetry.py::Test_TelemetrySSIConfigs: missing_feature
+  tests/parametric/test_tracer.py::Test_TracerSCITagging: missing_feature
+  tests/parametric/test_tracer_flare.py: missing_feature
+  tests/test_feature_flag_exposures.py::Test_FFE_Exposure_Events: missing_feature
+  tests/test_feature_flag_exposures.py::Test_FFE_Exposure_Events_Empty: missing_feature
+  tests/test_feature_flag_exposures.py::Test_FFE_Exposure_Events_Errors: missing_feature
+  tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: missing_feature