Merge branch 'main' into dmehala/capture-span-start-asap

Author: dmehala

.bazelrc.absl

@@ -7,9 +7,12 @@
 # This bazelrc defines the `DD_USE_ABSEIL_FOR_ENVOY` preprocessor macro, and so
 # the resulting library will use `absl::string_view` and `absl::optional`
 # instead of their standard (`std`) equivalents.
+#
+# Additionally, we configure Abseil to not use std library types by setting
+# the appropriate ABSL_OPTION_* macros, replacing the need for patching.
 
 build --enable_platform_specific_config
 
-build:linux --cxxopt='-std=c++17' --cxxopt='-Wall' --cxxopt='-Wextra' --cxxopt='-pedantic' --cxxopt='-DDD_USE_ABSEIL_FOR_ENVOY'
-build:macos --cxxopt='-std=c++17' --cxxopt='-Wall' --cxxopt='-Wextra' --cxxopt='-pedantic' --cxxopt='-DDD_USE_ABSEIL_FOR_ENVOY'
-build:windows --cxxopt='/std:c++17' --cxxopt='/DDD_USE_ABSEIL_FOR_ENVOY' --linkopt='ws2_32.lib'
+build:linux --cxxopt='-std=c++17' --cxxopt='-Wall' --cxxopt='-Wextra' --cxxopt='-pedantic' --cxxopt='-DDD_USE_ABSEIL_FOR_ENVOY' --cxxopt='-DABSL_OPTION_USE_STD_OPTIONAL=0' --cxxopt='-DABSL_OPTION_USE_STD_STRING_VIEW=0' --cxxopt='-DABSL_OPTION_USE_STD_VARIANT=0'
+build:macos --cxxopt='-std=c++17' --cxxopt='-Wall' --cxxopt='-Wextra' --cxxopt='-pedantic' --cxxopt='-DDD_USE_ABSEIL_FOR_ENVOY' --cxxopt='-DABSL_OPTION_USE_STD_OPTIONAL=0' --cxxopt='-DABSL_OPTION_USE_STD_STRING_VIEW=0' --cxxopt='-DABSL_OPTION_USE_STD_VARIANT=0'
+build:windows --cxxopt='/std:c++17' --cxxopt='/DDD_USE_ABSEIL_FOR_ENVOY' --cxxopt='/DABSL_OPTION_USE_STD_OPTIONAL=0' --cxxopt='/DABSL_OPTION_USE_STD_STRING_VIEW=0' --cxxopt='/DABSL_OPTION_USE_STD_VARIANT=0' --linkopt='ws2_32.lib'

.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
+      uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
       with:
         languages: ${{ matrix.language }}
 
@@ -36,4 +36,4 @@ jobs:
       run: bin/cmake-build --preset=ci-codeql
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
+      uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5

.github/workflows/dev.yml

@@ -5,9 +5,9 @@ jobs:
   format:
     runs-on: ubuntu-22.04-arm
     container:
-      image: datadog/docker-library:dd-trace-cpp-ci-5f5c273-arm64
+      image: datadog/docker-library:dd-trace-cpp-ci-23768e9-arm64
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Check format
         run: bin/check-format
       - name: Shellcheck
@@ -29,7 +29,7 @@ jobs:
     needs: format
     runs-on: ${{ matrix.runner }}
     container:
-      image: datadog/docker-library:dd-trace-cpp-ci-5f5c273-${{matrix.docker-arch}}
+      image: datadog/docker-library:dd-trace-cpp-ci-23768e9-${{matrix.docker-arch}}
     environment:
       name: dev
     permissions:
@@ -39,7 +39,7 @@ jobs:
       BUILD_DIR: .build
       DD_API_KEY: ${{ secrets.DD_CI_VIS_API_KEY }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Configure
         run: bin/with-toolchain ${{ matrix.toolchain }} cmake . -B .build -DCMAKE_BUILD_TYPE=Debug -DDD_TRACE_BUILD_TESTING=1  
       - name: Build
@@ -49,7 +49,7 @@ jobs:
       - name: Upload test report to Datadog
         run: |
           curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-${{ matrix.arch }}" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
-          datadog-ci junit upload --service dd-trace-cpp .build/report.xml
+          datadog-ci junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp .build/report.xml
 
   build-linux-bazel:
     needs: format
@@ -68,9 +68,9 @@ jobs:
             docker-arch: amd64
     runs-on: ${{ matrix.runner }}
     container:
-      image: datadog/docker-library:dd-trace-cpp-ci-5f5c273-${{matrix.docker-arch}}
+      image: datadog/docker-library:dd-trace-cpp-ci-23768e9-${{matrix.docker-arch}}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Build
         run: bin/with-toolchain ${{ matrix.toolchain }} bazelisk --bazelrc=${{ matrix.bazelrc }} build dd_trace_cpp
 
@@ -84,7 +84,7 @@ jobs:
       matrix:
         bazelrc: [".bazelrc.absl", ".bazelrc.std"]
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Install Dependency Manager (scoop)
         run: |
           Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
@@ -118,7 +118,7 @@ jobs:
     env:
       DD_API_KEY: ${{ secrets.DD_CI_VIS_API_KEY }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Install Dependency Manager (scoop)
         run: |
           Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
@@ -138,13 +138,13 @@ jobs:
       - name: Upload test report to Datadog
         run: |
           Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
-          ./datadog-ci.exe junit upload --service dd-trace-cpp report.xml
+          ./datadog-ci.exe junit upload --service dd-trace-cpp --tags test.source.file:test/*.cpp  report.xml
 
   coverage:
     needs: build-linux-cmake 
     runs-on: ubuntu-22.04-arm
     container:
-      image: datadog/docker-library:dd-trace-cpp-ci-5f5c273-arm64
+      image: datadog/docker-library:dd-trace-cpp-ci-23768e9-arm64
     environment:
       name: dev
     permissions:
@@ -153,7 +153,7 @@ jobs:
     env:
       DD_API_KEY: ${{ secrets.DD_CI_VIS_API_KEY }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - run: bin/test --coverage --verbose
       - name: Report Datadog coverage
         run: |

.github/workflows/main.yml

@@ -40,11 +40,11 @@ jobs:
     needs: call-dev-workflow
     runs-on: ubuntu-22.04-arm
     container:
-      image: datadog/docker-library:dd-trace-cpp-ci-5f5c273-arm64
+      image: datadog/docker-library:dd-trace-cpp-ci-23768e9-arm64
     env:
       DURATION_SEC: 300 # 5min
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Configure
         run: bin/with-toolchain llvm cmake . -B .build -DCMAKE_BUILD_TYPE=Debug -DDD_TRACE_BUILD_FUZZERS=1 -DDD_TRACE_ENABLE_SANITIZE=1 -DDD_TRACE_TRANSPORT=none
       - name: Build

.gitignore

@@ -1,6 +1,9 @@
 /bazel-*
 /.build/
+/build/
+/build-*/
 /.coverage/
+build/
 
 dist/
 out/