Revert previous changes and check heartbeat_events.

spec/datadog/core/telemetry/component_spec.rb

@@ -119,7 +119,7 @@
       end
     end
 
-    context 'when in fork' do
+    context 'when in fork', skip: ENV['BATCHED_TASKS'] do
       before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
 
       it do
@@ -169,7 +169,7 @@
       end
     end
 
-    context 'when in fork' do
+    context 'when in fork', skip: ENV['BATCHED_TASKS'] do
       before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
 
       it do
@@ -209,7 +209,7 @@
       end
     end
 
-    context 'when in fork' do
+    context 'when in fork', skip: ENV['BATCHED_TASKS'] do
       before { skip 'Fork not supported on current platform' unless Process.respond_to?(:fork) }
 
       it do
@@ -245,7 +245,7 @@
         expect(worker).to have_received(:enqueue).with(event)
       end
 
-      context 'when in fork', skip: !Process.respond_to?(:fork) do
+      context 'when in fork', skip: !Process.respond_to?(:fork) || ENV['BATCHED_TASKS'] do
         it do
           telemetry
           expect_in_fork do

spec/datadog/core/telemetry/worker_spec.rb

@@ -306,7 +306,12 @@
           end
           workers.each(&:start)
 
-          try_wait_until { heartbeat_events >= 3 }
+          begin
+            try_wait_until { heartbeat_events >= 3 }
+          rescue => e
+            puts "Test failed. Heartbeat events received: #{heartbeat_events}"
+            raise e
+          end
 
           expect(started_events).to be(1)
 

spec/support/synchronization_helpers.rb

@@ -1,7 +1,7 @@
 require 'English'
 
 module SynchronizationHelpers
-  def expect_in_fork(fork_expectations: nil, timeout_seconds: 30)
+  def expect_in_fork(fork_expectations: nil, timeout_seconds: 10)
     fork_expectations ||= proc { |status:, stdout:, stderr:|
       expect(status && status.success?).to be(true), "STDOUT:`#{stdout}` STDERR:`#{stderr}"
     }