Merge branch 'telemetry-integration-test' into base

p · p · commit b1bbfcdea6d3 · 2025-05-05T08:59:49.000-04:00
* telemetry-integration-test: (21 commits) fix test cleanup fix test setup try a non-zero timeout? fix integration test Update spec/datadog/core/telemetry/integration/telemetry_spec.rb fix other test fix flushing flush telemetry events fix test provide a block rubocop rubocop di add content-type assertion wait for thread to end telemetry integration test do not initialize components from on fork handler Emtpy string Bump the gh-actions-packages group across 2 directories with 4 updates [APMAPI-1258] Adjust trace sampling formula (DataDog#4616) Add baggage to karafka list of propagation styles (DataDog#4614) ...
diff --git a/.github/actions/build-test/action.yml b/.github/actions/build-test/action.yml
@@ -32,7 +32,7 @@ runs:
 
   - name: Debug with SSH connection
     if: ${{ failure() && runner.debug == '1' }}
-    uses: mxschmitt/action-tmate@c606f8612a802e46b3742322514c09fbc8c4afee # v3.19.0
+    uses: mxschmitt/action-tmate@7b6a61a73bbb9793cb80ad69b8dd8ac19261834c # v3.19.0
     with:
       limit-access-to-actor: true
       # This mode will wait at the end of the job for a user to connect and then to terminate the tmate session.
diff --git a/.github/workflows/build-gem.yml b/.github/workflows/build-gem.yml
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: '3.2'
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -87,7 +87,7 @@ jobs:
       - name: List gem
         run: |
           find pkg
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: '3.2'
       - name: Install gem
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,10 +45,10 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually
       - name: Autobuild
-        uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
 
   complete:
     name: CodeQL (complete)
diff --git a/.github/workflows/generate-supported-versions.yml b/.github/workflows/generate-supported-versions.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: "3.3"
 
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: DeterminateSystems/nix-installer-action@7b2eab0f0210922c27b0a3d76c5d768d8962bf30 # main
+      - uses: DeterminateSystems/nix-installer-action@7b9fe29d91f67b47e423cea399a44b8a20c9b324 # main
       - name: Print ruby version
         run: |
           nix develop --command which ruby
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: '3.3.7'
 
@@ -165,7 +165,7 @@ jobs:
         with:
           persist-credentials: false # `rubygems/release-gem` action handles credentials itself
       - name: Set up Ruby
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: '3.3.7'
       - run: bundle install
@@ -209,7 +209,7 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
       - name: Set up Ruby
-        uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+        uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: '3.3.7'
       - run: bundle install
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -399,7 +399,7 @@ jobs:
           ./run.sh ++docker ${{ matrix.scenario }} \
             ${{ env.FORCED_TESTS_LIST && fromJSON(env.FORCED_TESTS_LIST)[matrix.scenario] && format('-F {0}', join(fromJSON(env.FORCED_TESTS_LIST)[matrix.scenario], ' -F ')) || ''}}
         env:
-          DD_API_KEY: ${{ secrets.DD_APPSEC_SYSTEM_TESTS_API_KEY }}
+          DD_API_KEY: ${{ secrets.DD_API_KEY }}
           SYSTEM_TESTS_AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }}
           SYSTEM_TESTS_AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }}
           FORCED_TESTS_LIST: ${{ needs.build-apps.outputs.FORCED_TESTS_LIST }}
diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml
@@ -43,7 +43,7 @@ jobs:
       # head rubies
       - if: ${{ matrix.ruby == 'head' }}
         run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: 3.3.26
diff --git a/.github/workflows/test-memory-leaks.yaml b/.github/workflows/test-memory-leaks.yaml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: 3.4.1
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # Adds 3.4-asan builds
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # Adds 3.4-asan builds
         with:
           ruby-version: 3.4-asan
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
diff --git a/.github/workflows/test-yjit.yaml b/.github/workflows/test-yjit.yaml
@@ -49,7 +49,7 @@ jobs:
       # head rubies
       - if: ${{ matrix.ruby == 'head' }}
         run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec
-      - uses: ruby/setup-ruby@dffc446db9ba5a0c4446edb5bca1c5c473a806c5 # v1.235.0
+      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -115,7 +115,6 @@ jobs:
     name: dd/junit
     if: ${{ !cancelled() }}
     runs-on: ubuntu-24.04
-    continue-on-error: true
     container:
       image: datadog/ci
       credentials:
@@ -165,6 +164,7 @@ jobs:
         run: echo "DD_GIT_COMMIT_SHA=$DD_GIT_COMMIT_SHA" >> "$GITHUB_ENV"
       - run: echo "$DD_GIT_COMMIT_SHA"
       - name: Upload junit reports
+        continue-on-error: true
         run: datadog-ci junit upload --verbose tmp/rspec/
 
   coverage:
diff --git a/lib/datadog/tracing/contrib/karafka/distributed/propagation.rb b/lib/datadog/tracing/contrib/karafka/distributed/propagation.rb
@@ -31,6 +31,8 @@ def initialize(
                     Tracing::Distributed::Datadog.new(fetcher: Tracing::Distributed::Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT =>
                     Tracing::Distributed::TraceContext.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE =>
+                    Tracing::Distributed::Baggage.new(fetcher: Tracing::Distributed::Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new
                 },
                 propagation_style_inject: propagation_style_inject,
diff --git a/lib/datadog/tracing/distributed/b3_multi.rb b/lib/datadog/tracing/distributed/b3_multi.rb
@@ -55,7 +55,7 @@ def extract(data)
           span_id = Helpers.parse_hex_id(fetcher[@span_id_key])
 
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
           sampling_priority = Helpers.parse_decimal_id(fetcher[@sampled_key])
diff --git a/lib/datadog/tracing/distributed/b3_single.rb b/lib/datadog/tracing/distributed/b3_single.rb
@@ -54,7 +54,7 @@ def extract(env)
 
           span_id = Helpers.parse_hex_id(parts[1]) if parts.length > 1
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           sampling_priority = Helpers.parse_decimal_id(parts[2]) if parts.length > 2
 
diff --git a/lib/datadog/tracing/distributed/datadog.rb b/lib/datadog/tracing/distributed/datadog.rb
@@ -89,7 +89,7 @@ def parse_trace_id(fetcher_object)
           trace_id = Helpers.parse_decimal_id(fetcher_object[@trace_id_key])
 
           return unless trace_id
-          return if trace_id <= 0 || trace_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if trace_id <= 0 || trace_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           trace_id
         end
@@ -98,7 +98,7 @@ def parse_parent_id(fetcher_object)
           parent_id = Helpers.parse_decimal_id(fetcher_object[@parent_id_key])
 
           return unless parent_id
-          return if parent_id <= 0 || parent_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if parent_id <= 0 || parent_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           parent_id
         end
diff --git a/lib/datadog/tracing/sampling/rate_sampler.rb b/lib/datadog/tracing/sampling/rate_sampler.rb
@@ -9,6 +9,7 @@ module Sampling
       # {Datadog::Tracing::Sampling::RateSampler} is based on a sample rate.
       class RateSampler < Sampler
         KNUTH_FACTOR = 1111111111111111111
+        UINT64_MODULO = (1 << 64)
 
         # Initialize a {Datadog::Tracing::Sampling::RateSampler}.
         # This sampler keeps a random subset of the traces. Its main purpose is to
@@ -39,7 +40,7 @@ def sample_rate=(sample_rate)
         end
 
         def sample?(trace)
-          ((trace.id * KNUTH_FACTOR) % Tracing::Utils::EXTERNAL_MAX_ID) <= @sampling_id_threshold
+          ((trace.id * KNUTH_FACTOR) % UINT64_MODULO) <= @sampling_id_threshold
         end
 
         def sample!(trace)
diff --git a/lib/datadog/tracing/utils.rb b/lib/datadog/tracing/utils.rb
@@ -24,7 +24,7 @@ module Utils
 
       # While we only generate 63-bit integers due to limitations in other languages, we support
       # parsing 64-bit integers for distributed tracing since an upstream system may generate one
-      EXTERNAL_MAX_ID = 1 << 64
+      EXTERNAL_MAX_ID = (1 << 64) - 1
 
       # We use a custom random number generator because we want no interference
       # with the default one. Using the default prng, we could break code that
diff --git a/sig/datadog/tracing/sampling/rate_sampler.rbs b/sig/datadog/tracing/sampling/rate_sampler.rbs
@@ -2,7 +2,8 @@ module Datadog
   module Tracing
     module Sampling
       class RateSampler < Sampler
-        KNUTH_FACTOR: 1111111111111111111
+        KNUTH_FACTOR: Integer
+        UINT64_MODULO: Integer
         def initialize: (?::Float sample_rate, ?decision: untyped?) -> void
 
         def sample_rate: (*untyped _) -> untyped
diff --git a/spec/datadog/core/telemetry/integration/telemetry_spec.rb b/spec/datadog/core/telemetry/integration/telemetry_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'datadog/core/telemetry/component'
@@ -102,7 +104,7 @@
       before do
         # To avoid noise from the startup events, turn those off.
         Datadog::Core::Telemetry::Worker::TELEMETRY_STARTED_ONCE.run do
-          # nothing
+          true
         end
       end
 
diff --git a/spec/datadog/core/telemetry/worker_spec.rb b/spec/datadog/core/telemetry/worker_spec.rb
@@ -278,6 +278,21 @@
       end
 
       context 'several workers running' do
+
+        before do
+          # This test expects the AppStarted event
+          Datadog::Core::Telemetry::Worker::TELEMETRY_STARTED_ONCE.send(:reset_ran_once_state_for_tests)
+        end
+
+        let(:started_workers) { [] }
+
+        after do
+          started_workers.each do |w|
+            w.stop(true, 0)
+            w.join
+          end
+        end
+
         it 'sends single started event' do
           started_events = 0
           mutex = Mutex.new
@@ -305,18 +320,15 @@
               metrics_manager: metrics_manager,
               dependency_collection: dependency_collection,
               logger: logger,
-            )
+            ).tap do |worker|
+              started_workers << worker
+            end
           end
           workers.each(&:start)
 
           try_wait_until { heartbeat_events >= 3 }
 
           expect(started_events).to be(1)
-
-          workers.each do |w|
-            w.stop(true, 0)
-            w.join
-          end
         end
       end
     end
diff --git a/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb
@@ -22,6 +22,22 @@
   let(:propagation_style_extract) { ['datadog', 'tracecontext', 'baggage'] }
   let(:propagation_extract_first) { false }
 
+  it 'contains default inject propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_inject)
+    Datadog.configuration.tracing.propagation_style_inject.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+
+  it 'contains default extract propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_extract)
+    Datadog.configuration.tracing.propagation_style_extract.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+
   it_behaves_like 'Distributed tracing propagator' do
     subject(:propagator) { propagation }
 
diff --git a/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb
@@ -30,6 +30,22 @@
     WebMock.disable_net_connect!(allow: agent_url)
   end
 
+  it 'contains default inject propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_inject)
+    Datadog.configuration.tracing.propagation_style_inject.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+
+  it 'contains default extract propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_extract)
+    Datadog.configuration.tracing.propagation_style_extract.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+
   it_behaves_like 'Distributed tracing propagator' do
     subject(:propagator) { propagation }
   end
diff --git a/spec/datadog/tracing/contrib/karafka/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/karafka/distributed/propagation_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'datadog/tracing/contrib/support/spec_helper'
+
+require 'karafka'
+require 'datadog'
+
+RSpec.describe Datadog::Tracing::Contrib::Karafka::Distributed::Propagation do
+  subject(:propagation) do
+    described_class.new(
+      propagation_style_inject: Datadog.configuration.tracing.propagation_style_inject,
+      propagation_style_extract: Datadog.configuration.tracing.propagation_style_extract,
+      propagation_extract_first: Datadog.configuration.tracing.propagation_extract_first
+    )
+  end
+
+  it 'contains default inject propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_inject)
+    Datadog.configuration.tracing.propagation_style_inject.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+
+  it 'contains default extract propagation styles in its propagation styles list' do
+    expect(propagation.instance_variable_get(:@propagation_styles).keys)
+      .to include(*Datadog.configuration.tracing.propagation_style_extract)
+    Datadog.configuration.tracing.propagation_style_extract.each do |style|
+      expect(propagation.instance_variable_get(:@propagation_styles)[style]).to_not be_nil
+    end
+  end
+end
diff --git a/spec/datadog/tracing/contrib/sidekiq/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/sidekiq/distributed/propagation_spec.rb
diff --git a/spec/datadog/tracing/sampling/rate_sampler_spec.rb b/spec/datadog/tracing/sampling/rate_sampler_spec.rb
