Merge branch 'master', remote-tracking branches 'u/flaky-di-test', 'u/telemetry-inject-deps' and 'u/telemetry-limit' into base

* master:
  Remove ethon thread helper in test suite (#5057)
  [🤖] Update System Tests: https://github.com/DataDog/dd-trace-rb/actions/runs/19513184798 (#5068)

* u/flaky-di-test:
  [🤖] Update System Tests: https://github.com/DataDog/dd-trace-rb/actions/runs/19513184798 (#5068)
  DI: make a test method longer to avoid flakiness

* u/telemetry-inject-deps:
  Update lib/datadog/profiling/profiler.rb
  Update lib/datadog/profiling/profiler.rb

* u/telemetry-limit:
  [🤖] Update System Tests: https://github.com/DataDog/dd-trace-rb/actions/runs/19513184798 (#5068)

Author: p

.github/workflows/system-tests.yml

@@ -77,7 +77,7 @@ jobs:
   test:
     needs:
       - build
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@7cc82692d3d02b17f20d6d0fcbee09de21f27ad4  # Automated: This reference is automatically updated.
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b  # Automated: This reference is automatically updated.
     secrets:
       TEST_OPTIMIZATION_API_KEY: ${{ secrets.DD_API_KEY }}  # key used to pushed test results to test optim
       DD_API_KEY: ${{ secrets.DD_API_KEY }}  # key used in tests runs
@@ -91,7 +91,7 @@ jobs:
       desired_execution_time: 300  # 5 minutes
       scenarios_groups: tracer_release
       skip_empty_scenarios: true
-      ref: 7cc82692d3d02b17f20d6d0fcbee09de21f27ad4  # Automated: This reference is automatically updated.
+      ref: 2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b  # Automated: This reference is automatically updated.
       force_execute: ${{ needs.build.outputs.forced_tests }}
       parametric_job_count: 8
       push_to_test_optimization: true

.gitlab-ci.yml

@@ -146,7 +146,7 @@ requirements_json_test:
 
 configure_system_tests:
   variables:
-    SYSTEM_TESTS_REF: 7cc82692d3d02b17f20d6d0fcbee09de21f27ad4 # Automated: This reference is automatically updated.
+    SYSTEM_TESTS_REF: 2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b # Automated: This reference is automatically updated.
     SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,lib-injection"
 
 save_versions:

lib/datadog/profiling/profiler.rb

@@ -18,7 +18,7 @@ def initialize(worker:, scheduler:)
       end
 
       def enabled?
-        !!scheduler&.running?
+        scheduler.running?
       end
 
       def start

spec/datadog/di/integration/instrumentation_spec.rb

@@ -20,6 +20,13 @@ def test_method(a = 1)
     42
   end
 
+  def long_test_method
+    # This method is used to assert on @duration, and +test_method+
+    # somehow managed to report an execution time of 0.0 in CI one time
+    # (though normally it takes about 1 microsecond).
+    Object.methods.length > 0 and 42
+  end
+
   def mutating_method(greeting)
     greeting.sub!('hello', 'bye')
   end
@@ -506,7 +513,7 @@ def run_test
           {
             id: '1234',
             type: 'LOG_PROBE',
-            where: {typeName: 'InstrumentationSpecTestClass', methodName: 'test_method'},
+            where: {typeName: 'InstrumentationSpecTestClass', methodName: 'long_test_method'},
             segments: segments,
           }
         end
@@ -535,7 +542,7 @@ def run_test
               expect(value).to be > 0
               expect(value).to be < 1
             end
-            expect(InstrumentationSpecTestClass.new.test_method).to eq(42)
+            expect(InstrumentationSpecTestClass.new.long_test_method).to eq(42)
             component.probe_notifier_worker.flush
           end
         end

spec/datadog/tracing/contrib/ethon/easy_patch_spec.rb

@@ -6,11 +6,9 @@
 require 'datadog/tracing/contrib/ethon/shared_examples'
 require 'datadog/tracing/contrib/analytics_examples'
 
-require 'spec/datadog/tracing/contrib/ethon/support/thread_helpers'
-
 RSpec.describe Datadog::Tracing::Contrib::Ethon::EasyPatch do
   let(:configuration_options) { {} }
-  let(:easy) { EthonSupport.ethon_easy_new }
+  let(:easy) { Ethon::Easy.new }
   let(:server_error_statuses) { nil }
 
   before do
@@ -252,7 +250,7 @@
 
   context 'when basic auth in url' do
     it 'does not collect auth info' do
-      easy = EthonSupport.ethon_easy_new(url: 'http://username:[email protected]/sample/path')
+      easy = Ethon::Easy.new(url: 'http://username:[email protected]/sample/path')
 
       easy.perform
 
@@ -263,7 +261,7 @@
 
   context 'when query string in url' do
     it 'does not collect query string' do
-      easy = EthonSupport.ethon_easy_new(url: 'http://example.com/sample/path?foo=bar')
+      easy = Ethon::Easy.new(url: 'http://example.com/sample/path?foo=bar')
 
       easy.perform
 

spec/datadog/tracing/contrib/ethon/integration_test_spec.rb

@@ -9,14 +9,12 @@
 require 'datadog/tracing/contrib/support/spec_helper'
 require 'datadog/tracing/contrib/support/http'
 
-require 'spec/datadog/tracing/contrib/ethon/support/thread_helpers'
-
 RSpec.describe 'Ethon integration tests' do
   skip_unless_integration_testing_enabled
 
   context 'with Easy HTTP request' do
     subject(:request) do
-      easy = EthonSupport.ethon_easy_new
+      easy = Ethon::Easy.new
       easy.http_request(url, 'GET', params: query, timeout_ms: timeout * 1000)
       easy.perform
       # Use Typhoeus response wrapper to simplify tests
@@ -67,7 +65,7 @@
 
   context 'with simple Easy & headers override' do
     subject(:request) do
-      easy = EthonSupport.ethon_easy_new(url: url)
+      easy = Ethon::Easy.new(url: url)
       easy.customrequest = 'GET'
       easy.set_attributes(timeout_ms: timeout * 1000)
       easy.headers = request_headers
@@ -104,7 +102,7 @@
   context 'with single Multi request' do
     subject(:request) do
       multi = Ethon::Multi.new
-      easy = EthonSupport.ethon_easy_new
+      easy = Ethon::Easy.new
       easy.http_request(url, 'GET', params: query, timeout_ms: timeout * 1000)
       multi.add(easy)
       multi.perform

spec/datadog/tracing/contrib/ethon/multi_patch_spec.rb

@@ -7,8 +7,6 @@
 require 'datadog/tracing/contrib/environment_service_name_examples'
 require 'datadog/tracing/contrib/span_attribute_schema_examples'
 
-require 'spec/datadog/tracing/contrib/ethon/support/thread_helpers'
-
 RSpec.describe Datadog::Tracing::Contrib::Ethon::MultiPatch do
   let(:configuration_options) { {} }
 
@@ -26,7 +24,7 @@
   end
 
   describe '#add' do
-    let(:easy) { EthonSupport.ethon_easy_new }
+    let(:easy) { Ethon::Easy.new }
     let(:span) { easy.instance_eval { @datadog_span } }
     let(:multi_span) { multi.instance_eval { @datadog_multi_span } }
     let(:multi) { ::Ethon::Multi.new }
@@ -61,7 +59,7 @@
   end
 
   describe '#perform' do
-    let(:easy) { EthonSupport.ethon_easy_new }
+    let(:easy) { Ethon::Easy.new }
     let(:easy_span) { spans.find { |span| span.name == 'ethon.request' } }
     let(:multi_span) { spans.find { |span| span.name == 'ethon.multi.request' } }
     let(:multi) { ::Ethon::Multi.new }

spec/datadog/tracing/contrib/ethon/support/thread_helpers.rb

@@ -2,7 +2,6 @@
 
 require 'datadog/tracing/contrib/ethon/shared_examples'
 require 'datadog/tracing/contrib/ethon/integration_context'
-require 'spec/datadog/tracing/contrib/ethon/support/thread_helpers'
 
 RSpec.describe Datadog::Tracing::Contrib::Ethon do
   skip_unless_integration_testing_enabled
@@ -18,7 +17,7 @@
     #
     # This allows us to still ensure that the integration
     # itself is leak-free.
-    EthonSupport.ethon_easy_new
+    Ethon::Easy.new
   end
 
   context 'with Typhoeus request' do