Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helpers/mysql/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gemspec

group :test do
gem 'minitest', '~> 5.0'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
gem 'rubocop', '~> 1.86.0'
Expand Down
9 changes: 5 additions & 4 deletions helpers/mysql/test/helpers/mysql_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,12 @@
sql = (+'SELECT 1').force_encoding('ASCII-8BIT')
result = nil
OpenTelemetry::TestHelpers.with_test_logger do |log_stream|
allow(OpenTelemetry::Common::Utilities).to receive(:utf8_encode) { |_| raise 'boom!' }
result = OpenTelemetry::Helpers::MySQL.extract_statement_type(sql)
OpenTelemetry::Common::Utilities.stub(:utf8_encode, ->(_) { raise 'boom!' }) do
result = OpenTelemetry::Helpers::MySQL.extract_statement_type(sql)

assert_nil(result)
assert_match(/Error extracting/, log_stream.string)
assert_nil(result)
assert_match(/Error extracting/, log_stream.string)
end
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion helpers/mysql/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
require 'opentelemetry'
require 'opentelemetry-helpers-mysql'
require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'

OpenTelemetry.logger = Logger.new($stderr, level: ENV.fetch('OTEL_LOG_LEVEL', 'fatal').to_sym)
2 changes: 1 addition & 1 deletion instrumentation/active_job/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gemspec
group :test do
gem 'appraisal', '~> 2.5'
gem 'minitest', '~> 5.0'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-sdk', '~> 1.1'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@

describe '#compatible' do
it 'returns false for unsupported gem versions' do
allow(ActiveJob).to receive(:version).and_return(Gem::Version.new('4.2.0'))
_(instrumentation.compatible?).must_equal false
ActiveJob.stub(:version, Gem::Version.new('4.2.0')) do
_(instrumentation.compatible?).must_equal false
end
end

it 'returns true for supported gem versions' do
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_job/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
require 'active_job'
require 'opentelemetry-instrumentation-active_job'
require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'

class TestJob < ActiveJob::Base
def perform; end
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_model_serializers/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :test do
gem 'simplecov', '~> 0.22.0'
gem 'webmock', '~> 3.24'
gem 'yard', '~> 0.9'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
if RUBY_VERSION >= '3.4'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
require 'opentelemetry-instrumentation-active_model_serializers'

require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'
require 'webmock/minitest'

# disable logging
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_record/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gemspec
group :test do
gem 'appraisal', '~> 2.5'
gem 'minitest', '~> 5.0'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-sdk', '~> 1.1'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@

describe 'compatible' do
it 'when a version below the minimum supported gem version is installed' do
allow(ActiveRecord).to receive(:version).and_return(Gem::Version.new('4.2.0'))
_(instrumentation.compatible?).must_equal false
ActiveRecord.stub(:version, Gem::Version.new('4.2.0')) do
_(instrumentation.compatible?).must_equal false
end
end

it 'when supported gem version installed' do
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_record/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
require 'opentelemetry-instrumentation-active_record'

require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'
require 'webmock/minitest'

# Global opentelemetry-sdk setup:
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_storage/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gemspec
group :test do
gem 'appraisal', '~> 2.5'
gem 'minitest', '~> 5.0'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-sdk', '~> 1.1'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,9 @@ def with_subscription(&)
end

def create_blob(key:, filename:, content_type:)
allow(ActiveStorage::Blob).to receive(:generate_unique_secure_token).and_return(key)
io = StringIO.new(File.read("#{Dir.pwd}/test/fixtures/#{filename}"))
blob = ActiveStorage::Blob.create_and_upload!(io: io, filename: filename, content_type: content_type)
allow(ActiveStorage::Blob).to receive(:generate_unique_secure_token).and_call_original
blob
ActiveStorage::Blob.stub(:generate_unique_secure_token, key) do
ActiveStorage::Blob.create_and_upload!(io: io, filename: filename, content_type: content_type)
end
end
end
2 changes: 1 addition & 1 deletion instrumentation/active_storage/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

require 'active_storage'
require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'
require 'test_helpers/app_config'

# global opentelemetry-sdk setup:
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_support/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group :test do
gem 'webmock', '~> 3.24'
gem 'yard', '~> 0.9'
gem 'opentelemetry-sdk', '~> 1.1'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@

describe 'when using a unstable formatter' do
it 'defaults to the notification name' do
allow(OpenTelemetry).to receive(:handle_error).with(exception: RuntimeError, message: String)

OpenTelemetry::Instrumentation::ActiveSupport.subscribe(tracer, notification_name, nil, nil, span_name_formatter: ->(_) { raise 'boom' })
ActiveSupport::Notifications.instrument(notification_name, extra: 'context')

_(last_span).wont_be_nil
_(last_span.name).must_equal(notification_name)
_(last_span.attributes['extra']).must_equal('context')
OpenTelemetry.stub(:handle_error, ->(**_kwargs) { nil }) do

Check failure on line 267 in instrumentation/active_support/test/opentelemetry/instrumentation/active_support/span_subscriber_test.rb

View workflow job for this annotation

GitHub Actions / RuboCop Check

Style/NilLambda: Use an empty lambda instead of always returning nil.
OpenTelemetry::Instrumentation::ActiveSupport.subscribe(tracer, notification_name, nil, nil, span_name_formatter: ->(_) { raise 'boom' })
ActiveSupport::Notifications.instrument(notification_name, extra: 'context')

_(last_span).wont_be_nil
_(last_span.name).must_equal(notification_name)
_(last_span.attributes['extra']).must_equal('context')
end
end
end
end
Expand Down Expand Up @@ -383,14 +383,14 @@

describe 'when using a unstable formatter' do
it 'defaults to the notification name' do
allow(OpenTelemetry).to receive(:handle_error).with(exception: RuntimeError, message: String)

OpenTelemetry::Instrumentation::ActiveSupport.subscribe(tracer, notification_pattern, nil, nil, span_name_formatter: ->(_) { raise 'boom' })
ActiveSupport::Notifications.instrument(notification_name, extra: 'context')

_(last_span).wont_be_nil
_(last_span.name).must_equal(notification_name)
_(last_span.attributes['extra']).must_equal('context')
OpenTelemetry.stub(:handle_error, ->(**_kwargs) { nil }) do

Check failure on line 386 in instrumentation/active_support/test/opentelemetry/instrumentation/active_support/span_subscriber_test.rb

View workflow job for this annotation

GitHub Actions / RuboCop Check

Style/NilLambda: Use an empty lambda instead of always returning nil.
OpenTelemetry::Instrumentation::ActiveSupport.subscribe(tracer, notification_pattern, nil, nil, span_name_formatter: ->(_) { raise 'boom' })
ActiveSupport::Notifications.instrument(notification_name, extra: 'context')

_(last_span).wont_be_nil
_(last_span.name).must_equal(notification_name)
_(last_span.attributes['extra']).must_equal('context')
end
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/active_support/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
require 'opentelemetry-instrumentation-active_support'

require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'minitest/mock'
require 'webmock/minitest'

# global opentelemetry-sdk setup:
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/anthropic/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ group :test do
gem 'simplecov', '~> 0.22.0'
gem 'webmock', '~> 3.24'
gem 'yard', '~> 0.9'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-instrumentation-base', path: '../base'

if RUBY_VERSION >= '3.4'
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/aws_lambda/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :test do
gem 'simplecov', '~> 0.22.0'
gem 'webmock', '~> 3.24'
gem 'yard', '~> 0.9'
gem 'rspec-mocks', '~> 3.13.7'
gem 'minitest-mock', '~> 5.0'
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'webrick', '~> 1.7'
if RUBY_VERSION >= '3.4'
Expand Down
Loading
Loading