ci: Add Tests for Ruby 3.4 (#1803)

arielvalentin · kaylareopelle · web-flow · commit ffc7349478ed · 2025-02-07T11:17:30.000-08:00
* feat: Suppport 3.1 Min Version

* ci: Add test for Ruby 3.4

* squash: relax minitest deps

* squash: update some tests

* squash: fix more mocks

* squash: fix tests

* squash: linter

* squash: Thrift needs base64

* squash: webmock base64

* squash: make linter happy

* squash: Fix sensitive test

* squash: remove overspecified method

* squash: address linter

* squash: use the right regexp

---------

Co-authored-by: Kayla Reopelle &lt;87386821+kaylareopelle@users.noreply.github.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,6 +38,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -97,6 +102,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -165,6 +175,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
diff --git a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec b/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 3.1'
 
+  spec.add_dependency 'base64', '>= 0.2.0'
   spec.add_dependency 'opentelemetry-api', '~> 1.1'
   spec.add_dependency 'opentelemetry-common', '~> 0.20'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.2'
@@ -40,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec b/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec b/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec b/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec b/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.3'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec b/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/otlp/opentelemetry-exporter-otlp.gemspec b/exporter/otlp/opentelemetry-exporter-otlp.gemspec
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec b/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.24'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 
diff --git a/logs_api/opentelemetry-logs-api.gemspec b/logs_api/opentelemetry-logs-api.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '>= 1.17'
-  spec.add_development_dependency 'minitest', '~> 5.19'
+  spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.22'
diff --git a/logs_sdk/opentelemetry-logs-sdk.gemspec b/logs_sdk/opentelemetry-logs-sdk.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-sdk', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '>= 1.17'
-  spec.add_development_dependency 'minitest', '~> 5.19'
+  spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.4'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.65'
diff --git a/logs_sdk/test/opentelemetry/sdk/logs/log_record_test.rb b/logs_sdk/test/opentelemetry/sdk/logs/log_record_test.rb
@@ -113,7 +113,7 @@
         logger.on_emit(attributes: { 'a' => 'a', 'b' => 'b' })
 
         # Look at the captured output to see if the attributes have been truncated
-        assert_match(/attributes={"b"=>"b"}/, captured_stdout.string)
+        assert_match(/attributes={"b".?=>.?"b"}/, captured_stdout.string)
         refute_match(/"a"=>"a"/, captured_stdout.string)
 
         # Return STDOUT to its normal output
diff --git a/metrics_sdk/test/opentelemetry/metrics_sdk_test.rb b/metrics_sdk/test/opentelemetry/metrics_sdk_test.rb
@@ -45,7 +45,7 @@
       OpenTelemetry::SDK.configure(&:do_something)
 
       _(received_exception).must_be_instance_of OpenTelemetry::SDK::ConfigurationError
-      _(received_message).must_match(/unexpected configuration error due to undefined method `do_something/)
+      _(received_message).must_match(/undefined method/)
     end
   end
 end
diff --git a/sdk/opentelemetry-sdk.gemspec b/sdk/opentelemetry-sdk.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'faraday', '~> 0.13'
-  spec.add_development_dependency 'minitest', '~> 5.15.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-exporter-zipkin', '~> 0.19.0'
   spec.add_development_dependency 'opentelemetry-instrumentation-base', '~> 0.20'
   spec.add_development_dependency 'opentelemetry-test-helpers'
diff --git a/sdk/test/opentelemetry/sdk/trace/export/batch_span_processor_test.rb b/sdk/test/opentelemetry/sdk/trace/export/batch_span_processor_test.rb
@@ -149,7 +149,7 @@ def to_span_data
     end
 
     it 'spawns a thread on boot by default' do
-      mock = MiniTest::Mock.new
+      mock = Minitest::Mock.new
       mock.expect(:call, nil)
 
       Thread.stub(:new, mock) do
@@ -160,7 +160,7 @@ def to_span_data
     end
 
     it 'spawns a thread on boot if OTEL_RUBY_BSP_START_THREAD_ON_BOOT is true' do
-      mock = MiniTest::Mock.new
+      mock = Minitest::Mock.new
       mock.expect(:call, nil)
 
       Thread.stub(:new, mock) do
@@ -173,7 +173,7 @@ def to_span_data
     end
 
     it 'does not spawn a thread on boot if OTEL_RUBY_BSP_START_THREAD_ON_BOOT is false' do
-      mock = MiniTest::Mock.new
+      mock = Minitest::Mock.new
       mock.expect(:call, nil) { assert false }
 
       Thread.stub(:new, mock) do
@@ -184,7 +184,7 @@ def to_span_data
     end
 
     it 'prefers explicit start_thread_on_boot parameter rather than the environment' do
-      mock = MiniTest::Mock.new
+      mock = Minitest::Mock.new
       mock.expect(:call, nil) { assert false }
 
       Thread.stub(:new, mock) do
diff --git a/sdk/test/opentelemetry/sdk/trace/export/simple_span_processor_test.rb b/sdk/test/opentelemetry/sdk/trace/export/simple_span_processor_test.rb
@@ -45,7 +45,7 @@ def mock.force_flush(timeout: nil); end
 
   it 'forwards calls to #force_flush to the exporter' do
     mock_span_exporter.instance_eval { undef :force_flush }
-    mock_span_exporter.expect :force_flush, nil, [{ timeout: nil }]
+    mock_span_exporter.expect :force_flush, nil, [], timeout: nil
 
     processor.force_flush
     mock_span_exporter.verify
@@ -108,7 +108,7 @@ def raising_exporter.export(_)
 
   it 'forwards calls to #shutdown to the exporter' do
     mock_span_exporter.instance_eval { undef :shutdown }
-    mock_span_exporter.expect :shutdown, nil, [{ timeout: nil }]
+    mock_span_exporter.expect :shutdown, nil, [], timeout: nil
 
     processor.shutdown
     mock_span_exporter.verify
diff --git a/sdk/test/opentelemetry/sdk/trace/samplers_test.rb b/sdk/test/opentelemetry/sdk/trace/samplers_test.rb
@@ -60,7 +60,7 @@
 
     it 'delegates sampling of remote sampled spans' do
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: trace_id, parent_context: remote_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: trace_id, parent_context: remote_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil)
       sampler = Samplers.parent_based(
         root: not_a_sampler,
         remote_parent_sampled: mock_sampler,
@@ -76,7 +76,7 @@
 
     it 'delegates sampling of remote not sampled spans' do
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: trace_id, parent_context: remote_not_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: trace_id, parent_context: remote_not_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil)
       sampler = Samplers.parent_based(
         root: not_a_sampler,
         remote_parent_sampled: not_a_sampler,
@@ -92,7 +92,7 @@
 
     it 'delegates sampling of local sampled spans' do
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: trace_id, parent_context: local_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: trace_id, parent_context: local_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil)
       sampler = Samplers.parent_based(
         root: not_a_sampler,
         remote_parent_sampled: not_a_sampler,
@@ -108,7 +108,7 @@
 
     it 'delegates sampling of local not sampled spans' do
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: trace_id, parent_context: local_not_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: trace_id, parent_context: local_not_sampled_parent_context, links: nil, name: nil, kind: nil, attributes: nil)
       sampler = Samplers.parent_based(
         root: not_a_sampler,
         remote_parent_sampled: not_a_sampler,
@@ -124,7 +124,7 @@
 
     it 'delegates sampling of root spans' do
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: trace_id, parent_context: nil, links: nil, name: nil, kind: nil, attributes: nil }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: trace_id, parent_context: nil, links: nil, name: nil, kind: nil, attributes: nil)
       sampler = Samplers.parent_based(
         root: mock_sampler,
         remote_parent_sampled: not_a_sampler,
diff --git a/sdk/test/opentelemetry/sdk/trace/tracer_provider_test.rb b/sdk/test/opentelemetry/sdk/trace/tracer_provider_test.rb
@@ -49,7 +49,7 @@
     let(:mock_span_processor2) { Minitest::Mock.new }
 
     it 'notifies the span processor' do
-      mock_span_processor.expect(:shutdown, nil, [{ timeout: nil }])
+      mock_span_processor.expect(:shutdown, nil, [], timeout: nil)
       tracer_provider.add_span_processor(mock_span_processor)
       tracer_provider.shutdown
       mock_span_processor.verify
@@ -66,16 +66,16 @@
     end
 
     it 'only notifies the span processor once' do
-      mock_span_processor.expect(:shutdown, nil, [{ timeout: nil }])
+      mock_span_processor.expect(:shutdown, nil, [], timeout: nil)
       tracer_provider.add_span_processor(mock_span_processor)
       tracer_provider.shutdown
       tracer_provider.shutdown
       mock_span_processor.verify
     end
 
     it 'supports multiple span processors' do
-      mock_span_processor.expect(:shutdown, nil, [{ timeout: nil }])
-      mock_span_processor2.expect(:shutdown, nil, [{ timeout: nil }])
+      mock_span_processor.expect(:shutdown, nil, [], timeout: nil)
+      mock_span_processor2.expect(:shutdown, nil, [], timeout: nil)
       tracer_provider.add_span_processor(mock_span_processor)
       tracer_provider.add_span_processor(mock_span_processor2)
       tracer_provider.shutdown
@@ -98,15 +98,15 @@
     let(:mock_span_processor2) { Minitest::Mock.new }
 
     it 'notifies the span processor' do
-      mock_span_processor.expect(:force_flush, nil, [{ timeout: nil }])
+      mock_span_processor.expect(:force_flush, nil, [], timeout: nil)
       tracer_provider.add_span_processor(mock_span_processor)
       tracer_provider.force_flush
       mock_span_processor.verify
     end
 
     it 'supports multiple span processors' do
-      mock_span_processor.expect(:force_flush, nil, [{ timeout: nil }])
-      mock_span_processor2.expect(:force_flush, nil, [{ timeout: nil }])
+      mock_span_processor.expect(:force_flush, nil, [], timeout: nil)
+      mock_span_processor2.expect(:force_flush, nil, [], timeout: nil)
       tracer_provider.add_span_processor(mock_span_processor)
       tracer_provider.add_span_processor(mock_span_processor2)
       tracer_provider.force_flush
@@ -134,7 +134,7 @@
     end
 
     it 'adds multiple span processors to the active span processors' do
-      mock_processors = Array.new(2) { MiniTest::Mock.new }
+      mock_processors = Array.new(2) { Minitest::Mock.new }
       mock_processors.each do |p|
         p.expect(:on_start, nil, [Span, Context])
         p.expect(:on_finish, nil, [Span])
diff --git a/sdk/test/opentelemetry/sdk/trace/tracer_test.rb b/sdk/test/opentelemetry/sdk/trace/tracer_test.rb
@@ -36,7 +36,7 @@
     it 'creates a span with IDs generated by the configured id_generator' do
       span_id = 'I am sID'
       trace_id = 'I am a trace ID '
-      mock_id_generator = MiniTest::Mock.new
+      mock_id_generator = Minitest::Mock.new
       mock_id_generator.expect(:generate_span_id, span_id)
       mock_id_generator.expect(:generate_trace_id, trace_id)
       tracer_provider.id_generator = mock_id_generator
@@ -116,7 +116,7 @@
       sampler_attributes = { '1' => 1 }
       mock_sampler = Minitest::Mock.new
       result = Result.new(decision: Decision::RECORD_ONLY, attributes: sampler_attributes, tracestate: nil)
-      mock_sampler.expect(:should_sample?, result, [Hash])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: String, parent_context: OpenTelemetry::Context, links: nil, name: String, kind: Symbol, attributes: Hash)
       tracer_provider.sampler = mock_sampler
       span = tracer.start_root_span('op', attributes: { '1' => 0, '2' => 2 })
       _(span.attributes).must_equal('1' => 1, '2' => 2)
@@ -220,7 +220,7 @@
       attributes = Minitest::Mock.new
       result = Result.new(decision: Decision::DROP, tracestate: nil)
       mock_sampler = Minitest::Mock.new
-      mock_sampler.expect(:should_sample?, result, [{ trace_id: span_context.trace_id, parent_context: context, links: links, name: name, kind: kind, attributes: attributes }])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: span_context.trace_id, parent_context: context, links: links, name: name, kind: kind, attributes: attributes)
       tracer_provider.sampler = mock_sampler
       tracer.start_span(name, with_parent: context, attributes: attributes, links: links, kind: kind)
       mock_sampler.verify
@@ -236,7 +236,7 @@
 
     it 'creates a span with IDs generated by the configured id_generator' do
       span_id = 'I am sID'
-      mock_id_generator = MiniTest::Mock.new
+      mock_id_generator = Minitest::Mock.new
       mock_id_generator.expect(:generate_span_id, span_id)
       tracer_provider.id_generator = mock_id_generator
       span = tracer.start_span('span', with_parent: context)
@@ -270,7 +270,7 @@
       sampler_attributes = { '1' => 1 }
       mock_sampler = Minitest::Mock.new
       result = Result.new(decision: Decision::RECORD_ONLY, attributes: sampler_attributes, tracestate: nil)
-      mock_sampler.expect(:should_sample?, result, [Hash])
+      mock_sampler.expect(:should_sample?, result, [], trace_id: String, parent_context: OpenTelemetry::Context, links: nil, name: String, kind: Symbol, attributes: Hash)
       tracer_provider.sampler = mock_sampler
       span = tracer.start_span('op', with_parent: context, attributes: { '1' => 0, '2' => 2 })
       _(span.attributes).must_equal('1' => 1, '2' => 2)
