diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f7cbbddb7..2851296782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The agent now supports Ruby 3.4.0. We've made incremental changes throughout the preview stage to reach compatibility. This release includes an update to the Thread Profiler for compatibility with Ruby 3.4.0's new backtrace format. [Issue#2992](https://github.com/newrelic/newrelic-ruby-agent/issues/2992) [PR#2997](https://github.com/newrelic/newrelic-ruby-agent/pull/2997) +- **Bugfix: Stop emitting inaccurate debug-level log about deprecated configuration options** + + In the previous major release, we dropped support for `disable_` configuration options in favor of `instrumentation.`. Previously, a DEBUG level log warning appeared whenever `disable_*` options were set to `true`, even for libraries (e.g. Action Dispatch) without equivalent `instrumentation.*` options: + + >DEBUG : [DEPRECATED] configuration disable_ for will be removed in the next major release. Use instrumentation. with one of ["auto", "disabled", "prepend", "chain"] + + This inaccurate warning has been removed. If you are disabling instrumentation using `instrumentation.: disabled` or `NEW_RELIC_INSTRUMENTATION_=disabled`, please verify the option exists by consulting our [configuration documentation](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/#instrumentation). If the option does not exist, check the ['Disabling' section](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/#disabling) to see if there is a related option. We apologize for the confusion. [PR#3005](https://github.com/newrelic/newrelic-ruby-agent/pull/3005) + - **Bugfix: Do not attempt to decorate logs with `nil` messages** The agent no longer attempts to add New Relic linking metadata to logs with `nil` messages. Thank you, [@arlando](https://github.com/arlando) for bringing this to our attention! [Issue#2985](https://github.com/newrelic/newrelic-ruby-agent/issues/2985) [PR#2986](https://github.com/newrelic/newrelic-ruby-agent/pull/2986) diff --git a/lib/new_relic/agent/configuration/default_source.rb b/lib/new_relic/agent/configuration/default_source.rb index efc3ecc21b..b379719c62 100644 --- a/lib/new_relic/agent/configuration/default_source.rb +++ b/lib/new_relic/agent/configuration/default_source.rb @@ -1310,6 +1310,7 @@ def self.notify :default => false, :public => true, :type => Boolean, + :aliases => %i[disable_active_job], :allowed_from_server => false, :description => 'If `true`, disables Active Job instrumentation.' }, diff --git a/lib/new_relic/dependency_detection.rb b/lib/new_relic/dependency_detection.rb index d9c7dff358..9069d5c70a 100644 --- a/lib/new_relic/dependency_detection.rb +++ b/lib/new_relic/dependency_detection.rb @@ -144,8 +144,6 @@ def allowed_by_config? !(disabled_configured? || deprecated_disabled_configured?) end - # TODO: MAJOR VERSION - # will only return true if a disabled key is found and is truthy def deprecated_disabled_configured? return false if self.name.nil? @@ -153,12 +151,7 @@ def deprecated_disabled_configured? return false unless ::NewRelic::Agent.config[key] == true ::NewRelic::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}") - ::NewRelic::Agent.logger.debug( \ - "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release. " \ - "Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`" - ) - - return true + true end def config_key