test: remove ostruct dependency by updating rake to 13 for ruby 4

api/lib/opentelemetry/baggage/propagation/text_map_propagator.rb

@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require 'cgi'
+require 'cgi/escape'
 
 module OpenTelemetry
   module Baggage

api/test/opentelemetry/baggage_test.rb

@@ -7,7 +7,6 @@
 require 'test_helper'
 
 describe OpenTelemetry::Baggage do
-  Context = OpenTelemetry::Context
   let(:manager) { OpenTelemetry::Baggage }
 
   after do

api/test/opentelemetry/context/key_test.rb

@@ -7,8 +7,6 @@
 require 'test_helper'
 
 describe OpenTelemetry::Context::Key do
-  Context = OpenTelemetry::Context
-
   after do
     Context.clear
   end

api/test/opentelemetry/context/propagation/composite_text_map_propagator_test.rb

@@ -7,8 +7,6 @@
 require 'test_helper'
 
 describe OpenTelemetry::Context::Propagation::CompositeTextMapPropagator do
-  Context = OpenTelemetry::Context
-
   class TestInjector
     def initialize(key)
       @key = key
@@ -74,11 +72,10 @@ def extract(carrier, context:, getter: nil)
 
       it 'accepts explicit context' do
         Context.with_values('k1' => 'v1', 'k2' => 'v2') do
-          ctx = Context.current.set_value('k3', 'v3') do
-            carrier = {}
-            propagator.inject(carrier, context: ctx)
-            _(carrier).must_equal('k1' => 'v1', 'k2' => 'v2', 'k3' => 'v3')
-          end
+          ctx = Context.current.set_value('k3', 'v3')
+          carrier = {}
+          propagator.inject(carrier, context: ctx)
+          _(carrier).must_equal('k1' => 'v1', 'k2' => 'v2', 'k3' => 'v3')
         end
       end
 

api/test/opentelemetry/context_test.rb

@@ -9,8 +9,6 @@
 require 'stringio'
 
 describe OpenTelemetry::Context do
-  Context = OpenTelemetry::Context
-
   after { Context.clear }
 
   let(:foo_key) { Context.create_key('foo') }

api/test/test_helper.rb

@@ -15,3 +15,5 @@
 require 'minitest/autorun'
 
 OpenTelemetry.logger = Logger.new(File::NULL)
+
+Context = OpenTelemetry::Context

common/opentelemetry-common.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'

exporter/jaeger/opentelemetry-exporter-jaeger.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'

exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'webmock', '~> 3.24'

exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'webmock', '~> 3.24'

exporter/otlp-http/lib/opentelemetry/exporter/otlp/http/trace_exporter.rb

@@ -9,6 +9,7 @@
 require 'opentelemetry/sdk'
 require 'net/http'
 require 'zlib'
+require 'cgi/escape'
 
 require 'google/rpc/status_pb'
 

exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'webmock', '~> 3.24'

exporter/otlp-logs/lib/opentelemetry/exporter/otlp/logs/logs_exporter.rb

@@ -10,6 +10,7 @@
 require 'opentelemetry/sdk/logs'
 require 'net/http'
 require 'zlib'
+require 'cgi/escape'
 
 require 'google/rpc/status_pb'
 

exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.3'
   spec.add_development_dependency 'rubocop-minitest', '~> 0.38.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.25'

exporter/otlp-metrics/lib/opentelemetry/exporter/otlp/metrics/util.rb

@@ -4,6 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'cgi/escape'
+
 module OpenTelemetry
   module Exporter
     module OTLP

exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'rubocop-minitest', '~> 0.38.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.25'

exporter/otlp/lib/opentelemetry/exporter/otlp/exporter.rb

@@ -8,6 +8,7 @@
 require 'opentelemetry/sdk'
 require 'net/http'
 require 'zlib'
+require 'cgi/escape'
 
 require 'google/rpc/status_pb'
 

exporter/otlp/opentelemetry-exporter-otlp.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'rubocop-minitest', '~> 0.38.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.25'

exporter/zipkin/opentelemetry-exporter-zipkin.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'webmock', '~> 3.24'

logs_api/opentelemetry-logs-api.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '>= 1.17'
+  spec.add_development_dependency 'logger', '~> 1.7'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'

logs_sdk/opentelemetry-logs-sdk.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   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 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.22'
   spec.add_development_dependency 'yard', '~> 0.9'

metrics_api/opentelemetry-metrics-api.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'

metrics_sdk/opentelemetry-metrics-sdk.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'

metrics_sdk/test/opentelemetry/sdk/metrics/fork_hooks_test.rb

@@ -76,7 +76,7 @@ def after_fork
       end
     end.new
 
-    reader2 = OpenStruct.new
+    reader2 = Struct.new(:dummy).new
 
     meter_provider = OpenTelemetry::SDK::Metrics::MeterProvider.new
     meter_provider.add_metric_reader(reader1)

propagator/b3/opentelemetry-propagator-b3.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.1'
 
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'yard', '~> 0.9'

propagator/jaeger/lib/opentelemetry/propagator/jaeger/text_map_propagator.rb

@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require 'cgi'
+require 'cgi/escape'
 
 # OpenTelemetry is an open source observability framework, providing a
 # general-purpose API, SDK, and related tools required for the instrumentation

propagator/jaeger/opentelemetry-propagator-jaeger.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.2'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'yard', '~> 0.9'

registry/opentelemetry-registry.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'appraisal', '~> 2.2.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'

sdk/opentelemetry-sdk.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-instrumentation-base', '~> 0.20'
   spec.add_development_dependency 'opentelemetry-test-helpers'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'

sdk/test/opentelemetry/sdk/trace/span_test.rb

@@ -11,7 +11,6 @@
   SpanKind = OpenTelemetry::Trace::SpanKind
   Status = OpenTelemetry::Trace::Status
   Context = OpenTelemetry::Context
-  SpanLimits = OpenTelemetry::SDK::Trace::SpanLimits
 
   let(:context) { OpenTelemetry::Trace::SpanContext.new }
   let(:mock_span_processor) { Minitest::Mock.new }
@@ -507,7 +506,7 @@
 
   describe '#instrumentation_library' do
     it 'is identical to the instrumentation_scope' do
-      mock_span_processor.expect(:on_start, nil) { |s| yielded_span = s } # rubocop:disable Lint/UselessAssignment
+      mock_span_processor.expect(:on_start, nil) { |_s| pass }
       span = Span.new(
         context,
         Context.empty,

sdk/test/opentelemetry/sdk/trace/tracer_test.rb

@@ -8,7 +8,6 @@
 
 describe OpenTelemetry::SDK::Trace::Tracer do
   Tracer = OpenTelemetry::SDK::Trace::Tracer
-  SpanLimits = OpenTelemetry::SDK::Trace::SpanLimits
 
   let(:tracer_provider) { OpenTelemetry::SDK::Trace::TracerProvider.new }
   let(:tracer) do

sdk/test/opentelemetry/sdk_test.rb

@@ -33,7 +33,7 @@
       config = OpenTelemetry::TestHelpers.with_env('OTEL_SDK_DISABLED' => 'true') do
         OpenTelemetry::SDK.configure
       end
-      _(config).must_equal nil
+      assert_nil(config)
     end
   end
 end

sdk/test/test_helper.rb

@@ -17,3 +17,5 @@
 require 'pry'
 
 OpenTelemetry.logger = Logger.new(File::NULL)
+
+SpanLimits = OpenTelemetry::SDK::Trace::SpanLimits

sdk_experimental/opentelemetry-sdk-experimental.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'

semantic_conventions/opentelemetry-semantic_conventions.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'kramdown', '~> 2.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.3'
   spec.add_development_dependency 'rubocop', '~> 1.65'
   spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'yard', '~> 0.9'