From ac004dc6de269d57c823d9d3263a9d0f66948c25 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Mon, 12 Aug 2024 09:35:12 -0700 Subject: [PATCH] Fix test after applying comments --- .../tracing/contrib/propagation/sql_comment_spec.rb | 6 +++--- .../contrib/sql_comment_propagation_examples.rb | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/datadog/tracing/contrib/propagation/sql_comment_spec.rb b/spec/datadog/tracing/contrib/propagation/sql_comment_spec.rb index 679fc206bc1..9217b684fa2 100644 --- a/spec/datadog/tracing/contrib/propagation/sql_comment_spec.rb +++ b/spec/datadog/tracing/contrib/propagation/sql_comment_spec.rb @@ -3,7 +3,7 @@ RSpec.describe Datadog::Tracing::Contrib::Propagation::SqlComment do let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new(mode, append) } - let(:append_comment) { false } + let(:append) { false } describe '.annotate!' do let(:span_op) { Datadog::Tracing::SpanOperation.new('sql_comment_propagation_span', service: 'db_service') } @@ -47,7 +47,7 @@ end let(:sql_statement) { 'SELECT 1' } - let(:append_comment) { false } + let(:append) { false } context 'when tracing is enabled' do before do @@ -156,7 +156,7 @@ end context 'when append is true' do - let(:append_comment) { true } + let(:append) { true } it 'appends the comment after the sql statement' do is_expected.to eq("#{sql_statement} /*dde='dev',ddps='api',ddpv='1.2',dddbs='db_service'*/") diff --git a/spec/datadog/tracing/contrib/sql_comment_propagation_examples.rb b/spec/datadog/tracing/contrib/sql_comment_propagation_examples.rb index 60dcf426349..0c401a74648 100644 --- a/spec/datadog/tracing/contrib/sql_comment_propagation_examples.rb +++ b/spec/datadog/tracing/contrib/sql_comment_propagation_examples.rb @@ -1,7 +1,7 @@ RSpec.shared_examples_for 'with sql comment propagation' do |span_op_name:, error: nil| context 'when default `disabled`' do it_behaves_like 'propagates with sql comment', mode: 'disabled', span_op_name: span_op_name, error: error do - let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new('disabled', append) } + let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new('disabled', append_comment) } end end @@ -14,7 +14,7 @@ end it_behaves_like 'propagates with sql comment', mode: 'service', span_op_name: span_op_name, error: error do - let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new('service', append) } + let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new('service', append_comment) } end end @@ -25,7 +25,7 @@ end it_behaves_like 'propagates with sql comment', mode: mode, span_op_name: span_op_name, error: error do - let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new(mode, append) } + let(:propagation_mode) { Datadog::Tracing::Contrib::Propagation::SqlComment::Mode.new(mode, append_comment) } end end end @@ -36,7 +36,7 @@ it "propagates with mode: #{mode}" do expect(Datadog::Tracing::Contrib::Propagation::SqlComment::Mode) - .to receive(:new).with(mode, append).and_return(propagation_mode) + .to receive(:new).with(mode, append_comment).and_return(propagation_mode) if error expect { subject }.to raise_error(error) @@ -76,7 +76,7 @@ context 'in append mode' do let(:append_comment) { true } - let(:configuration_options) { super().merge(append: append) } + let(:configuration_options) { super().merge(append_comment: append_comment) } it 'appends sql comment to the sql statement' do allow(Datadog::Tracing::Contrib::Propagation::SqlComment).to receive(:prepend_comment).and_call_original