test: continue switch to rspec-mocks

.instrumentation_generator/templates/Gemfile

@@ -15,6 +15,7 @@ group :test do
   gem 'opentelemetry-sdk', '~> 1.0'
   gem 'opentelemetry-test-helpers', '~> 0.3'
   gem 'rake', '>= 13'
+  gem 'rspec-mocks', '~> 3.13.7'
   gem 'rubocop', '~> 1.85.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'simplecov', '~> 0.22.0'

instrumentation/rake/test/opentelemetry/instrumentation/rake/patches/task_test.rb

@@ -58,9 +58,9 @@
 
     describe 'with a task argument' do
       it 'should call force_flush on OpenTelemetry.tracer_provider' do
-        mock = Minitest::Mock.new
-        mock.expect(:force_flush, nil)
-        mock.expect(:force_flush, nil)
+        mock = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
+        allow(mock).to receive(:force_flush).and_return(nil)
+        expect(mock_provider).to have_received(:force_flush).twice
 
         Rake::Task.define_task("#{task_name}[:arg]")
         task_string = "#{task_name}[test_arg]"
@@ -69,8 +69,6 @@
 
         allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock)
         Rake.application.invoke_task(task_string)
-
-        mock.verify
       end
     end
 

instrumentation/resque/Gemfile

@@ -14,6 +14,7 @@ group :test do
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-test-helpers', '~> 0.3'
   gem 'rake', '>= 13'
+  gem 'rspec-mocks', '~> 3.13.7'
   gem 'rubocop', '~> 1.85.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'simplecov', '~> 0.22.0'

instrumentation/resque/test/opentelemetry/instrumentation/resque/patches/resque_job_test.rb

@@ -190,47 +190,44 @@
         let(:config) { { force_flush: :ask_the_job } }
 
         it 'asks the job and skips forcibly flushing the tracer' do
-          mock_tracer_provider = Minitest::Mock.new
-          mock_tracer_provider.expect(:force_flush, true)
+          mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
+          allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
+          allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)
 
-          OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
-            Resque.enqueue(DummyJob)
-            work_off_jobs
-          end
+          Resque.enqueue(DummyJob)
+          work_off_jobs
 
-          expect { mock_tracer_provider.verify }.must_raise MockExpectationError
+          expect(mock_tracer_provider).not_to have_received(:force_flush)
         end
       end
 
       describe 'always' do
         let(:config) { { force_flush: :always } }
 
         it 'does forcibly flush the tracer' do
-          mock_tracer_provider = Minitest::Mock.new
-          mock_tracer_provider.expect(:force_flush, true)
+          mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
+          allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
+          allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)
 
-          OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
-            Resque.enqueue(DummyJob)
-            work_off_jobs
-          end
+          Resque.enqueue(DummyJob)
+          work_off_jobs
 
-          mock_tracer_provider.verify
+          expect(mock_tracer_provider).to have_received(:force_flush)
         end
       end
 
       describe 'never' do
         let(:config) { { force_flush: :never } }
 
         it 'does not forcibly flush the tracer' do
-          mock_tracer_provider = Minitest::Mock.new
-          mock_tracer_provider.expect(:force_flush, true)
+          mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
+          allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
+          allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)
 
-          OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
-            Resque.enqueue(DummyJob)
-            work_off_jobs
-          end
+          Resque.enqueue(DummyJob)
+          work_off_jobs
 
-          expect { mock_tracer_provider.verify }.must_raise MockExpectationError
+          expect(mock_tracer_provider).not_to have_received(:force_flush)
         end
       end
     end

instrumentation/resque/test/test_helper.rb

@@ -11,6 +11,7 @@
 require 'active_job'
 
 require 'minitest/autorun'
+require 'rspec/mocks/minitest_integration'
 require 'webmock/minitest'
 
 # global opentelemetry-sdk setup:

processor/baggage/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'minitest', '~> 5.0'
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'rake', '>= 13'
+  gem 'rspec-mocks', '~> 3.13.7'
   gem 'rubocop', '~> 1.85.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'simplecov', '~> 0.22.0'

processor/baggage/test/opentelemetry/processor/baggage/baggage_span_processor_test.rb

@@ -31,7 +31,7 @@
       OpenTelemetry::Processor::Baggage::ALLOW_ALL_BAGGAGE_KEYS
     )
   end
-  let(:span) { Minitest::Mock.new }
+  let(:span) { instance_double(OpenTelemetry::Trace::Span) }
   let(:context_with_baggage) do
     OpenTelemetry::Baggage.build(context: OpenTelemetry::Context.empty) do |baggage|
       baggage.set_value('a_key', 'a_value')
@@ -50,11 +50,11 @@
   describe '#on_start' do
     describe 'with the ALLOW_ALL_BAGGAGE_KEYS predicate' do
       it 'adds current baggage keys/values as attributes when a span starts' do
-        span.expect(:add_attributes, span, [{ 'a_key' => 'a_value', 'b_key' => 'b_value' }])
+        expect(span).to receive(:add_attributes)
+          .with({ 'a_key' => 'a_value', 'b_key' => 'b_value' })
+          .and_return(span)
 
         processor.on_start(span, context_with_baggage)
-
-        span.verify
       end
     end
 
@@ -66,11 +66,11 @@
       end
 
       it 'only adds attributes that pass the keyfilter' do
-        span.expect(:add_attributes, span, [{ 'a_key' => 'a_value' }])
+        expect(span).to receive(:add_attributes)
+          .with({ 'a_key' => 'a_value' })
+          .and_return(span)
 
         start_with_processor.on_start(span, context_with_baggage)
-
-        span.verify
       end
     end
 
@@ -82,11 +82,11 @@
       end
 
       it 'only adds attributes that pass the keyfilter' do
-        span.expect(:add_attributes, span, [{ 'b_key' => 'b_value' }])
+        expect(span).to receive(:add_attributes)
+          .with({ 'b_key' => 'b_value' })
+          .and_return(span)
 
         regex_processor.on_start(span, context_with_baggage)
-
-        span.verify
       end
     end
 

processor/baggage/test/test_helper.rb

@@ -9,4 +9,5 @@
 Bundler.require(:default, :development, :test)
 
 require 'minitest/autorun'
+require 'rspec/mocks/minitest_integration'
 require 'opentelemetry-processor-baggage'

resources/aws/Gemfile

@@ -11,6 +11,7 @@ gemspec
 group :test do
   gem 'minitest', '~> 5.0'
   gem 'rake', '>= 13'
+  gem 'rspec-mocks', '~> 3.13.7'
   gem 'rubocop', '~> 1.85.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'simplecov', '~> 0.22.0'

resources/aws/test/opentelemetry/resource/detector/aws/ecs_test.rb

@@ -72,34 +72,32 @@
 
       it 'detects ECS resources' do
         # Stub the fetch_container_id method directly rather than trying to stub File
-        detector.stub :fetch_container_id, '0123456789abcdef' * 4 do
-          Socket.stub :gethostname, hostname do
-            resource = detector.detect
-
-            _(resource).must_be_instance_of(OpenTelemetry::SDK::Resources::Resource)
-            attributes = resource.attribute_enumerator.to_h
-
-            # Check basic attributes
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER]).must_equal('aws')
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM]).must_equal('aws_ecs')
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_NAME]).must_equal(hostname)
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_ID]).must_equal('0123456789abcdef' * 4)
-
-            # Check ECS-specific attributes
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CONTAINER_ARN]).must_equal(container_metadata['ContainerARN'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CLUSTER_ARN]).must_equal('arn:aws:ecs:us-west-2:123456789012:cluster/my-cluster')
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_LAUNCHTYPE]).must_equal('fargate')
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_ARN]).must_equal(task_metadata['TaskARN'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_FAMILY]).must_equal(task_metadata['Family'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_REVISION]).must_equal(task_metadata['Revision'])
-
-            # Check log attributes
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_GROUP_NAMES]).must_equal(['my-log-group'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_GROUP_ARNS]).must_equal(['arn:aws:logs:us-west-2:123456789012:log-group:my-log-group'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_STREAM_NAMES]).must_equal(['my-log-stream'])
-            _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_STREAM_ARNS]).must_equal(['arn:aws:logs:us-west-2:123456789012:log-group:my-log-group:log-stream:my-log-stream'])
-          end
-        end
+        allow(detector).to receive(:fetch_container_id).and_return('0123456789abcdef' * 4)
+        allow(Socket).to receive(:gethostname).and_return(hostname)
+        resource = detector.detect
+
+        _(resource).must_be_instance_of(OpenTelemetry::SDK::Resources::Resource)
+        attributes = resource.attribute_enumerator.to_h
+
+        # Check basic attributes
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER]).must_equal('aws')
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM]).must_equal('aws_ecs')
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_NAME]).must_equal(hostname)
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_ID]).must_equal('0123456789abcdef' * 4)
+
+        # Check ECS-specific attributes
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CONTAINER_ARN]).must_equal(container_metadata['ContainerARN'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CLUSTER_ARN]).must_equal('arn:aws:ecs:us-west-2:123456789012:cluster/my-cluster')
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_LAUNCHTYPE]).must_equal('fargate')
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_ARN]).must_equal(task_metadata['TaskARN'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_FAMILY]).must_equal(task_metadata['Family'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_TASK_REVISION]).must_equal(task_metadata['Revision'])
+
+        # Check log attributes
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_GROUP_NAMES]).must_equal(['my-log-group'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_GROUP_ARNS]).must_equal(['arn:aws:logs:us-west-2:123456789012:log-group:my-log-group'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_STREAM_NAMES]).must_equal(['my-log-stream'])
+        _(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_STREAM_ARNS]).must_equal(['arn:aws:logs:us-west-2:123456789012:log-group:my-log-group:log-stream:my-log-stream'])
       end
     end