Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test with swallowed errors #4317

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix test with swallowed errors #4317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions spec/datadog/tracing/configuration/dynamic_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
let(:option) { described_class.new }
let(:configuration_object) { config_object || Datadog.configuration.tracing }
let(:new_value) { value }
let(:expected_new_value) { new_value }
let(:old_value) { configuration_object.public_send(config_key) }
let(:expected_old_value) { old_value }

before do
configuration_object.reset!
Expand All @@ -17,7 +19,7 @@
subject(:call) { option.call(new_value) }

it "changes #{config_key} to #{value}" do
expect { call }.to change { configuration_object.public_send(config_key) }.from(old_value).to(value)
expect { call }.to change { configuration_object.public_send(config_key) }.from(expected_old_value).to(expected_new_value)
end

it "declares environment variable name as #{env_var}" do
Expand All @@ -29,10 +31,11 @@
end

context 'with nil value' do
before { call }
before { configuration_object.public_send("#{config_key}=", old_value) }

it "restores original value before dynamic configuration #{config_key}" do
expect { option.call(nil) }.to change { configuration_object.public_send(config_key) }.from(value).to(old_value)
call
expect { option.call(nil) }.to change { configuration_object.public_send(config_key) }.from(expected_new_value).to(expected_old_value)
end
end
end
Expand All @@ -51,9 +54,13 @@
name: 'tracing_header_tags',
env_var: 'DD_TRACE_HEADER_TAGS',
config_key: :header_tags,
value: RSpec::Matchers::BuiltIn::Match.new(->(header_tags) { header_tags.to_s == 'my-header:my-tag' }) do
let(:old_value) { ->(header_tags) { header_tags.to_s == '' } }
value: [{ 'header' => 'my-header', 'tag_name' => 'my-tag' }] do
let(:old_value) { [] }
let(:expected_old_value) { RSpec::Matchers::BuiltIn::Match.new(->(header_tags) { header_tags.to_s == '' }) }
let(:new_value) { [{ 'header' => 'my-header', 'tag_name' => 'my-tag' }] }
let(:expected_new_value) { RSpec::Matchers::BuiltIn::Match.new(->(header_tags) {
header_tags.to_s == 'my-header:my-tag'
}) }
end

context 'with multiple values in tracing_header_tags' do
Expand Down Expand Up @@ -87,23 +94,20 @@
name: 'tracing_sampling_rules',
env_var: 'DD_TRACE_SAMPLING_RULES',
config_key: :rules,
value: RSpec::Matchers::BuiltIn::Match.new(->(rules) { rules == '[{"sample_rate":1}]' }),
value: [{ 'sample_rate' => 1 }],
config_object: Datadog.configuration.tracing.sampling do
let(:new_value) { [{ sample_rate: 1 }] }
end
let(:expected_new_value) { [{ 'sample_rate' => 1 }].to_json }
end

context 'with tags' do
include_examples 'tracing dynamic simple option',
name: 'tracing_sampling_rules',
env_var: 'DD_TRACE_SAMPLING_RULES',
config_key: :rules,
value: RSpec::Matchers::BuiltIn::Match.new(
lambda do |rules|
rules == '[{"sample_rate":1,"tags":[{"key":"k","value_glob":"v"}]}]'
end
),
value: [{ 'sample_rate' => 1, 'tags' => [{ 'key' => 'k', 'value_glob' => 'v' }] }],
config_object: Datadog.configuration.tracing.sampling do
let(:new_value) { [{ sample_rate: 1, tags: [{ key: 'k', value_glob: 'v' }] }] }
let(:new_value) { [{ 'sample_rate' => 1, 'tags' => [{ 'key' => 'k', 'value_glob' => 'v' }] }] }
let(:expected_new_value) { [{ 'sample_rate' => 1, 'tags' => { 'k' => 'v' } }].to_json }
end
end

Expand Down
Loading