Merge branch 'main' into dmehala/telemetry/part-2-move-telemetry-exporter

Author: dmehala

.circleci/config.yml

@@ -110,7 +110,7 @@ jobs:
     - run:
         name: Install dependencies
         command: |
-          choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
+          choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System'
           choco install -y ninja
     - run: 
         name: Building

.github/workflows/codeql-analysis.yml

@@ -25,14 +25,15 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
       with:
         languages: ${{ matrix.language }}
 
+    - name: Install dependencies
+      run: bin/install-cmake
+
     - name: Build dd-trace-cpp
-      run: |
-        bin/install-cmake
-        bin/cmake-build
+      run: bin/cmake-build --preset=ci-codeql
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

CMakePresets.json

@@ -12,6 +12,13 @@
         "DD_TRACE_STATIC_CRT": "1",
         "DD_TRACE_BUILD_TESTING": "1"
       }
+    },
+    {
+      "name": "ci-codeql",
+      "displayName": "CI CodeQL",
+      "cacheVariables": {
+        "CMAKE_POLICY_VERSION_MINIMUM": "3.5"
+      }
     }
   ]
 }

src/datadog/trace_sampler.cpp

@@ -55,7 +55,7 @@ SamplingDecision TraceSampler::decide(const SpanData& span) {
     decision.limiter_max_per_second = limiter_max_per_second_;
     decision.configured_rate = rule.rate;
     const std::uint64_t threshold = max_id_from_rate(rule.rate);
-    if (knuth_hash(span.trace_id.low) < threshold) {
+    if (knuth_hash(span.trace_id.low) <= threshold) {
       const auto result = limiter_.allow();
       if (result.allowed) {
         decision.priority = int(SamplingPriority::USER_KEEP);
@@ -90,7 +90,7 @@ SamplingDecision TraceSampler::decide(const SpanData& span) {
   }
 
   const std::uint64_t threshold = max_id_from_rate(*decision.configured_rate);
-  if (knuth_hash(span.trace_id.low) < threshold) {
+  if (knuth_hash(span.trace_id.low) <= threshold) {
     decision.priority = int(SamplingPriority::AUTO_KEEP);
   } else {
     decision.priority = int(SamplingPriority::AUTO_DROP);