CI: relax 'exactly' to 'at least' for JRuby's sake

For some reason the hackish fake collector we use for testing has issues
with JRuby but only when ran via GitHub Actions.

For now at least, relax the 'exactly 1 call made for x' to be 'at least
1 call made for x' when JRuby is in play.

test/agent_helper.rb

@@ -1025,3 +1025,15 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
     puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end
+
+def first_call_for(subject)
+  items = $collector.calls_for(subject)
+
+  if defined?(JRUBY_VERSION)
+    refute_predicate items.size, :zero?, "Expected at least one call for '#{subject}'"
+  else
+    assert_equal 1, items.size, "Expected exactly one call for '#{subject}'"
+  end
+
+  items.first
+end

test/multiverse/suites/agent_only/custom_analytics_events_test.rb

@@ -79,10 +79,7 @@ def test_post_includes_metadata
   end
 
   def last_custom_event_post
-    posts = $collector.calls_for('custom_event_data')
-
-    assert_equal(1, posts.size)
-    posts.first
+    first_call_for('custom_event_data')
   end
 
   def last_posted_events

test/multiverse/suites/agent_only/encoding_handling_test.rb

@@ -97,10 +97,8 @@ def assert_endpoint_received_string(endpoint, string)
     agent.send(:transmit_custom_event_data)
     agent.send(:transmit_error_event_data)
     agent.send(:transmit_span_event_data)
-    requests = $collector.calls_for(endpoint)
+    request = first_call_for(endpoint)
 
-    assert_equal(1, requests.size)
-    request = requests.first
     request.decode! if request.respond_to?(:decode!)
 
     assert_contains_string(request, string)

test/multiverse/suites/agent_only/http_response_code_test.rb

@@ -21,7 +21,7 @@ def test_request_entity_too_large
 
     # make sure the data gets thrown away after we called collector without crashing
     assert_metrics_not_recorded(['Custom/too_big'])
-    assert_equal(1, $collector.calls_for('metric_data').size)
+    first_call_for('metric_data')
   end
 
   def test_unsupported_media_type
@@ -35,6 +35,6 @@ def test_unsupported_media_type
 
     # make sure the data gets thrown away after we called collector without crashing
     assert_metrics_not_recorded(['Custom/too_big'])
-    assert_equal(1, $collector.calls_for('metric_data').size)
+    first_call_for('metric_data')
   end
 end

test/multiverse/suites/agent_only/key_transactions_test.rb

@@ -81,10 +81,9 @@ def test_applied_correct_tt_threshold
 
     NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
 
-    traces = $collector.calls_for('transaction_sample_data')
+    trace = first_call_for('transaction_sample_data')
 
-    assert_equal 1, traces.size
-    assert_equal(WEB_KEY_TXN, traces[0].metric_name)
+    assert_equal(WEB_KEY_TXN, trace.metric_name)
   end
 
   def test_applied_correct_apdex_t_to_background_key_txn
@@ -109,9 +108,8 @@ def test_applied_correct_tt_threshold_to_background
 
     NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
 
-    traces = $collector.calls_for('transaction_sample_data')
+    trace = first_call_for('transaction_sample_data')
 
-    assert_equal 1, traces.size
-    assert_equal(OTHER_KEY_TXN, traces[0].metric_name)
+    assert_equal(OTHER_KEY_TXN, trace.metric_name)
   end
 end

test/multiverse/suites/agent_only/synthetics_test.rb

@@ -17,20 +17,18 @@ def app
   end
 
   def last_sent_analytics_event
-    calls = $collector.calls_for(:analytic_event_data)
+    call = first_call_for(:analytic_event_data)
 
-    assert_equal(1, calls.size)
-    events = calls.first.events
+    events = call.events
 
     assert_equal(1, events.size)
     events.first
   end
 
   def last_sent_transaction_trace
-    calls = $collector.calls_for(:transaction_sample_data)
+    call = first_call_for(:transaction_sample_data)
 
-    assert_equal(1, calls.size)
-    traces = calls.first.samples
+    traces = call.samples
 
     assert_equal(1, traces.size)
     traces.first

test/multiverse/suites/resque/instrumentation_test.rb

@@ -107,10 +107,9 @@ def test_arguments_are_captured_on_transaction_and_span_events_when_enabled
   end
 
   def assert_metric_and_call_count(name, expected_call_count)
-    metric_data = $collector.calls_for('metric_data')
+    metric_data = first_call_for('metric_data')
 
-    assert_equal(1, metric_data.size, 'expected exactly one metric_data post from agent')
-    metric = metric_data.first.metrics.find { |m| m[0]['name'] == name }
+    metric = metric_data.metrics.find { |m| m[0]['name'] == name }
 
     assert(metric, "could not find metric named #{name}")
 

test/new_relic/marshalling_test_cases.rb

@@ -12,10 +12,9 @@ def test_sends_metrics
 
     transmit_data
 
-    result = $collector.calls_for('metric_data')
+    result = first_call_for('metric_data')
 
-    assert_equal 1, result.length
-    assert_includes result.first.metric_names, 'Boo'
+    assert_includes result.metric_names, 'Boo'
   end
 
   def test_sends_errors
@@ -25,11 +24,10 @@ def test_sends_errors
 
     transmit_data
 
-    result = $collector.calls_for('error_data')
+    result = first_call_for('error_data')
 
-    assert_equal 1, result.length
-    assert_equal 1, result.first.errors.length
-    assert_equal 'StandardError', result.first.errors.first.exception_class_name
+    assert_equal 1, result.errors.length
+    assert_equal 'StandardError', result.errors.first.exception_class_name
   end
 
   def test_sends_transaction_traces
@@ -41,10 +39,9 @@ def test_sends_transaction_traces
 
     transmit_data
 
-    result = $collector.calls_for('transaction_sample_data')
+    result = first_call_for('transaction_sample_data')
 
-    assert_equal 1, result.length
-    assert_equal 'TestTransaction/do_it', result.first.metric_name
+    assert_equal 'TestTransaction/do_it', result.metric_name
   end
 
   def test_sends_transaction_events
@@ -56,10 +53,9 @@ def test_sends_transaction_events
 
     transmit_event_data
 
-    result = $collector.calls_for('analytic_event_data')
+    result = first_call_for('analytic_event_data')
 
-    assert_equal 1, result.length
-    events = result.first.events
+    events = result.events
 
     assert_equal 1, events.length
 
@@ -91,10 +87,9 @@ def test_sends_custom_events
 
     transmit_event_data
 
-    result = $collector.calls_for('custom_event_data')
+    result = first_call_for('custom_event_data')
 
-    assert_equal 1, result.length
-    events = result.first.events
+    events = result.events
 
     assert_equal 1, events.length
 
@@ -125,10 +120,9 @@ def test_sends_error_events
 
     transmit_data
 
-    result = $collector.calls_for('error_event_data')
+    result = first_call_for('error_event_data')
 
-    assert_equal 1, result.length
-    events = result.first.events
+    events = result.events
 
     assert_equal 1, events.length
 
@@ -175,18 +169,16 @@ def test_sends_log_events
 
     transmit_data
 
-    result = $collector.calls_for('log_event_data')
+    result = first_call_for('log_event_data')
 
-    assert_equal 1, result.length
-
-    common = result.first.common['attributes']
+    common = result.common['attributes']
 
     refute_nil common['hostname']
 
     # Excluding this explicitly vs classic logs-in-context to save space
     assert_nil common['entity.type']
 
-    logs = result.first.logs
+    logs = result.logs
 
     refute_empty logs
 

test/new_relic/multiverse_helpers.rb

@@ -193,50 +193,43 @@ def run_harvest
   end
 
   def single_transaction_trace_posted
-    posts = $collector.calls_for('transaction_sample_data')
-
-    assert_equal 1, posts.length, 'Unexpected post count'
-
-    transactions = posts.first.samples
+    post = first_call_for('transaction_sample_data')
+    transactions = post.samples
 
     assert_equal 1, transactions.length, 'Unexpected trace count'
-
     transactions.first
   end
 
   def single_error_posted
+    error_data = first_call_for('error_data')
+
     if defined?(JRUBY_VERSION)
-      refute_predicate $collector.calls_for('error_data').length, :zero?
-      refute_predicate $collector.calls_for('error_data').first.errors.length, :zero?
+      refute_predicate error_data.errors.length, :zero?, 'Expected at least 1 error'
     else
-      assert_equal 1, $collector.calls_for('error_data').length
-      assert_equal 1, $collector.calls_for('error_data').first.errors.length
+      assert_equal 1, error_data.errors.length, 'Expected exactly 1 error'
     end
 
-    $collector.calls_for('error_data').first.errors.first
+    error_data.errors.first
   end
 
   def single_event_posted
+    analytic_data = first_call_for('analytic_event_data')
+
     if defined?(JRUBY_VERSION)
-      refute_predicate $collector.calls_for('analytic_event_data').length, :zero?
-      refute_predicate $collector.calls_for('analytic_event_data').first.events.length, :zero?
+      refute_predicate analytic_data.events.length, :zero?, 'Expected at least 1 analytic event'
     else
-      assert_equal 1, $collector.calls_for('analytic_event_data').length
-      assert_equal 1, $collector.calls_for('analytic_event_data').first.events.length
+      assert_equal 1, analytic_data.events.length, 'Expected exactly 1 analytic event'
     end
 
-    $collector.calls_for('analytic_event_data').first.events.first
+    analytic_data.events.first
   end
 
   def single_metrics_post
-    assert_equal 1, $collector.calls_for('metric_data').length
-
-    $collector.calls_for('metric_data').first
+    first_call_for('metric_data')
   end
 
   def single_connect_posted
-    assert_equal 1, $collector.calls_for(:connect).size
-    $collector.calls_for(:connect).first
+    first_call_for('connect')
   end
 
   def capture_js_data

test/new_relic/transaction_ignoring_test_cases.rb

@@ -96,18 +96,4 @@ def test_does_not_record_sql_traces_for_ignored_transactions
     assert_equal(TXN_PREFIX + 'accepted_transaction', trace[0])
     assert_equal(1, trace[5])
   end
-
-  private
-
-  def first_call_for(subject)
-    items = $collector.calls_for(subject)
-
-    if defined?(JRUBY_VERSION)
-      refute_predicate items.size, :zero?
-    else
-      assert_equal(1, items.size)
-    end
-
-    items.first
-  end
 end