test(correlation): add integration tests for correlation ID propagation [OMN-1349]

pyproject.toml

@@ -253,6 +253,14 @@ ignore = [
     "TC006",     # Add quotes to type expression in cast (style preference)
 ]
 
+[tool.ruff.lint.isort]
+# Ensure consistent import sorting between local and CI
+known-first-party = ["omnibase_infra", "omnibase_core", "omnibase_spi", "tests"]
+# Force combine as imports for consistency
+force-single-line = false
+# Split imports from same package
+split-on-trailing-comma = true
+
 [tool.pytest.ini_options]
 pythonpath = ["src"]
 testpaths = ["tests"]
@@ -278,6 +286,7 @@ markers = [
     "e2e: End-to-end tests requiring full infrastructure (Kafka + Consul + PostgreSQL)",
     "runtime: Tests requiring the ONEX runtime container to be running",
     "serial: Tests that must run serially (not in parallel with pytest-xdist) due to resource intensity",
+    "heavy: Heavy integration tests requiring real infrastructure (Kafka, PostgreSQL, HTTP servers). Skipped by default, run with RUN_HEAVY_TESTS=1",
 ]
 addopts = [
     "--strict-markers",

src/omnibase_infra/enums/__init__.py

@@ -45,7 +45,6 @@
 """
 
 from omnibase_core.enums import EnumTopicType
-
 from omnibase_infra.enums.enum_any_type_violation import EnumAnyTypeViolation
 from omnibase_infra.enums.enum_backend_type import EnumBackendType
 from omnibase_infra.enums.enum_capture_outcome import EnumCaptureOutcome

src/omnibase_infra/errors/error_architecture_violation.py

@@ -36,7 +36,6 @@
 from uuid import UUID, uuid4
 
 from omnibase_core.enums.enum_core_error_code import EnumCoreErrorCode
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors.error_infra import RuntimeHostError
 from omnibase_infra.models.errors.model_infra_error_context import (

src/omnibase_infra/errors/error_chain_propagation.py

@@ -12,7 +12,6 @@
 from uuid import uuid4
 
 from omnibase_core.enums import EnumCoreErrorCode
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors.error_infra import (
     ProtocolConfigurationError,

src/omnibase_infra/errors/error_container_wiring.py

@@ -7,7 +7,6 @@
 """
 
 from omnibase_core.enums import EnumCoreErrorCode
-
 from omnibase_infra.errors.error_infra import RuntimeHostError
 from omnibase_infra.models.errors.model_infra_error_context import (
     ModelInfraErrorContext,

src/omnibase_infra/errors/error_infra.py

@@ -72,7 +72,6 @@
 
 from omnibase_core.enums import EnumCoreErrorCode
 from omnibase_core.models.errors import ModelOnexError
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.models.errors.model_infra_error_context import (
     ModelInfraErrorContext,

src/omnibase_infra/errors/error_message_type_registry.py

@@ -19,7 +19,6 @@
 ]
 
 from omnibase_core.enums import EnumCoreErrorCode
-
 from omnibase_infra.errors.error_infra import RuntimeHostError
 from omnibase_infra.models.errors.model_infra_error_context import (
     ModelInfraErrorContext,

src/omnibase_infra/handlers/handler_consul.py

@@ -32,8 +32,8 @@
 from uuid import UUID, uuid4
 
 import consul
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_db.py

@@ -74,8 +74,8 @@
 from uuid import UUID, uuid4
 
 import asyncpg
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_filesystem.py

@@ -41,7 +41,6 @@
 
 from omnibase_core.container import ModelONEXContainer
 from omnibase_core.models.dispatch import ModelHandlerOutput
-
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_graph.py

@@ -45,6 +45,7 @@
     ServiceUnavailable,
     TransactionError,
 )
+
 from omnibase_core.container import ModelONEXContainer
 from omnibase_core.models.graph import (
     ModelGraphBatchResult,
@@ -60,8 +61,6 @@
     ModelGraphTraversalResult,
 )
 from omnibase_core.types import JsonType
-from omnibase_spi.protocols.storage import ProtocolGraphDatabaseHandler
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     InfraAuthenticationError,
@@ -71,6 +70,7 @@
 )
 from omnibase_infra.mixins import MixinAsyncCircuitBreaker
 from omnibase_infra.utils.util_env_parsing import parse_env_float
+from omnibase_spi.protocols.storage import ProtocolGraphDatabaseHandler
 
 logger = logging.getLogger(__name__)
 

src/omnibase_infra/handlers/handler_http.py

@@ -23,8 +23,8 @@
 from uuid import UUID, uuid4
 
 import httpx
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_manifest_persistence.py

@@ -109,7 +109,6 @@
 
 from omnibase_core.container import ModelONEXContainer
 from omnibase_core.models.dispatch import ModelHandlerOutput
-
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_mcp.py

@@ -26,9 +26,9 @@
 from typing import TYPE_CHECKING
 from uuid import UUID, uuid4
 
-from omnibase_core.models.dispatch import ModelHandlerOutput
 from pydantic import ValidationError
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/handler_qdrant.py

@@ -33,6 +33,9 @@
 from datetime import UTC, datetime
 from uuid import UUID, uuid4
 
+from qdrant_client import QdrantClient
+from qdrant_client.http import models as qdrant_models
+
 from omnibase_core.container import ModelONEXContainer
 from omnibase_core.models.common.model_schema_value import ModelSchemaValue
 from omnibase_core.models.vector import (
@@ -52,10 +55,6 @@
     ModelVectorStoreResult,
 )
 from omnibase_core.types import JsonType
-from omnibase_spi.protocols.storage import ProtocolVectorStoreHandler
-from qdrant_client import QdrantClient
-from qdrant_client.http import models as qdrant_models
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     InfraAuthenticationError,
@@ -65,6 +64,7 @@
     RuntimeHostError,
 )
 from omnibase_infra.mixins import MixinAsyncCircuitBreaker
+from omnibase_spi.protocols.storage import ProtocolVectorStoreHandler
 
 logger = logging.getLogger(__name__)
 

src/omnibase_infra/handlers/handler_vault.py

@@ -26,8 +26,8 @@
 from uuid import uuid4
 
 import hvac
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import (
     EnumHandlerType,
     EnumHandlerTypeCategory,

src/omnibase_infra/handlers/mcp/transport_streamable_http.py

@@ -45,11 +45,12 @@
     from collections.abc import Callable, Sequence
 
     import uvicorn
+    from starlette.applications import Starlette
+
     from omnibase_core.models.container.model_onex_container import ModelONEXContainer
     from omnibase_spi.protocols.types.protocol_mcp_tool_types import (
         ProtocolMCPToolDefinition,
     )
-    from starlette.applications import Starlette
 
 logger = logging.getLogger(__name__)
 

src/omnibase_infra/handlers/mixins/mixin_consul_kv.py

@@ -19,7 +19,6 @@
 T = TypeVar("T")
 
 from omnibase_core.models.dispatch import ModelHandlerOutput
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     ModelInfraErrorContext,

src/omnibase_infra/handlers/mixins/mixin_consul_service.py

@@ -19,7 +19,6 @@
 T = TypeVar("T")
 
 from omnibase_core.models.dispatch import ModelHandlerOutput
-
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     ModelInfraErrorContext,

src/omnibase_infra/handlers/mixins/mixin_vault_secrets.py

@@ -12,8 +12,8 @@
 from uuid import UUID
 
 import hvac
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import ModelInfraErrorContext, RuntimeHostError
 from omnibase_infra.handlers.models.vault import ModelVaultHandlerConfig

src/omnibase_infra/handlers/mixins/mixin_vault_token.py

@@ -17,8 +17,8 @@
 from uuid import UUID, uuid4
 
 import hvac
-from omnibase_core.models.dispatch import ModelHandlerOutput
 
+from omnibase_core.models.dispatch import ModelHandlerOutput
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     ModelInfraErrorContext,

src/omnibase_infra/handlers/models/http/model_http_get_payload.py

@@ -14,9 +14,9 @@
 
 from typing import Literal
 
-from omnibase_core.types import JsonType
 from pydantic import ConfigDict, Field
 
+from omnibase_core.types import JsonType
 from omnibase_infra.handlers.models.http.enum_http_operation_type import (
     EnumHttpOperationType,
 )

src/omnibase_infra/handlers/models/http/model_http_post_payload.py

@@ -14,9 +14,9 @@
 
 from typing import Literal
 
-from omnibase_core.types import JsonType
 from pydantic import ConfigDict, Field
 
+from omnibase_core.types import JsonType
 from omnibase_infra.handlers.models.http.enum_http_operation_type import (
     EnumHttpOperationType,
 )

src/omnibase_infra/handlers/models/model_db_describe_response.py

@@ -8,9 +8,10 @@
 
 from __future__ import annotations
 
-from omnibase_core.types import JsonType
 from pydantic import BaseModel, ConfigDict, Field
 
+from omnibase_core.types import JsonType
+
 
 class ModelDbDescribeResponse(BaseModel):
     """Database handler metadata and capabilities response.

src/omnibase_infra/handlers/registration_storage/handler_registration_storage_postgres.py

@@ -47,8 +47,8 @@
 
 # Import asyncpg at module level to avoid redundant imports inside methods
 import asyncpg
-from omnibase_core.enums.enum_node_kind import EnumNodeKind
 
+from omnibase_core.enums.enum_node_kind import EnumNodeKind
 from omnibase_infra.enums import EnumInfraTransportType
 from omnibase_infra.errors import (
     InfraConnectionError,

src/omnibase_infra/mixins/mixin_node_introspection.py

@@ -208,7 +208,6 @@ async def shutdown(self):
 
 from omnibase_core.enums import EnumNodeKind
 from omnibase_core.models.primitives.model_semver import ModelSemVer
-
 from omnibase_infra.enums import EnumInfraTransportType, EnumIntrospectionReason
 from omnibase_infra.errors import ModelInfraErrorContext, ProtocolConfigurationError
 from omnibase_infra.models.discovery import (
@@ -229,7 +228,6 @@ async def shutdown(self):
 
 if TYPE_CHECKING:
     from omnibase_core.protocols.event_bus.protocol_event_bus import ProtocolEventBus
-
     from omnibase_infra.event_bus.models import ModelEventMessage
 
 logger = logging.getLogger(__name__)

src/omnibase_infra/mixins/mixin_retry_execution.py

@@ -64,15 +64,14 @@ async def _my_operation(self, ...):
 if TYPE_CHECKING:
     from concurrent.futures import ThreadPoolExecutor
 
+    from omnibase_infra.handlers.models import ModelOperationContext, ModelRetryState
     from omnibase_infra.handlers.models.model_consul_retry_config import (
         ModelConsulRetryConfig,
     )
     from omnibase_infra.handlers.models.model_vault_retry_config import (
         ModelVaultRetryConfig,
     )
 
-    from omnibase_infra.handlers.models import ModelOperationContext, ModelRetryState
-
     RetryConfigType = ModelConsulRetryConfig | ModelVaultRetryConfig
 
 T = TypeVar("T")

src/omnibase_infra/models/discovery/model_discovered_capabilities.py

@@ -2,9 +2,10 @@
 # Copyright (c) 2025 OmniNode Team
 """Model for capabilities discovered via runtime reflection."""
 
-from omnibase_core.types import JsonType
 from pydantic import BaseModel, ConfigDict, Field
 
+from omnibase_core.types import JsonType
+
 
 class ModelDiscoveredCapabilities(BaseModel):
     """Capabilities discovered via runtime reflection.

src/omnibase_infra/models/discovery/model_introspection_config.py

@@ -24,9 +24,10 @@
 from typing import TYPE_CHECKING
 from uuid import UUID
 
-from omnibase_core.enums import EnumNodeKind
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from omnibase_core.enums import EnumNodeKind
+
 if TYPE_CHECKING:
     from omnibase_core.protocols.event_bus.protocol_event_bus import ProtocolEventBus
 

src/omnibase_infra/models/dispatch/model_dispatch_context.py

@@ -75,9 +75,9 @@
 from typing import Literal
 from uuid import UUID
 
-from omnibase_core.enums import EnumNodeKind
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 
+from omnibase_core.enums import EnumNodeKind
 from omnibase_infra.models.dispatch.model_dispatch_metadata import ModelDispatchMetadata
 
 

src/omnibase_infra/models/dispatch/model_dispatch_error.py

@@ -92,9 +92,10 @@
 
 from __future__ import annotations
 
-from omnibase_core.enums import EnumCoreErrorCode
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from omnibase_core.enums import EnumCoreErrorCode
+
 # Sentinel values for "not set" state
 _SENTINEL_STR: str = ""
 

src/omnibase_infra/models/dispatch/model_dispatch_log_context.py

@@ -31,10 +31,10 @@
 
 from uuid import UUID
 
-from omnibase_core.enums import EnumCoreErrorCode
-from omnibase_core.types import PrimitiveValue
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from omnibase_core.enums import EnumCoreErrorCode
+from omnibase_core.types import PrimitiveValue
 from omnibase_infra.enums import EnumMessageCategory
 
 # Sentinel values for "not set" state

src/omnibase_infra/models/dispatch/model_dispatch_result.py

@@ -88,9 +88,9 @@
 from datetime import UTC, datetime
 from uuid import UUID, uuid4
 
-from omnibase_core.enums import EnumCoreErrorCode
 from pydantic import BaseModel, ConfigDict, Field
 
+from omnibase_core.enums import EnumCoreErrorCode
 from omnibase_infra.enums import EnumDispatchStatus, EnumMessageCategory
 from omnibase_infra.models.dispatch.model_dispatch_metadata import ModelDispatchMetadata
 from omnibase_infra.models.dispatch.model_dispatch_outputs import ModelDispatchOutputs