Merge remote-tracking branch 'origin/3.x-staging' into christophe-pap…

…azian/decouple_appsec_from_tracer

hatch.toml

@@ -400,6 +400,45 @@ python = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 flask = ["~=3.0"]
 
 
+[envs.appsec_integrations_fastapi]
+template = "appsec_integrations_fastapi"
+dependencies = [
+    "pytest",
+    "pytest-cov",
+    "requests",
+    "hypothesis",
+    "jinja2",
+    "httpx<0.28.0",
+    "anyio{matrix:anyio:}",
+    "fastapi{matrix:fastapi}"
+]
+
+[envs.appsec_integrations_fastapi.env-vars]
+CMAKE_BUILD_PARALLEL_LEVEL = "12"
+
+[envs.appsec_integrations_fastapi.scripts]
+test = [
+    "uname -a",
+    "pip freeze",
+    "DD_TRACE_AGENT_URL=\"http://testagent:9126\" DD_CIVISIBILITY_ITR_ENABLED=0 DD_IAST_REQUEST_SAMPLING=100 DD_IAST_DEDUPLICATION_ENABLED=false python -m pytest -vvv {args:tests/appsec/integrations/fastapi_tests/}",
+]
+
+
+# if you add or remove a version here, please also update the parallelism parameter
+# in .circleci/config.templ.yml
+[[envs.appsec_integrations_fastapi.matrix]]
+python = ["3.8", "3.10", "3.13"]
+fastapi = ["==0.86.0"]
+anyio = ["==3.7.1"]
+
+[[envs.appsec_integrations_fastapi.matrix]]
+python = ["3.8", "3.10", "3.13"]
+fastapi = ["==0.94.1"]
+
+[[envs.appsec_integrations_fastapi.matrix]]
+python = ["3.8", "3.10", "3.13"]
+fastapi = ["~=0.114.2"]
+
 
 ## ASM FastAPI
 

tests/appsec/integrations/fastapi_tests/app.py

@@ -0,0 +1,6 @@
+from fastapi import FastAPI
+
+
+def get_app():
+    app = FastAPI()
+    return app

tests/appsec/integrations/fastapi_tests/conftest.py

@@ -0,0 +1,41 @@
+from fastapi.testclient import TestClient
+import pytest
+
+import ddtrace
+from ddtrace.contrib.internal.fastapi.patch import patch as fastapi_patch
+from ddtrace.contrib.internal.fastapi.patch import unpatch as fastapi_unpatch
+from tests.utils import DummyTracer
+from tests.utils import TracerSpanContainer
+
+from . import app
+
+
+@pytest.fixture
+def tracer():
+    original_tracer = ddtrace.tracer
+    tracer = DummyTracer()
+
+    ddtrace.tracer = tracer
+    fastapi_patch()
+    yield tracer
+    ddtrace.tracer = original_tracer
+    fastapi_unpatch()
+
+
+@pytest.fixture
+def test_spans(tracer):
+    container = TracerSpanContainer(tracer)
+    yield container
+    container.reset()
+
+
+@pytest.fixture
+def fastapi_application(tracer):
+    application = app.get_app()
+    yield application
+
+
+@pytest.fixture
+def client(tracer, fastapi_application):
+    with TestClient(fastapi_application) as test_client:
+        yield test_client

tests/contrib/fastapi/test_fastapi_appsec_iast.py → tests/appsec/integrations/fastapi_tests/test_fastapi_appsec_iast.py

@@ -35,7 +35,7 @@
 from tests.utils import override_global_config
 
 
-TEST_FILE_PATH = "tests/contrib/fastapi/test_fastapi_appsec_iast.py"
+TEST_FILE_PATH = "tests/appsec/integrations/fastapi_tests/test_fastapi_appsec_iast.py"
 
 fastapi_version = tuple([int(v) for v in _fastapi_version.split(".")])