wip

Author: dmehala

.github/workflows/dev.yml

@@ -2,27 +2,32 @@ name: "Development"
 on: [pull_request, workflow_dispatch, workflow_call]
 
 jobs:
-  format-and-verify-configurations:
+  verify:
     runs-on: ubuntu-22.04-arm
     container:
       image: datadog/docker-library:dd-trace-cpp-ci-23768e9-arm64
+    env:
+      BUILD_DIR: .build
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Check format
         run: bin/check-format
       - name: Shellcheck
         run: find bin/ -executable -type f -print0 | xargs -0 shellcheck
-      - name: Verify environment variable allowlist
+      - name: Verify getenv usage
         run: bin/check-environment-variables
+      - name: Configure
+        run: bin/with-toolchain llvm cmake . -B ${BUILD_DIR} --preset ci-clang
+      - name: Build
+        run: cmake --build ${BUILD_DIR} -j --target config-inversion -v
       - name: Verify supported configurations metadata
         run: |
           tmp_dir="$(mktemp -d)"
           trap 'rm -rf "$tmp_dir"' EXIT
-          cp metadata/supported-configurations.json "$tmp_dir/supported-configurations.json"
-          bin/generate-supported-configurations
-          if ! diff -q "$tmp_dir/supported-configurations.json" metadata/supported-configurations.json >/dev/null 2>&1; then
-            echo "ERROR: metadata/supported-configurations.json got out of sync with implemented configurations. Please run bin/generate-supported-configurations locally."
-            diff -u "$tmp_dir/supported-configurations.json" metadata/supported-configurations.json || true
+          ./${BUILD_DIR}/tools/config-inversion --output-file "${tmp_dir}/ci-supported-configurations.json"
+          if ! diff -q "$tmp_dir/ci-supported-configurations.json" "supported-configurations.json" >/dev/null 2>&1; then
+            echo "ERROR: supported-configurations.json got out of sync with implemented configurations. Please run `./config-inversion --output-file supported-configurations.json` locally."
+            diff -u "$tmp_dir/supported-configurations.json" supported-configurations.json || true
             exit 1
           fi
 
@@ -39,7 +44,7 @@ jobs:
           - runner: ubuntu-22.04
             arch: x64
             docker-arch: amd64
-    needs: format-and-verify-configurations
+    needs: verify
     runs-on: ${{ matrix.runner }}
     container:
       image: datadog/docker-library:dd-trace-cpp-ci-23768e9-${{matrix.docker-arch}}
@@ -67,7 +72,7 @@ jobs:
           datadog-ci junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp .build/report.xml
 
   build-linux-bazel:
-    needs: format-and-verify-configurations
+    needs: verify
     strategy:
       fail-fast: false
       matrix:
@@ -90,7 +95,7 @@ jobs:
         run: bin/with-toolchain ${{ matrix.toolchain }} bazelisk --bazelrc=${{ matrix.bazelrc }} build dd_trace_cpp
 
   build-windows-bazel:
-    needs: format-and-verify-configurations
+    needs: verify
     runs-on: windows-2022
     defaults:
       run:
@@ -111,7 +116,7 @@ jobs:
         run: bazelisk.exe --bazelrc=${{ matrix.bazelrc }} build dd_trace_cpp
 
   build-windows-cmake:
-    needs: format-and-verify-configurations
+    needs: verify
     strategy:
       fail-fast: false
       matrix:

CMakeLists.txt

@@ -101,7 +101,7 @@ endif ()
 
 if (DD_TRACE_BUILD_TOOLS)
   include(cmake/deps/cxxopts.cmake)
-  add_subdirectory(tools)
+  add_subdirectory(tools/config-inversion)
 endif ()
 
 add_library(dd-trace-cpp-objects OBJECT)

CMakePresets.json

@@ -40,6 +40,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "DD_TRACE_ENABLE_SANITIZE": "ON",
+        "DD_TRACE_BUILD_TOOLS": "ON",
         "DD_TRACE_BUILD_TESTING": "ON"
       }
     }

bin/check-environment-variables

@@ -0,0 +1,19 @@
+#!/bin/sh
+# TODO
+set -eu
+
+if grep -R -n \
+    --include='*.c' \
+    --include='*.cc' \
+    --include='*.cpp' \
+    --include='*.cxx' \
+    --include='*.h' \
+    --include='*.hpp' \
+    --exclude='environment.cpp' \
+    'std::getenv' include src; then
+    echo "Check failed: std::getenv usage detected."
+    exit 1
+else
+    echo "Check passed: no std::getenv usage found."
+    exit 0
+fi

tools/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_executable(config-inversion main.cpp)
+
+target_include_directories(config-inversion
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/include/datadog
+)
+
+target_link_libraries(config-inversion
+  PRIVATE
+    nlohmann_json::nlohmann_json
+    cxxopts::cxxopts
+    dd-trace-cpp::specs
+)