diff --git a/api/test/opentelemetry/baggage_test.rb b/api/test/opentelemetry/baggage_test.rb index d61b971a1e..2a0d3e49b6 100644 --- a/api/test/opentelemetry/baggage_test.rb +++ b/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 diff --git a/api/test/opentelemetry/context/key_test.rb b/api/test/opentelemetry/context/key_test.rb index 79057f4264..234d64645e 100644 --- a/api/test/opentelemetry/context/key_test.rb +++ b/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 diff --git a/api/test/opentelemetry/context/propagation/composite_text_map_propagator_test.rb b/api/test/opentelemetry/context/propagation/composite_text_map_propagator_test.rb index 8bd2f2b5e0..d1a81729b6 100644 --- a/api/test/opentelemetry/context/propagation/composite_text_map_propagator_test.rb +++ b/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 diff --git a/api/test/opentelemetry/context_test.rb b/api/test/opentelemetry/context_test.rb index a3f017adb7..db7ae8959e 100644 --- a/api/test/opentelemetry/context_test.rb +++ b/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') } diff --git a/api/test/test_helper.rb b/api/test/test_helper.rb index 43aede5efc..afc676d044 100644 --- a/api/test/test_helper.rb +++ b/api/test/test_helper.rb @@ -15,3 +15,5 @@ require 'minitest/autorun' OpenTelemetry.logger = Logger.new(File::NULL) + +Context = OpenTelemetry::Context diff --git a/common/opentelemetry-common.gemspec b/common/opentelemetry-common.gemspec index 3b486c3732..f9ff9e4820 100644 --- a/common/opentelemetry-common.gemspec +++ b/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' diff --git a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec b/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec index da52dfe655..9c739c255f 100644 --- a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec +++ b/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' diff --git a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec b/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec index 622982c483..0d07a6edd1 100644 --- a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec +++ b/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' diff --git a/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec b/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec index 360447811b..53ffccc512 100644 --- a/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec +++ b/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' diff --git a/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec b/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec index 8ac366f6a9..b56c21f4f0 100644 --- a/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec +++ b/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' diff --git a/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec b/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec index eecf31a6ec..fd7948f9a0 100644 --- a/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec +++ b/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' diff --git a/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec b/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec index f6fddd08cd..112ee258d2 100644 --- a/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec +++ b/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' diff --git a/exporter/otlp/opentelemetry-exporter-otlp.gemspec b/exporter/otlp/opentelemetry-exporter-otlp.gemspec index a5e4cf2835..fc995f71ff 100644 --- a/exporter/otlp/opentelemetry-exporter-otlp.gemspec +++ b/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' diff --git a/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec b/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec index 4e957dea7c..e02459c007 100644 --- a/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec +++ b/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' diff --git a/logs_api/opentelemetry-logs-api.gemspec b/logs_api/opentelemetry-logs-api.gemspec index fe78dc752e..fd158b0f5f 100644 --- a/logs_api/opentelemetry-logs-api.gemspec +++ b/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' diff --git a/logs_sdk/opentelemetry-logs-sdk.gemspec b/logs_sdk/opentelemetry-logs-sdk.gemspec index e25ed7b5ac..7f4ba6478f 100644 --- a/logs_sdk/opentelemetry-logs-sdk.gemspec +++ b/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' diff --git a/metrics_api/opentelemetry-metrics-api.gemspec b/metrics_api/opentelemetry-metrics-api.gemspec index 18d94db397..f7106a011f 100644 --- a/metrics_api/opentelemetry-metrics-api.gemspec +++ b/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' diff --git a/metrics_sdk/opentelemetry-metrics-sdk.gemspec b/metrics_sdk/opentelemetry-metrics-sdk.gemspec index 98bacf38a0..3223e3e606 100644 --- a/metrics_sdk/opentelemetry-metrics-sdk.gemspec +++ b/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' diff --git a/metrics_sdk/test/opentelemetry/sdk/metrics/fork_hooks_test.rb b/metrics_sdk/test/opentelemetry/sdk/metrics/fork_hooks_test.rb index b99c9b5dd0..ffd5423c73 100644 --- a/metrics_sdk/test/opentelemetry/sdk/metrics/fork_hooks_test.rb +++ b/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) diff --git a/propagator/b3/opentelemetry-propagator-b3.gemspec b/propagator/b3/opentelemetry-propagator-b3.gemspec index beec21764b..5a32c2aba3 100644 --- a/propagator/b3/opentelemetry-propagator-b3.gemspec +++ b/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' diff --git a/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec b/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec index 7266a13453..752e96f186 100644 --- a/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec +++ b/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' diff --git a/registry/opentelemetry-registry.gemspec b/registry/opentelemetry-registry.gemspec index bce6d34b73..60a4a7ce76 100644 --- a/registry/opentelemetry-registry.gemspec +++ b/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' diff --git a/sdk/opentelemetry-sdk.gemspec b/sdk/opentelemetry-sdk.gemspec index fd1b342ac4..ca30f866db 100644 --- a/sdk/opentelemetry-sdk.gemspec +++ b/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' diff --git a/sdk/test/opentelemetry/sdk/trace/span_test.rb b/sdk/test/opentelemetry/sdk/trace/span_test.rb index 2af560b96c..396d9e3ee4 100644 --- a/sdk/test/opentelemetry/sdk/trace/span_test.rb +++ b/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, diff --git a/sdk/test/opentelemetry/sdk/trace/tracer_test.rb b/sdk/test/opentelemetry/sdk/trace/tracer_test.rb index cbd11bc1f5..7bba2783a3 100644 --- a/sdk/test/opentelemetry/sdk/trace/tracer_test.rb +++ b/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 diff --git a/sdk/test/opentelemetry/sdk_test.rb b/sdk/test/opentelemetry/sdk_test.rb index a7f65eb9a6..110d88e8e8 100644 --- a/sdk/test/opentelemetry/sdk_test.rb +++ b/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 diff --git a/sdk/test/test_helper.rb b/sdk/test/test_helper.rb index 40dbe15186..ff7bcbd6f2 100644 --- a/sdk/test/test_helper.rb +++ b/sdk/test/test_helper.rb @@ -17,3 +17,5 @@ require 'pry' OpenTelemetry.logger = Logger.new(File::NULL) + +SpanLimits = OpenTelemetry::SDK::Trace::SpanLimits diff --git a/sdk_experimental/opentelemetry-sdk-experimental.gemspec b/sdk_experimental/opentelemetry-sdk-experimental.gemspec index b718f4b0bc..318a45a2eb 100644 --- a/sdk_experimental/opentelemetry-sdk-experimental.gemspec +++ b/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' diff --git a/semantic_conventions/opentelemetry-semantic_conventions.gemspec b/semantic_conventions/opentelemetry-semantic_conventions.gemspec index e4f9b51c2b..40181b96ef 100644 --- a/semantic_conventions/opentelemetry-semantic_conventions.gemspec +++ b/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'