feat: add trace tags

Author: pedroslopez

airbyte_cdk/manifest_server/dependencies/__init__.py

@@ -0,0 +1,44 @@
+"""
+FastAPI dependencies for the Manifest Server.
+
+This module contains reusable FastAPI dependencies that can be used across
+different routers in the manifest server.
+"""
+
+import logging
+from typing import Optional
+
+import ddtrace
+from fastapi import Header
+
+logger = logging.getLogger(__name__)
+
+
+def apply_trace_tags(
+    workspace_id: Optional[str] = Header(None, alias="x-workspace-id"),
+    project_id: Optional[str] = Header(None, alias="x-project-id"),
+) -> None:
+    """FastAPI dependency to apply trace tags from headers to the current span."""
+    if not workspace_id and not project_id:
+        return
+
+    # Log the trace IDs for observability
+    log_parts = []
+    if workspace_id:
+        log_parts.append(f"workspace_id={workspace_id}")
+    if project_id:
+        log_parts.append(f"project_id={project_id}")
+
+    if log_parts:
+        logger.info(f"Processing request with trace tags: {', '.join(log_parts)}")
+
+    try:
+        span = ddtrace.tracer.current_span()
+        if span:
+            if workspace_id:
+                span.set_tag("workspace_id", workspace_id)
+            if project_id:
+                span.set_tag("project_id", project_id)
+    except Exception:
+        # Silently ignore any ddtrace-related errors (e.g. if ddtrace.auto wasn't run)
+        pass

airbyte_cdk/manifest_server/auth.py …cdk/manifest_server/dependencies/auth.pyairbyte_cdk/manifest_server/auth.py renamed to airbyte_cdk/manifest_server/dependencies/auth.py airbyte_cdk/manifest_server/auth.py renamed to airbyte_cdk/manifest_server/dependencies/auth.py

@@ -27,9 +27,9 @@
     StreamReadResponse,
     StreamTestReadRequest,
 )
-from ..auth import verify_jwt_token
 from ..command_processor.processor import ManifestCommandProcessor
 from ..command_processor.utils import build_catalog, build_source
+from ..dependencies import apply_trace_tags, verify_jwt_token
 
 
 def safe_build_source(
@@ -59,7 +59,7 @@ def safe_build_source(
 router = APIRouter(
     prefix="/manifest",
     tags=["manifest"],
-    dependencies=[Depends(verify_jwt_token)],
+    dependencies=[Depends(verify_jwt_token), Depends(apply_trace_tags)],
 )
 
 

airbyte_cdk/manifest_server/dependencies/tracing.py

@@ -7,7 +7,7 @@
 from fastapi import HTTPException
 from fastapi.security import HTTPAuthorizationCredentials
 
-from airbyte_cdk.manifest_server.auth import verify_jwt_token
+from airbyte_cdk.manifest_server.dependencies import verify_jwt_token
 
 
 class TestVerifyJwtToken: