From d21e137c55c7d559a6e82ab3edde976177c4ff65 Mon Sep 17 00:00:00 2001 From: Bartek Borkowski Date: Mon, 21 Sep 2020 13:24:44 +0200 Subject: [PATCH 1/2] Remove explicit `Logger` class verification --- lib/ddtrace/configuration/settings.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ddtrace/configuration/settings.rb b/lib/ddtrace/configuration/settings.rb index 5d0eaf9c22e..b65c597512f 100644 --- a/lib/ddtrace/configuration/settings.rb +++ b/lib/ddtrace/configuration/settings.rb @@ -91,7 +91,6 @@ class Settings settings :logger do option :instance do |o| - o.setter { |value, old_value| value.is_a?(::Logger) ? value : old_value } o.on_set { |value| set_option(:level, value.level) unless value.nil? } end From 3f0542bfb9f4ab6f8108966b63f6b26e40339399 Mon Sep 17 00:00:00 2001 From: Bartek Borkowski Date: Tue, 22 Sep 2020 11:38:34 +0200 Subject: [PATCH 2/2] Adjust spec to allow usage of any conforming logger --- spec/ddtrace/configuration/settings_spec.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/ddtrace/configuration/settings_spec.rb b/spec/ddtrace/configuration/settings_spec.rb index f306c9a7f01..5d1d34dfe61 100644 --- a/spec/ddtrace/configuration/settings_spec.rb +++ b/spec/ddtrace/configuration/settings_spec.rb @@ -286,7 +286,14 @@ end describe '#instance=' do - let(:logger) { Datadog::Logger.new(STDOUT) } + let(:logger) do + double(:logger, + debug: true, + info: true, + warn: true, + error: true, + level: true) + end it 'updates the #instance setting' do expect { settings.logger.instance = logger }