Integration Testing Rum (#33)

## Summary

**Jira:**
[INPLAT-961](https://datadoghq.atlassian.net/browse/INPLAT-961)

- Replace `inject-browser-sdk` git submodule with CMake `FetchContent`,
consuming the upstream `CMakeLists.txt` from [PR
#21](DataDog/inject-browser-sdk#21) which
handles Corrosion, crate import, and cbindgen internally
- Remove `cmake/deps/corrosion.cmake`, `deps/cbindgen.toml`, and the RUM
build block from `deps/CMakeLists.txt`
- Add integration test infrastructure with auto-build for RUM/no-RUM
module variants
- Add RUM integration tests for selective SDK injection per `<Location>`
directive

## Test plan
- [x] CI build passes (RUM disabled by default)
- [ ] CI smoke and integration tests pass
- [x] Manual: `cmake -B build -DHTTPD_DATADOG_ENABLE_RUM=ON` fetches
inject-browser-sdk and builds successfully

[INPLAT-961]:
https://datadoghq.atlassian.net/browse/INPLAT-961?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

Author: pawelchcki

.github/workflows/dev.yml

@@ -69,12 +69,11 @@ jobs:
           llvm-profdata merge -sparse /tmp/*.profraw -o /tmp/default.profdata 
           llvm-cov export dist/lib/mod_datadog.so -format=lcov -instr-profile=/tmp/default.profdata -ignore-filename-regex=/httpd/ > coverage.lcov
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4.0.1
+        uses: codecov/codecov-action@v5
         with:
           files: coverage.lcov
           name: github-actions
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: DataDog/httpd-datadog
-          os: alpine
           fail_ci_if_error: true
 

.gitignore

@@ -42,3 +42,16 @@ __pycache__/
 venv/
 
 compile_commands.json
+build-rum/
+*.bak
+
+# Integration tests
+test/integration-test/.venv/
+test/integration-test/uv.lock
+test/integration-test/.pytest_cache/
+test/integration-test/.coverage
+test/integration-test/htmlcov/
+test/integration-test/log-*/
+test/integration-test/logs/
+test/integration-test/*.conf.tmp
+test/integration-test/*.log

.gitlab-ci.yml

@@ -10,6 +10,34 @@ variables:
 stages:
   - ci-image
   - build
+  - test
+
+# Template jobs (hidden, reusable)
+.build-template:
+  stage: build
+  image: $CI_DOCKER_IMAGE_BASE/$ARCH:$DOCKERFILE_HASH
+  script:
+    - git config --global --add safe.directory $PWD
+    - >
+      cmake --preset=ci-release
+      -DHTTPD_DATADOG_ENABLE_RUM=ON
+      -DCMAKE_TOOLCHAIN_FILE=/sysroot/${TOOLCHAIN_ARCH}-none-linux-musl/Toolchain.cmake
+      -B build .
+    - cmake --build build -j --verbose
+    - cmake --install build --prefix dist
+    - mkdir -p artifacts/$ARCH
+    - cp dist/lib/mod_datadog.so artifacts/$ARCH/
+    - cp dist/lib/mod_datadog.so.debug artifacts/$ARCH/ || true
+  artifacts:
+    paths:
+      - artifacts/$ARCH/mod_datadog.so
+      - artifacts/$ARCH/mod_datadog.so.debug
+
+.test-rum-template:
+  stage: test
+  image: $CI_DOCKER_IMAGE_BASE/$ARCH:$DOCKERFILE_HASH
+  script:
+    - cd $CI_PROJECT_DIR/test/integration-test && uv sync && uv run pytest scenarios --module-path $CI_PROJECT_DIR/artifacts/$ARCH/mod_datadog.so --bin-path /httpd/httpd-build/bin/apachectl --log-dir $CI_PROJECT_DIR/logs -m requires_rum -v
 
 build-ci-image:
   stage: ci-image
@@ -43,30 +71,38 @@ build-ci-image:
     reports:
       dotenv: docker.env
 
-build:
-  stage: build
-  needs: [build-ci-image]
-  parallel:
-    matrix:
-      - ARCH: amd64
-        TOOLCHAIN_ARCH: x86_64
-      - ARCH: arm64
-        TOOLCHAIN_ARCH: aarch64
-  image: $CI_DOCKER_IMAGE_BASE/$ARCH:$DOCKERFILE_HASH
-  tags: ["arch:$ARCH"]
-  script:
-    - git config --global --add safe.directory $PWD
-    - >
-      cmake --preset=ci-release
-      -DHTTPD_DATADOG_ENABLE_RUM=ON
-      -DCMAKE_TOOLCHAIN_FILE=/sysroot/${TOOLCHAIN_ARCH}-none-linux-musl/Toolchain.cmake
-      -B build .
-    - cmake --build build -j --verbose
-    - cmake --install build --prefix dist
-    - mkdir -p artifacts/$ARCH
-    - cp dist/lib/mod_datadog.so artifacts/$ARCH/
-    - cp dist/lib/mod_datadog.so.debug artifacts/$ARCH/ || true
-  artifacts:
-    paths:
-      - artifacts/$ARCH/mod_datadog.so
-      - artifacts/$ARCH/mod_datadog.so.debug
+build:amd64:
+  extends: .build-template
+  needs:
+    - job: "build-ci-image: [amd64, x86_64]"
+  variables:
+    ARCH: amd64
+    TOOLCHAIN_ARCH: x86_64
+  tags: ["arch:amd64"]
+
+build:arm64:
+  extends: .build-template
+  needs:
+    - job: "build-ci-image: [arm64, aarch64]"
+  variables:
+    ARCH: arm64
+    TOOLCHAIN_ARCH: aarch64
+  tags: ["arch:arm64"]
+
+test-rum:amd64:
+  extends: .test-rum-template
+  needs:
+    - job: "build-ci-image: [amd64, x86_64]"
+    - job: "build:amd64"
+  variables:
+    ARCH: amd64
+  tags: ["arch:amd64"]
+
+test-rum:arm64:
+  extends: .test-rum-template
+  needs:
+    - job: "build-ci-image: [arm64, aarch64]"
+    - job: "build:arm64"
+  variables:
+    ARCH: arm64
+  tags: ["arch:arm64"]

.gitlab/Dockerfile

@@ -5,6 +5,7 @@
 #   - httpd 2.4 source code
 #   - Tools necessary to build httpd and mod_datadog
 #   - Rust toolchain for RUM (inject-browser-sdk requires Rust 1.73+)
+#   - uv (fast Python package manager for tests)
 #
 # Toolchain files are sourced from deps/nginx-datadog/build_env/
 #
@@ -89,6 +90,9 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -yq --d
 RUN cargo install --locked cbindgen --version 0.26.0 \
   && ln -s ~/.cargo/bin/cbindgen /usr/local/bin/cbindgen
 
+# Install uv (fast Python package manager)
+COPY --from=ghcr.io/astral-sh/uv:0.9.28 /uv /usr/local/bin/uv
+
 # Setup httpd 2.4 source
 COPY scripts/setup-httpd.py setup-httpd.py
 RUN python3 ./setup-httpd.py -o httpd 2.4.58 \

.gitmodules

@@ -1,10 +1,6 @@
 [submodule "deps/dd-trace-cpp"]
 	path = deps/dd-trace-cpp
 	url = ../dd-trace-cpp.git
-[submodule "deps/inject-browser-sdk"]
-	path = deps/inject-browser-sdk
-	url = ../httpd-datadog.git
-	branch = mirror-inject-browser-sdk
 [submodule "deps/nginx-datadog"]
 	path = deps/nginx-datadog
 	url = ../httpd-datadog.git

CMakeLists.txt

@@ -26,7 +26,18 @@ include(cmake/utils.cmake)
 include(cmake/deps/fmt.cmake)
 
 if (HTTPD_DATADOG_ENABLE_RUM)
-  include(cmake/deps/corrosion.cmake)
+  include(FetchContent)
+
+  set(INJECT_BROWSER_SDK_GIT_REF "49245e1c6ed8275990bb910125187e0aaad09e3d" CACHE STRING
+      "Git tag/branch for inject-browser-sdk")
+
+  FetchContent_Declare(
+    InjectBrowserSDK
+    GIT_REPOSITORY https://github.com/DataDog/inject-browser-sdk.git
+    GIT_TAG        ${INJECT_BROWSER_SDK_GIT_REF}
+  )
+  FetchContent_MakeAvailable(InjectBrowserSDK)
+
   include(cmake/deps/rapidjson.cmake)
 endif ()
 
@@ -50,3 +61,14 @@ endif (UNIX)
 add_subdirectory(deps)
 add_subdirectory(mod_datadog)
 add_subdirectory(test/unit-test)
+
+# Integration tests
+enable_testing()
+add_test(
+  NAME integration-tests
+  COMMAND uv run pytest
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test/integration-test
+)
+set_tests_properties(integration-tests PROPERTIES
+  ENVIRONMENT "HTTPD_MODULE_PATH=${CMAKE_BINARY_DIR}/mod_datadog/mod_datadog.so"
+)

cmake/deps/corrosion.cmake

@@ -1,15 +1 @@
 add_subdirectory(dd-trace-cpp)
-
-if (HTTPD_DATADOG_ENABLE_RUM)
-  corrosion_import_crate(
-    MANIFEST_PATH inject-browser-sdk/Cargo.toml
-    CRATES inject-browser-sdk-ffi
-    CRATE_TYPES staticlib
-  )
-
-  corrosion_experimental_cbindgen(
-    TARGET inject_browser_sdk_ffi
-    HEADER_NAME injectbrowsersdk.h
-    FLAGS --config ${CMAKE_SOURCE_DIR}/deps/cbindgen.toml
-  )
-endif ()