From f2dfac5341294726770b67b55242acf8442248a0 Mon Sep 17 00:00:00 2001
From: Gustavo Caso <gustavo.caso@datadoghq.com>
Date: Mon, 3 Jul 2023 18:20:58 +0200
Subject: [PATCH] update settings to use the new env_var and deprecated_env_var

---
 lib/datadog/appsec/configuration/settings.rb  |  58 +++---
 lib/datadog/ci/configuration/settings.rb      |   8 +-
 .../cucumber/configuration/settings.rb        |  10 +-
 .../contrib/rspec/configuration/settings.rb   |  10 +-
 lib/datadog/core/configuration/settings.rb    | 171 +++++++++++++-----
 .../core/diagnostics/environment_logger.rb    |   8 +-
 lib/datadog/tracing/configuration/settings.rb | 113 ++++++++----
 .../action_cable/configuration/settings.rb    |  18 +-
 .../action_mailer/configuration/settings.rb   |  18 +-
 .../action_pack/configuration/settings.rb     |  18 +-
 .../action_view/configuration/settings.rb     |  18 +-
 .../active_job/configuration/settings.rb      |  20 +-
 .../configuration/settings.rb                 |  18 +-
 .../active_record/configuration/settings.rb   |  18 +-
 .../active_support/configuration/settings.rb  |  18 +-
 .../contrib/aws/configuration/settings.rb     |  23 ++-
 .../concurrent_ruby/configuration/settings.rb |   6 +-
 .../contrib/dalli/configuration/settings.rb   |  23 ++-
 .../delayed_job/configuration/settings.rb     |  20 +-
 .../elasticsearch/configuration/settings.rb   |  23 ++-
 .../contrib/ethon/configuration/settings.rb   |  23 ++-
 .../contrib/excon/configuration/settings.rb   |  23 ++-
 lib/datadog/tracing/contrib/extensions.rb     |   1 -
 .../contrib/faraday/configuration/settings.rb |  25 ++-
 .../contrib/grape/configuration/settings.rb   |  18 +-
 .../contrib/graphql/configuration/settings.rb |  18 +-
 .../contrib/grpc/configuration/settings.rb    |  25 ++-
 .../contrib/hanami/configuration/settings.rb  |   6 +-
 .../contrib/http/configuration/settings.rb    |  28 ++-
 .../httpclient/configuration/settings.rb      |  28 ++-
 .../contrib/httprb/configuration/settings.rb  |  28 ++-
 .../contrib/kafka/configuration/settings.rb   |  18 +-
 .../contrib/lograge/configuration/settings.rb |   6 +-
 .../contrib/mongodb/configuration/settings.rb |  23 ++-
 .../contrib/mysql2/configuration/settings.rb  |  31 ++--
 .../contrib/pg/configuration/settings.rb      |  31 ++--
 .../contrib/presto/configuration/settings.rb  |  23 ++-
 .../contrib/qless/configuration/settings.rb   |  22 ++-
 .../contrib/que/configuration/settings.rb     |  30 ++-
 .../contrib/racecar/configuration/settings.rb |  18 +-
 .../contrib/rack/configuration/settings.rb    |  18 +-
 .../contrib/rails/configuration/settings.rb   |  19 +-
 .../contrib/rake/configuration/settings.rb    |  21 ++-
 .../contrib/redis/configuration/settings.rb   |  29 ++-
 .../contrib/resque/configuration/settings.rb  |  20 +-
 .../rest_client/configuration/settings.rb     |  23 ++-
 .../contrib/roda/configuration/settings.rb    |  18 +-
 .../semantic_logger/configuration/settings.rb |   6 +-
 .../contrib/sequel/configuration/settings.rb  |  18 +-
 .../shoryuken/configuration/settings.rb       |  20 +-
 .../contrib/sidekiq/configuration/settings.rb |  26 ++-
 .../contrib/sinatra/configuration/settings.rb |  18 +-
 .../sneakers/configuration/settings.rb        |  20 +-
 .../tracing/contrib/span_attribute_schema.rb  |  16 +-
 .../contrib/stripe/configuration/settings.rb  |  18 +-
 .../sucker_punch/configuration/settings.rb    |  18 +-
 .../appsec/configuration/settings_spec.rb     |   4 +-
 .../core/configuration/settings_spec.rb       |   4 +-
 .../diagnostics/environment_logger_spec.rb    |   1 +
 spec/datadog/core/telemetry/collector_spec.rb |   1 +
 60 files changed, 1034 insertions(+), 328 deletions(-)

diff --git a/lib/datadog/appsec/configuration/settings.rb b/lib/datadog/appsec/configuration/settings.rb
index 16ec128b33e..fd95b1f72bd 100644
--- a/lib/datadog/appsec/configuration/settings.rb
+++ b/lib/datadog/appsec/configuration/settings.rb
@@ -33,9 +33,10 @@ def self.add_settings!(base)
           base.class_eval do
             settings :appsec do
               option :enabled do |o|
-                o.default { env_to_bool('DD_APPSEC_ENABLED', DEFAULT_APPSEC_ENABLED) }
-                o.setter do |v|
-                  v ? true : false
+                o.env_var 'DD_APPSEC_ENABLED'
+                o.default DEFAULT_APPSEC_ENABLED
+                o.setter do |value|
+                  val_to_bool(value)
                 end
               end
 
@@ -53,56 +54,62 @@ def self.add_settings!(base)
               end
 
               option :ruleset do |o|
-                o.default { ENV.fetch('DD_APPSEC_RULES', DEFAULT_APPSEC_RULESET) }
+                o.env_var 'DD_APPSEC_RULES'
+                o.default { DEFAULT_APPSEC_RULESET }
+                o.lazy
               end
 
               option :ip_denylist do |o|
                 o.default { [] }
+                o.lazy
               end
 
               option :user_id_denylist do |o|
                 o.default { [] }
+                o.lazy
               end
 
               option :waf_timeout do |o|
-                o.default { ENV.fetch('DD_APPSEC_WAF_TIMEOUT', DEFAULT_APPSEC_WAF_TIMEOUT) } # us
+                o.env_var 'DD_APPSEC_WAF_TIMEOUT'
+                o.default { DEFAULT_APPSEC_WAF_TIMEOUT } # us
                 o.setter do |v|
                   Datadog::Core::Utils::Duration.call(v.to_s, base: :us)
                 end
+                o.lazy
               end
 
               option :waf_debug do |o|
-                o.default { env_to_bool('DD_APPSEC_WAF_DEBUG', DEFAULT_APPSEC_WAF_DEBUG) }
-                o.setter do |v|
-                  v ? true : false
+                o.env_var 'DD_APPSEC_WAF_DEBUG'
+                o.default DEFAULT_APPSEC_WAF_DEBUG
+                o.setter do |value|
+                  val_to_bool(value)
                 end
               end
 
               option :trace_rate_limit do |o|
-                o.default { env_to_int('DD_APPSEC_TRACE_RATE_LIMIT', DEFAULT_APPSEC_TRACE_RATE_LIMIT) } # trace/s
+                o.env_var 'DD_APPSEC_TRACE_RATE_LIMIT'
+                o.default DEFAULT_APPSEC_TRACE_RATE_LIMIT
+                o.setter do |value|
+                  val_to_int(value)
+                end
               end
 
               option :obfuscator_key_regex do |o|
-                o.default { ENV.fetch('DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP', DEFAULT_OBFUSCATOR_KEY_REGEX) }
+                o.env_var 'DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP'
+                o.default { DEFAULT_OBFUSCATOR_KEY_REGEX }
+                o.lazy
               end
 
               option :obfuscator_value_regex do |o|
-                o.default do
-                  ENV.fetch(
-                    'DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP',
-                    DEFAULT_OBFUSCATOR_VALUE_REGEX
-                  )
-                end
+                o.env_var 'DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP'
+                o.default { DEFAULT_OBFUSCATOR_VALUE_REGEX }
+                o.lazy
               end
 
               settings :track_user_events do
                 option :enabled do |o|
-                  o.default do
-                    ENV.fetch(
-                      'DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING',
-                      DEFAULT_APPSEC_AUTOMATED_TRACK_USER_EVENTS_ENABLED
-                    )
-                  end
+                  o.env_var 'DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING'
+                  o.default { DEFAULT_APPSEC_AUTOMATED_TRACK_USER_EVENTS_ENABLED }
                   o.setter do |v|
                     if v
                       v.to_s != 'disabled'
@@ -110,12 +117,12 @@ def self.add_settings!(base)
                       false
                     end
                   end
+                  o.lazy
                 end
 
                 option :mode do |o|
-                  o.default do
-                    ENV.fetch('DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING', DEFAULT_APPSEC_AUTOMATED_TRACK_USER_EVENTS_MODE)
-                  end
+                  o.env_var 'DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING'
+                  o.default { DEFAULT_APPSEC_AUTOMATED_TRACK_USER_EVENTS_MODE }
                   o.setter do |v|
                     string_value = v.to_s
                     if APPSEC_VALID_TRACK_USER_EVENTS_MODE.include?(string_value)
@@ -129,6 +136,7 @@ def self.add_settings!(base)
                       DEFAULT_APPSEC_AUTOMATED_TRACK_USER_EVENTS_MODE
                     end
                   end
+                  o.lazy
                 end
               end
             end
diff --git a/lib/datadog/ci/configuration/settings.rb b/lib/datadog/ci/configuration/settings.rb
index 2a970baaed7..16681cdbd01 100644
--- a/lib/datadog/ci/configuration/settings.rb
+++ b/lib/datadog/ci/configuration/settings.rb
@@ -16,7 +16,11 @@ def self.add_settings!(base)
           base.class_eval do
             settings :ci do
               option :enabled do |o|
-                o.default { env_to_bool(CI::Ext::Settings::ENV_MODE_ENABLED, false) }
+                o.env_var CI::Ext::Settings::ENV_MODE_ENABLED
+                o.default false
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # DEV: Alias to Datadog::Tracing::Contrib::Extensions::Configuration::Settings#instrument.
@@ -36,10 +40,12 @@ def self.add_settings!(base)
 
               option :trace_flush do |o|
                 o.default { nil }
+                o.lazy
               end
 
               option :writer_options do |o|
                 o.default { {} }
+                o.lazy
               end
             end
           end
diff --git a/lib/datadog/ci/contrib/cucumber/configuration/settings.rb b/lib/datadog/ci/contrib/cucumber/configuration/settings.rb
index 662fd0af8c7..854fb33d054 100644
--- a/lib/datadog/ci/contrib/cucumber/configuration/settings.rb
+++ b/lib/datadog/ci/contrib/cucumber/configuration/settings.rb
@@ -12,15 +12,21 @@ module Configuration
           # TODO: mark as `@public_api` when GA
           class Settings < Datadog::Tracing::Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :service_name do |o|
               o.default { Datadog.configuration.service_without_fallback || Ext::SERVICE_NAME }
+              o.lazy
             end
 
             option :operation_name do |o|
-              o.default { ENV.fetch(Ext::ENV_OPERATION_NAME, Ext::OPERATION_NAME) }
+              o.env_var Ext::ENV_OPERATION_NAME
+              o.default Ext::OPERATION_NAME
             end
           end
         end
diff --git a/lib/datadog/ci/contrib/rspec/configuration/settings.rb b/lib/datadog/ci/contrib/rspec/configuration/settings.rb
index 11e88b8532c..f75f8010746 100644
--- a/lib/datadog/ci/contrib/rspec/configuration/settings.rb
+++ b/lib/datadog/ci/contrib/rspec/configuration/settings.rb
@@ -12,15 +12,21 @@ module Configuration
           # TODO: mark as `@public_api` when GA
           class Settings < Datadog::Tracing::Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :service_name do |o|
               o.default { Datadog.configuration.service_without_fallback || Ext::SERVICE_NAME }
+              o.lazy
             end
 
             option :operation_name do |o|
-              o.default { ENV.fetch(Ext::ENV_OPERATION_NAME, Ext::OPERATION_NAME) }
+              o.env_var Ext::ENV_OPERATION_NAME
+              o.default ENV[Ext::OPERATION_NAME]
             end
           end
         end
diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb
index 3edffa85348..aca7f7ea12d 100644
--- a/lib/datadog/core/configuration/settings.rb
+++ b/lib/datadog/core/configuration/settings.rb
@@ -79,7 +79,9 @@ def initialize(*_)
         # @default `DD_API_KEY` environment variable, otherwise `nil`
         # @return [String,nil]
         option :api_key do |o|
-          o.default { ENV.fetch(Core::Environment::Ext::ENV_API_KEY, nil) }
+          o.env_var Core::Environment::Ext::ENV_API_KEY
+          o.default { nil }
+          o.lazy
         end
 
         # Datadog diagnostic settings.
@@ -98,7 +100,11 @@ def initialize(*_)
           # @default `DD_TRACE_DEBUG` environment variable, otherwise `false`
           # @return [Boolean]
           option :debug do |o|
-            o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED, false) }
+            o.env_var Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED
+            o.default false
+            o.setter do |value|
+              val_to_bool(value)
+            end
             o.on_set do |enabled|
               # Enable rich debug print statements.
               # We do not need to unnecessarily load 'pp' unless in debugging mode.
@@ -115,7 +121,11 @@ def initialize(*_)
             # @default `DD_HEALTH_METRICS_ENABLED` environment variable, otherwise `false`
             # @return [Boolean]
             option :enabled do |o|
-              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_HEALTH_METRICS_ENABLED, false) }
+              o.env_var Datadog::Core::Configuration::Ext::Diagnostics::ENV_HEALTH_METRICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             # {Datadog::Statsd} instance to collect health metrics.
@@ -140,7 +150,11 @@ def initialize(*_)
             # @return [Boolean,nil]
             option :enabled do |o|
               # Defaults to nil as we want to know when the default value is being used
-              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_STARTUP_LOGS_ENABLED, nil) }
+              o.env_var Datadog::Core::Configuration::Ext::Diagnostics::ENV_STARTUP_LOGS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
           end
         end
@@ -154,7 +168,8 @@ def initialize(*_)
           o.setter { |v| v.to_s if v }
 
           # NOTE: env also gets set as a side effect of tags. See the WORKAROUND note in #initialize for details.
-          o.default { ENV.fetch(Core::Environment::Ext::ENV_ENVIRONMENT, nil) }
+          o.env_var Core::Environment::Ext::ENV_ENVIRONMENT
+          o.default nil
         end
 
         # Internal `Datadog.logger` configuration.
@@ -189,7 +204,11 @@ def initialize(*_)
           # @default `DD_PROFILING_ENABLED` environment variable, otherwise `false`
           # @return [Boolean]
           option :enabled do |o|
-            o.default { env_to_bool(Profiling::Ext::ENV_ENABLED, false) }
+            o.env_var Profiling::Ext::ENV_ENABLED
+            o.default false
+            o.setter do |value|
+              val_to_bool(value)
+            end
           end
 
           # @public_api
@@ -222,7 +241,11 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_MAX_FRAMES` environment variable, otherwise 400
             option :max_frames do |o|
-              o.default { env_to_int(Profiling::Ext::ENV_MAX_FRAMES, 400) }
+              o.env_var Profiling::Ext::ENV_MAX_FRAMES
+              o.default 400
+              o.setter do |value|
+                val_to_int(value)
+              end
             end
 
             # @public_api
@@ -234,7 +257,11 @@ def initialize(*_)
                 # @default `DD_PROFILING_ENDPOINT_COLLECTION_ENABLED` environment variable, otherwise `true`
                 # @return [Boolean]
                 option :enabled do |o|
-                  o.default { env_to_bool(Profiling::Ext::ENV_ENDPOINT_COLLECTION_ENABLED, true) }
+                  o.env_var Profiling::Ext::ENV_ENDPOINT_COLLECTION_ENABLED
+                  o.default true
+                  o.setter do |value|
+                    val_to_bool(value)
+                  end
                 end
               end
             end
@@ -276,7 +303,11 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_FORCE_ENABLE_LEGACY` environment variable, otherwise `false`
             option :force_enable_legacy_profiler do |o|
-              o.default { env_to_bool('DD_PROFILING_FORCE_ENABLE_LEGACY', false) }
+              o.env_var 'DD_PROFILING_FORCE_ENABLE_LEGACY'
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
               o.on_set do |value|
                 if value
                   Datadog.logger.warn(
@@ -308,7 +339,10 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_FORCE_ENABLE_GC` environment variable, otherwise `false`
             option :force_enable_gc_profiling do |o|
-              o.default { env_to_bool('DD_PROFILING_FORCE_ENABLE_GC', false) }
+              o.env_var 'DD_PROFILING_FORCE_ENABLE_GC'
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             # Can be used to enable/disable the Datadog::Profiling.allocation_count feature.
@@ -329,7 +363,11 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_SKIP_MYSQL2_CHECK` environment variable, otherwise `false`
             option :skip_mysql2_check do |o|
-              o.default { env_to_bool('DD_PROFILING_SKIP_MYSQL2_CHECK', false) }
+              o.env_var 'DD_PROFILING_SKIP_MYSQL2_CHECK'
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             # The profiler gathers data by sending `SIGPROF` unix signals to Ruby application threads.
@@ -352,14 +390,15 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_NO_SIGNALS_WORKAROUND_ENABLED` environment variable as a boolean, otherwise `:auto`
             option :no_signals_workaround_enabled do |o|
-              o.default { env_to_bool('DD_PROFILING_NO_SIGNALS_WORKAROUND_ENABLED', :auto) }
-            end
-
-            # Enables data collection for the timeline feature. This is still experimental and not recommended yet.
-            #
-            # @default `DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED` environment variable as a boolean, otherwise `false`
-            option :experimental_timeline_enabled do |o|
-              o.default { env_to_bool('DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED', false) }
+              o.env_var 'DD_PROFILING_NO_SIGNALS_WORKAROUND_ENABLED'
+              o.default :auto
+              o.setter do |value|
+                if value != :auto
+                  val_to_bool(value)
+                else
+                  value
+                end
+              end
             end
           end
 
@@ -369,8 +408,11 @@ def initialize(*_)
             #
             # @default `DD_PROFILING_UPLOAD_TIMEOUT` environment variable, otherwise `30.0`
             option :timeout_seconds do |o|
-              o.setter { |value| value.nil? ? 30.0 : value.to_f }
-              o.default { env_to_float(Profiling::Ext::ENV_UPLOAD_TIMEOUT, 30.0) }
+              o.env_var Profiling::Ext::ENV_UPLOAD_TIMEOUT
+              o.default 30.0
+              o.setter do |value|
+                value ? val_to_float(value) : 30.0
+              end
             end
           end
         end
@@ -383,10 +425,14 @@ def initialize(*_)
           # @default `DD_RUNTIME_METRICS_ENABLED` environment variable, otherwise `false`
           # @return [Boolean]
           option :enabled do |o|
-            o.default { env_to_bool(Core::Runtime::Ext::Metrics::ENV_ENABLED, false) }
+            o.env_var Core::Runtime::Ext::Metrics::ENV_ENABLED
+            o.default false
+            o.setter do |value|
+              val_to_bool(value)
+            end
           end
 
-          option :opts, default: ->(_i) { {} }
+          option :opts, default: ->(_i) { {} }, lazy: true
           option :statsd
         end
 
@@ -399,7 +445,9 @@ def initialize(*_)
           o.setter { |v| v.to_s if v }
 
           # NOTE: service also gets set as a side effect of tags. See the WORKAROUND note in #initialize for details.
-          o.default { ENV.fetch(Core::Environment::Ext::ENV_SERVICE, Core::Environment::Ext::FALLBACK_SERVICE_NAME) }
+          o.env_var Core::Environment::Ext::ENV_SERVICE
+          o.default { Core::Environment::Ext::FALLBACK_SERVICE_NAME }
+          o.lazy
 
           # There's a few cases where we don't want to use the fallback service name, so this helper allows us to get a
           # nil instead so that one can do
@@ -421,7 +469,9 @@ def initialize(*_)
         # @default `DD_SITE` environment variable, otherwise `nil` which sends data to `app.datadoghq.com`
         # @return [String,nil]
         option :site do |o|
-          o.default { ENV.fetch(Core::Environment::Ext::ENV_SITE, nil) }
+          o.env_var Core::Environment::Ext::ENV_SITE
+          o.default { nil }
+          o.lazy
         end
 
         # Default tags
@@ -431,42 +481,46 @@ def initialize(*_)
         # @default `DD_TAGS` environment variable (in the format `'tag1:value1,tag2:value2'`), otherwise `{}`
         # @return [Hash<String,String>]
         option :tags do |o|
-          o.default do
-            tags = {}
-
-            # Parse tags from environment
-            env_to_list(Core::Environment::Ext::ENV_TAGS, comma_separated_only: false).each do |tag|
-              key, value = tag.split(':', 2)
-              tags[key] = value if value && !value.empty?
-            end
+          o.env_var Core::Environment::Ext::ENV_TAGS
+          o.default { {} }
+          o.setter do |new_value, old_value|
+            tag_list = if new_value && new_value.is_a?(String)
+                         val_to_list(new_value, comma_separated_only: false).each_with_object({}) do |tag, tags|
+                           key, value = tag.split(':', 2)
+                           tags[key] = value if value && !value.empty?
+                         end
+                       else
+                         new_value
+                       end
+
+            env_value = env
+            version_value = version
+            service_name = service_without_fallback
 
             # Override tags if defined
-            tags[Core::Environment::Ext::TAG_ENV] = env unless env.nil?
-            tags[Core::Environment::Ext::TAG_VERSION] = version unless version.nil?
+            tag_list[Core::Environment::Ext::TAG_ENV] = env_value unless env_value.nil?
+            tag_list[Core::Environment::Ext::TAG_VERSION] = version_value unless version_value.nil?
 
-            tags
-          end
-
-          o.setter do |new_value, old_value|
             # Coerce keys to strings
-            string_tags = new_value.collect { |k, v| [k.to_s, v] }.to_h
+            string_tags = tag_list.collect { |k, v| [k.to_s, v] }.to_h
 
             # Cross-populate tag values with other settings
             if env.nil? && string_tags.key?(Core::Environment::Ext::TAG_ENV)
               self.env = string_tags[Core::Environment::Ext::TAG_ENV]
             end
 
-            if version.nil? && string_tags.key?(Core::Environment::Ext::TAG_VERSION)
+            if version_value.nil? && string_tags.key?(Core::Environment::Ext::TAG_VERSION)
               self.version = string_tags[Core::Environment::Ext::TAG_VERSION]
             end
 
-            if service_without_fallback.nil? && string_tags.key?(Core::Environment::Ext::TAG_SERVICE)
+            if service_name.nil? && string_tags.key?(Core::Environment::Ext::TAG_SERVICE)
               self.service = string_tags[Core::Environment::Ext::TAG_SERVICE]
             end
 
             # Merge with previous tags
             (old_value || {}).merge(string_tags)
           end
+          o.lazy
         end
 
         # The time provider used by Datadog. It must respect the interface of [Time](https://ruby-doc.org/core-3.0.1/Time.html).
@@ -479,9 +533,8 @@ def initialize(*_)
         # @default `->{ Time.now }`
         # @return [Proc<Time>]
         option :time_now_provider do |o|
-          o.experimental_default_proc do
-            ::Time.now
-          end
+          o.default { ::Time.now }
+
           o.on_set do |time_provider|
             Core::Utils::Time.now_provider = time_provider
           end
@@ -501,7 +554,9 @@ def initialize(*_)
         # @return [String,nil]
         option :version do |o|
           # NOTE: version also gets set as a side effect of tags. See the WORKAROUND note in #initialize for details.
-          o.default { ENV.fetch(Core::Environment::Ext::ENV_VERSION, nil) }
+          o.env_var Core::Environment::Ext::ENV_VERSION
+          o.default { nil }
+          o.lazy
         end
 
         # Client-side telemetry configuration
@@ -513,7 +568,11 @@ def initialize(*_)
           #   Can be disabled as documented [here](https://docs.datadoghq.com/tracing/configure_data_security/#telemetry-collection).
           # @return [Boolean]
           option :enabled do |o|
-            o.default { env_to_bool(Core::Telemetry::Ext::ENV_ENABLED, true) }
+            o.env_var Core::Telemetry::Ext::ENV_ENABLED
+            o.default true
+            o.setter do |value|
+              val_to_bool(value)
+            end
           end
 
           # The interval in seconds when telemetry must be sent.
@@ -524,7 +583,11 @@ def initialize(*_)
           # @return [Float]
           # @!visibility private
           option :heartbeat_interval_seconds do |o|
-            o.default { env_to_float(Core::Telemetry::Ext::ENV_HEARTBEAT_INTERVAL, 60) }
+            o.env_var Core::Telemetry::Ext::ENV_HEARTBEAT_INTERVAL
+            o.default 60
+            o.setter do |value|
+              val_to_float(value)
+            end
           end
         end
 
@@ -536,7 +599,11 @@ def initialize(*_)
           # @default `DD_REMOTE_CONFIGURATION_ENABLED` environment variable, otherwise `true`.
           # @return [Boolean]
           option :enabled do |o|
-            o.default { env_to_bool(Core::Remote::Ext::ENV_ENABLED, true) }
+            o.env_var Core::Remote::Ext::ENV_ENABLED
+            o.default true
+            o.setter do |value|
+              val_to_bool(value)
+            end
           end
 
           # Tune remote configuration polling interval.
@@ -544,7 +611,11 @@ def initialize(*_)
           # @default `DD_REMOTE_CONFIGURATION_POLL_INTERVAL_SECONDS` environment variable, otherwise `5.0` seconds.
           # @return [Float]
           option :poll_interval_seconds do |o|
-            o.default { env_to_float(Core::Remote::Ext::ENV_POLL_INTERVAL_SECONDS, 5.0) }
+            o.env_var Core::Remote::Ext::ENV_POLL_INTERVAL_SECONDS
+            o.default 5.0
+            o.setter do |value|
+              val_to_float(value)
+            end
           end
 
           # Declare service name to bind to remote configuration. Use when
diff --git a/lib/datadog/core/diagnostics/environment_logger.rb b/lib/datadog/core/diagnostics/environment_logger.rb
index 9f99c031806..5518e518853 100644
--- a/lib/datadog/core/diagnostics/environment_logger.rb
+++ b/lib/datadog/core/diagnostics/environment_logger.rb
@@ -39,11 +39,11 @@ def log_error!(type, error)
           # Are we logging the environment data?
           def log?
             startup_logs_enabled = Datadog.configuration.diagnostics.startup_logs.enabled
-            if startup_logs_enabled.nil?
-              !repl? # Suppress logs if we running in a REPL
-            else
-              startup_logs_enabled
+            unless startup_logs_enabled
+              return !repl? # Suppress logs if we running in a REPL
             end
+
+            startup_logs_enabled
           end
 
           REPL_PROGRAM_NAMES = %w[irb pry].freeze
diff --git a/lib/datadog/tracing/configuration/settings.rb b/lib/datadog/tracing/configuration/settings.rb
index 09e4fdba839..0d6a7e97b0d 100644
--- a/lib/datadog/tracing/configuration/settings.rb
+++ b/lib/datadog/tracing/configuration/settings.rb
@@ -26,7 +26,10 @@ def self.extended(base)
                 # @default `DD_TRACE_ANALYTICS_ENABLED` environment variable, otherwise `nil`
                 # @return [Boolean,nil]
                 option :enabled do |o|
-                  o.default { env_to_bool(Tracing::Configuration::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) }
+                  o.env_var Tracing::Configuration::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED
+                  o.setter do |value|
+                    val_to_bool(value) if value
+                  end
                 end
               end
 
@@ -50,14 +53,13 @@ def self.extended(base)
                 #   otherwise `['Datadog','b3multi','b3']`.
                 # @return [Array<String>]
                 option :propagation_extract_style do |o|
-                  o.default do
+                  o.deprecated_env_var Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT_OLD
+                  o.env_var Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT
+                  o.setter do |value|
                     # DEV-2.0: Change default value to `tracecontext, Datadog`.
                     # Look for all headers by default
-                    env_to_list(
-                      [
-                        Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT,
-                        Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT_OLD
-                      ],
+                    val_to_list(
+                      value,
                       [
                         Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                         Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER,
@@ -91,13 +93,12 @@ def self.extended(base)
                 # @default `DD_TRACE_PROPAGATION_STYLE_INJECT` environment variable (comma-separated list), otherwise `['Datadog']`.
                 # @return [Array<String>]
                 option :propagation_inject_style do |o|
-                  o.default do
+                  o.deprecated_env_var Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT_OLD
+                  o.env_var Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT
+                  o.setter do |value|
                     # DEV-2.0: Change default value to `tracecontext, Datadog`.
-                    env_to_list(
-                      [
-                        Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT,
-                        Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT_OLD
-                      ],
+                    val_to_list(
+                      value,
                       [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG],
                       comma_separated_only: true # Only inject Datadog headers by default
                     )
@@ -128,8 +129,9 @@ def self.extended(base)
                 # @default `DD_TRACE_PROPAGATION_STYLE` environment variable (comma-separated list).
                 # @return [Array<String>]
                 option :propagation_style do |o|
-                  o.default do
-                    env_to_list(Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE, nil, comma_separated_only: true)
+                  o.env_var Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
+                  o.setter do |value|
+                    val_to_list(value, nil, comma_separated_only: true)
                   end
 
                   o.on_set do |styles|
@@ -162,7 +164,11 @@ def self.extended(base)
               # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
               # @return [Boolean]
               option :enabled do |o|
-                o.default { env_to_bool(Tracing::Configuration::Ext::ENV_ENABLED, true) }
+                o.env_var Tracing::Configuration::Ext::ENV_ENABLED
+                o.default true
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # Enable 128 bit trace id generation.
@@ -170,7 +176,11 @@ def self.extended(base)
               # @default `DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED` environment variable, otherwise `false`
               # @return [Boolean]
               option :trace_id_128_bit_generation_enabled do |o|
-                o.default { env_to_bool(Tracing::Configuration::Ext::ENV_TRACE_ID_128_BIT_GENERATION_ENABLED, false) }
+                o.env_var Tracing::Configuration::Ext::ENV_TRACE_ID_128_BIT_GENERATION_ENABLED
+                o.default false
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # Enable 128 bit trace id injected for logging.
@@ -180,7 +190,11 @@ def self.extended(base)
               #
               # It is not supported by our backend yet. Do not enable it.
               option :trace_id_128_bit_logging_enabled do |o|
-                o.default { env_to_bool(Tracing::Configuration::Ext::Correlation::ENV_TRACE_ID_128_BIT_LOGGING_ENABLED, false) }
+                o.env_var Tracing::Configuration::Ext::Correlation::ENV_TRACE_ID_128_BIT_LOGGING_ENABLED
+                o.default false
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # A custom tracer instance.
@@ -201,7 +215,11 @@ def self.extended(base)
               # @see https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#trace-correlation
               # @return [Boolean]
               option :log_injection do |o|
-                o.default { env_to_bool(Tracing::Configuration::Ext::Correlation::ENV_LOGS_INJECTION_ENABLED, true) }
+                o.env_var Tracing::Configuration::Ext::Correlation::ENV_LOGS_INJECTION_ENABLED
+                o.default true
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # Configures an alternative trace transport behavior, where
@@ -241,7 +259,11 @@ def self.extended(base)
               option :priority_sampling
 
               option :report_hostname do |o|
-                o.default { env_to_bool(Tracing::Configuration::Ext::NET::ENV_REPORT_HOSTNAME, false) }
+                o.env_var Tracing::Configuration::Ext::NET::ENV_REPORT_HOSTNAME
+                o.default false
+                o.setter do |value|
+                  val_to_bool(value)
+                end
               end
 
               # A custom sampler instance.
@@ -261,9 +283,13 @@ def self.extended(base)
                 # for resources not seen recently).
                 #
                 # @default `DD_TRACE_SAMPLE_RATE` environment variable, otherwise `nil`.
-                # @return [Float,nil]
+                # @return [Float]
                 option :default_rate do |o|
-                  o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, nil) }
+                  o.env_var Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE
+                  o.default nil
+                  o.setter do |value|
+                    val_to_float(value)
+                  end
                 end
 
                 # Rate limit for number of spans per second.
@@ -274,7 +300,11 @@ def self.extended(base)
                 # @default `DD_TRACE_RATE_LIMIT` environment variable, otherwise 100.
                 # @return [Numeric,nil]
                 option :rate_limit do |o|
-                  o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_RATE_LIMIT, 100) }
+                  o.env_var Tracing::Configuration::Ext::Sampling::ENV_RATE_LIMIT
+                  o.default 100
+                  o.setter do |value|
+                    val_to_float(value)
+                  end
                 end
 
                 # Single span sampling rules.
@@ -316,6 +346,7 @@ def self.extended(base)
                       end
                     end
                   end
+                  o.lazy
                 end
               end
 
@@ -329,15 +360,20 @@ def self.extended(base)
                 # @default `DD_TRACE_TEST_MODE_ENABLED` environment variable, otherwise `false`
                 # @return [Boolean]
                 option :enabled do |o|
-                  o.default { env_to_bool(Tracing::Configuration::Ext::Test::ENV_MODE_ENABLED, false) }
+                  o.env_var Tracing::Configuration::Ext::Test::ENV_MODE_ENABLED
+                  o.setter do |value|
+                    val_to_bool(value)
+                  end
                 end
 
                 option :trace_flush do |o|
                   o.default { nil }
+                  o.lazy
                 end
 
                 option :writer_options do |o|
                   o.default { {} }
+                  o.lazy
                 end
               end
 
@@ -365,7 +401,7 @@ def self.extended(base)
               #
               # @default `{}`
               # @return [Hash,nil]
-              option :writer_options, default: ->(_i) { {} }
+              option :writer_options, default: ->(_i) { {} }, lazy: true
 
               # Client IP configuration
               # @public_api
@@ -381,19 +417,22 @@ def self.extended(base)
                 # @return [Boolean]
                 option :enabled do |o|
                   o.default do
-                    disabled = env_to_bool(Tracing::Configuration::Ext::ClientIp::ENV_DISABLED)
+                    disabled = ENV[Tracing::Configuration::Ext::ClientIp::ENV_DISABLED]
 
                     enabled = if disabled.nil?
                                 false
                               else
-                                Datadog.logger.warn { "#{Tracing::Configuration::Ext::ClientIp::ENV_DISABLED} environment variable is deprecated, found set to #{disabled}, use #{Tracing::Configuration::Ext::ClientIp::ENV_ENABLED}=#{!disabled}" }
+                                Datadog::Core.log_deprecation do
+                                  "#{Tracing::Configuration::Ext::ClientIp::ENV_DISABLED} environment variable is deprecated, use #{Tracing::Configuration::Ext::ClientIp::ENV_ENABLED} instead."
+                                end
 
                                 !disabled
                               end
 
                     # ENABLED env var takes precedence over deprecated DISABLED
-                    env_to_bool(Tracing::Configuration::Ext::ClientIp::ENV_ENABLED, enabled)
+                    val_to_bool(ENV[Tracing::Configuration::Ext::ClientIp::ENV_ENABLED] || enabled)
                   end
+                  o.lazy
                 end
 
                 # An optional name of a custom header to resolve the client IP from.
@@ -401,7 +440,9 @@ def self.extended(base)
                 # @default `DD_TRACE_CLIENT_IP_HEADER` environment variable, otherwise `nil`.
                 # @return [String,nil]
                 option :header_name do |o|
-                  o.default { ENV.fetch(Tracing::Configuration::Ext::ClientIp::ENV_HEADER_NAME, nil) }
+                  o.env_var Tracing::Configuration::Ext::ClientIp::ENV_HEADER_NAME
+                  o.default { nil }
+                  o.lazy
                 end
               end
 
@@ -414,7 +455,11 @@ def self.extended(base)
               # @default `DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH` environment variable, otherwise `512`
               # @return [Integer]
               option :x_datadog_tags_max_length do |o|
-                o.default { env_to_int(Tracing::Configuration::Ext::Distributed::ENV_X_DATADOG_TAGS_MAX_LENGTH, 512) }
+                o.env_var Tracing::Configuration::Ext::Distributed::ENV_X_DATADOG_TAGS_MAX_LENGTH
+                o.default 512
+                o.setter do |value|
+                  val_to_int(value)
+                end
               end
 
               # Schema version for span attributes that enables various features
@@ -422,12 +467,8 @@ def self.extended(base)
               # @default `DD_TRACE_SPAN_ATTRIBUTE_SCHEMA` environment variable, otherwise default `v0` currently
               # @return [String]
               option :span_attribute_schema do |o|
-                o.default do
-                  ENV.fetch(
-                    Tracing::Configuration::Ext::SpanAttributeSchema::ENV_SPAN_ATTRIBUTE_SCHEMA,
-                    Tracing::Configuration::Ext::SpanAttributeSchema::DEFAULT_VERSION
-                  )
-                end
+                o.env_var Tracing::Configuration::Ext::SpanAttributeSchema::ENV_SPAN_ATTRIBUTE_SCHEMA
+                o.default Tracing::Configuration::Ext::SpanAttributeSchema::DEFAULT_VERSION
               end
             end
           end
diff --git a/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb b/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb
index 8118cc6e188..9f94d31f256 100644
--- a/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb b/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb
index 1d0a62dbcfc..52772ab6e36 100644
--- a/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb b/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb
index f786ef03ec5..30bd17672fe 100644
--- a/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             # DEV-2.0: Breaking changes for removal.
diff --git a/lib/datadog/tracing/contrib/action_view/configuration/settings.rb b/lib/datadog/tracing/contrib/action_view/configuration/settings.rb
index 71f923c62b8..f51dee78a5a 100644
--- a/lib/datadog/tracing/contrib/action_view/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/action_view/configuration/settings.rb
@@ -10,15 +10,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/active_job/configuration/settings.rb b/lib/datadog/tracing/contrib/active_job/configuration/settings.rb
index 98f6e1c69b1..2bb233c575e 100644
--- a/lib/datadog/tracing/contrib/active_job/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/active_job/configuration/settings.rb
@@ -13,19 +13,31 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
           end
         end
       end
diff --git a/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb b/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb
index d9016ef7a33..4d4fe0c3f39 100644
--- a/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/active_record/configuration/settings.rb b/lib/datadog/tracing/contrib/active_record/configuration/settings.rb
index 87776b28b4f..a5f54d6a888 100644
--- a/lib/datadog/tracing/contrib/active_record/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/active_record/configuration/settings.rb
@@ -13,15 +13,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
diff --git a/lib/datadog/tracing/contrib/active_support/configuration/settings.rb b/lib/datadog/tracing/contrib/active_support/configuration/settings.rb
index 301804dd496..0a90f9ec53a 100644
--- a/lib/datadog/tracing/contrib/active_support/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/active_support/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :cache_service do |o|
diff --git a/lib/datadog/tracing/contrib/aws/configuration/settings.rb b/lib/datadog/tracing/contrib/aws/configuration/settings.rb
index 3375683765e..884a91f6acf 100644
--- a/lib/datadog/tracing/contrib/aws/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/aws/configuration/settings.rb
@@ -13,21 +13,34 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb b/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb
index 696f2d6319a..b60a3354233 100644
--- a/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb
@@ -12,7 +12,11 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/dalli/configuration/settings.rb b/lib/datadog/tracing/contrib/dalli/configuration/settings.rb
index d148fe59825..0b49cc27743 100644
--- a/lib/datadog/tracing/contrib/dalli/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/dalli/configuration/settings.rb
@@ -12,21 +12,34 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb b/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb
index 94cd0a18435..2023267c31d 100644
--- a/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb
@@ -13,20 +13,32 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
             option :client_service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
           end
         end
       end
diff --git a/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb b/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb
index effafe09024..84de5f707fb 100644
--- a/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb
@@ -12,23 +12,36 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :quantize, default: {}
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/ethon/configuration/settings.rb b/lib/datadog/tracing/contrib/ethon/configuration/settings.rb
index 3c8fd5cdc23..4a4373add38 100644
--- a/lib/datadog/tracing/contrib/ethon/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/ethon/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
@@ -28,9 +40,10 @@ class Settings < Contrib::Configuration::Settings
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/excon/configuration/settings.rb b/lib/datadog/tracing/contrib/excon/configuration/settings.rb
index 236421269d1..7b7734ac22c 100644
--- a/lib/datadog/tracing/contrib/excon/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/excon/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
@@ -28,9 +40,10 @@ class Settings < Contrib::Configuration::Settings
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/extensions.rb b/lib/datadog/tracing/contrib/extensions.rb
index 4f10265637d..b7c8acf819d 100644
--- a/lib/datadog/tracing/contrib/extensions.rb
+++ b/lib/datadog/tracing/contrib/extensions.rb
@@ -122,7 +122,6 @@ module Settings
             # @return [Datadog::Tracing::Contrib::Integration]
             def instrument(integration_name, options = {}, &block)
               integration = fetch_integration(integration_name)
-
               unless integration.nil? || !integration.default_configuration.enabled
                 configuration_name = options[:describes] || :default
                 filtered_options = options.reject { |k, _v| k == :describes }
diff --git a/lib/datadog/tracing/contrib/faraday/configuration/settings.rb b/lib/datadog/tracing/contrib/faraday/configuration/settings.rb
index b00e8388df9..cdddc30809f 100644
--- a/lib/datadog/tracing/contrib/faraday/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/faraday/configuration/settings.rb
@@ -16,25 +16,38 @@ class Settings < Contrib::Configuration::Settings
             end
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
-            option :error_handler, experimental_default_proc: DEFAULT_ERROR_HANDLER
+            option :error_handler, default: DEFAULT_ERROR_HANDLER
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/grape/configuration/settings.rb b/lib/datadog/tracing/contrib/grape/configuration/settings.rb
index 76cf1a7d932..1fa2e5b80f5 100644
--- a/lib/datadog/tracing/contrib/grape/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/grape/configuration/settings.rb
@@ -13,15 +13,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/graphql/configuration/settings.rb b/lib/datadog/tracing/contrib/graphql/configuration/settings.rb
index 7be2b8e5d26..d2610496b5d 100644
--- a/lib/datadog/tracing/contrib/graphql/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/graphql/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :schemas
diff --git a/lib/datadog/tracing/contrib/grpc/configuration/settings.rb b/lib/datadog/tracing/contrib/grpc/configuration/settings.rb
index 4a5696df47f..a53a88dc6b3 100644
--- a/lib/datadog/tracing/contrib/grpc/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/grpc/configuration/settings.rb
@@ -13,29 +13,42 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
           end
         end
       end
diff --git a/lib/datadog/tracing/contrib/hanami/configuration/settings.rb b/lib/datadog/tracing/contrib/hanami/configuration/settings.rb
index 966bf904001..4f1a859d3c0 100644
--- a/lib/datadog/tracing/contrib/hanami/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/hanami/configuration/settings.rb
@@ -11,7 +11,11 @@ module Configuration
           # Configuration for Hanami instrumentation
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/http/configuration/settings.rb b/lib/datadog/tracing/contrib/http/configuration/settings.rb
index 896a07e4eb6..1e8727a64af 100644
--- a/lib/datadog/tracing/contrib/http/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/http/configuration/settings.rb
@@ -12,30 +12,46 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
             option :error_status_codes do |o|
-              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
+              o.env_var Ext::ENV_ERROR_STATUS_CODES
+              o.setter do |value|
+                val_to_list(value, 400...600, comma_separated_only: false)
+              end
             end
 
             option :split_by_domain, default: false
diff --git a/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb b/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb
index 0e69e31a822..43fa5f01b66 100644
--- a/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb
@@ -12,30 +12,46 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
             option :error_status_codes do |o|
-              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
+              o.env_var Ext::ENV_ERROR_STATUS_CODES
+              o.setter do |value|
+                val_to_list(value, 400...600, comma_separated_only: false)
+              end
             end
 
             option :split_by_domain, default: false
diff --git a/lib/datadog/tracing/contrib/httprb/configuration/settings.rb b/lib/datadog/tracing/contrib/httprb/configuration/settings.rb
index ef26961829d..c461301a4e6 100644
--- a/lib/datadog/tracing/contrib/httprb/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/httprb/configuration/settings.rb
@@ -12,30 +12,46 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
             option :error_status_codes do |o|
-              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
+              o.env_var Ext::ENV_ERROR_STATUS_CODES
+              o.setter do |value|
+                value_to_list(value, 400...600, comma_separated_only: false)
+              end
             end
 
             option :split_by_domain, default: false
diff --git a/lib/datadog/tracing/contrib/kafka/configuration/settings.rb b/lib/datadog/tracing/contrib/kafka/configuration/settings.rb
index f6079844f20..287ddcd189e 100644
--- a/lib/datadog/tracing/contrib/kafka/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/kafka/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/lograge/configuration/settings.rb b/lib/datadog/tracing/contrib/lograge/configuration/settings.rb
index 27a184fe53b..4e6c09c29ba 100644
--- a/lib/datadog/tracing/contrib/lograge/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/lograge/configuration/settings.rb
@@ -12,7 +12,11 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb b/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb
index 29f03bc3bc3..3dacfc8c9a1 100644
--- a/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb
@@ -14,23 +14,36 @@ class Settings < Contrib::Configuration::Settings
             DEFAULT_QUANTIZE = { show: [:collection, :database, :operation] }.freeze
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :quantize, default: DEFAULT_QUANTIZE
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb b/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb
index 3724740c13f..be56354b725 100644
--- a/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb
@@ -14,33 +14,42 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
             option :comment_propagation do |o|
-              o.default do
-                ENV.fetch(
-                  Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE,
-                  Contrib::Propagation::SqlComment::Ext::DISABLED
-                )
-              end
+              o.env_var Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE
+              o.default Contrib::Propagation::SqlComment::Ext::DISABLED
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/pg/configuration/settings.rb b/lib/datadog/tracing/contrib/pg/configuration/settings.rb
index 0989997e1fb..c599dd7c8ac 100644
--- a/lib/datadog/tracing/contrib/pg/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/pg/configuration/settings.rb
@@ -14,33 +14,42 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
             end
 
             option :comment_propagation do |o|
-              o.default do
-                ENV.fetch(
-                  Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE,
-                  Contrib::Propagation::SqlComment::Ext::DISABLED
-                )
-              end
+              o.env_var Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE
+              o.default Contrib::Propagation::SqlComment::Ext::DISABLED
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/presto/configuration/settings.rb b/lib/datadog/tracing/contrib/presto/configuration/settings.rb
index c9e282c7c9a..cccfa5b47c7 100644
--- a/lib/datadog/tracing/contrib/presto/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/presto/configuration/settings.rb
@@ -12,21 +12,34 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/qless/configuration/settings.rb b/lib/datadog/tracing/contrib/qless/configuration/settings.rb
index e4b6882abe6..93b8d7e928a 100644
--- a/lib/datadog/tracing/contrib/qless/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/qless/configuration/settings.rb
@@ -12,19 +12,33 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :tag_job_data do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_JOB_DATA, false) }
+              o.env_var Ext::ENV_TAG_JOB_DATA
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :tag_job_tags do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_JOB_TAGS, false) }
+              o.env_var Ext::ENV_TAG_JOB_TAGS
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/que/configuration/settings.rb b/lib/datadog/tracing/contrib/que/configuration/settings.rb
index 6199e9c0f22..2eb8732bfdd 100644
--- a/lib/datadog/tracing/contrib/que/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/que/configuration/settings.rb
@@ -15,25 +15,43 @@ class Settings < Contrib::Configuration::Settings
             option :distributed_tracing, default: true
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :tag_args do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_ARGS_ENABLED, false) }
+              o.env_var Ext::ENV_TAG_ARGS_ENABLED
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :tag_data do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_DATA_ENABLED, false) }
+              o.env_var Ext::ENV_TAG_DATA_ENABLED
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
           end
         end
       end
diff --git a/lib/datadog/tracing/contrib/racecar/configuration/settings.rb b/lib/datadog/tracing/contrib/racecar/configuration/settings.rb
index dd62a9066f4..94f62e39ed6 100644
--- a/lib/datadog/tracing/contrib/racecar/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/racecar/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name do |o|
diff --git a/lib/datadog/tracing/contrib/rack/configuration/settings.rb b/lib/datadog/tracing/contrib/rack/configuration/settings.rb
index 821f85337da..54f84f58e7e 100644
--- a/lib/datadog/tracing/contrib/rack/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/rack/configuration/settings.rb
@@ -17,15 +17,27 @@ class Settings < Contrib::Configuration::Settings
             }.freeze
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :application
diff --git a/lib/datadog/tracing/contrib/rails/configuration/settings.rb b/lib/datadog/tracing/contrib/rails/configuration/settings.rb
index 67ff796f570..d1a6ff13645 100644
--- a/lib/datadog/tracing/contrib/rails/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/rails/configuration/settings.rb
@@ -24,11 +24,19 @@ def initialize(options = {})
             end
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
 
               o.on_set do |value|
                 # Update ActionPack analytics too
@@ -37,7 +45,12 @@ def initialize(options = {})
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
+
               o.on_set do |value|
                 # Update ActionPack analytics too
                 Datadog.configuration.tracing[:action_pack][:analytics_sample_rate] = value
diff --git a/lib/datadog/tracing/contrib/rake/configuration/settings.rb b/lib/datadog/tracing/contrib/rake/configuration/settings.rb
index d1c6e85dc5a..ab8e26bd9cd 100644
--- a/lib/datadog/tracing/contrib/rake/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/rake/configuration/settings.rb
@@ -14,15 +14,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :quantize, default: {}
@@ -33,7 +45,8 @@ class Settings < Contrib::Configuration::Settings
             # Automatically instrumenting all Rake tasks can lead to long-running tasks
             # causing undue memory accumulation, as the trace for such tasks is never flushed.
             option :tasks do |o|
-              o.default { [] }
+              o.default []
+
               o.on_set do |value|
                 # DEV: It should be possible to modify the value after it's set. E.g. for normalization.
                 options[:tasks].instance_variable_set(:@value, value.map(&:to_s).to_set)
diff --git a/lib/datadog/tracing/contrib/redis/configuration/settings.rb b/lib/datadog/tracing/contrib/redis/configuration/settings.rb
index 4b3a66f83d4..32be7811ad7 100644
--- a/lib/datadog/tracing/contrib/redis/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/redis/configuration/settings.rb
@@ -12,25 +12,42 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :command_args do |o|
-              o.default { env_to_bool(Ext::ENV_COMMAND_ARGS, true) }
+              o.env_var Ext::ENV_COMMAND_ARGS
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/resque/configuration/settings.rb b/lib/datadog/tracing/contrib/resque/configuration/settings.rb
index ee4ae91ef4d..adbdc0995ff 100644
--- a/lib/datadog/tracing/contrib/resque/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/resque/configuration/settings.rb
@@ -13,19 +13,31 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
           end
         end
       end
diff --git a/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb b/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb
index 33856633d9c..92237fd61a4 100644
--- a/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb
@@ -12,23 +12,36 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default do
+              o.env_var Ext::ENV_SERVICE_NAME
+              o.setter do |value|
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  Ext::ENV_SERVICE_NAME,
+                  value,
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
diff --git a/lib/datadog/tracing/contrib/roda/configuration/settings.rb b/lib/datadog/tracing/contrib/roda/configuration/settings.rb
index cb1f6e5f0bd..65e9836fa34 100644
--- a/lib/datadog/tracing/contrib/roda/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/roda/configuration/settings.rb
@@ -11,15 +11,27 @@ module Configuration
           # Custom settings for the Roda integration
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb b/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb
index 7afa99e715f..70272462f16 100644
--- a/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb
@@ -12,7 +12,11 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/sequel/configuration/settings.rb b/lib/datadog/tracing/contrib/sequel/configuration/settings.rb
index 1a1af2ca85e..0a21bc91dfd 100644
--- a/lib/datadog/tracing/contrib/sequel/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/sequel/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb b/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb
index fd262758f81..aa2e8ca0aca 100644
--- a/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb
@@ -13,19 +13,31 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
             option :tag_body, default: false
           end
         end
diff --git a/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb b/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb
index 83ce8db690f..c6c3179137b 100644
--- a/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb
@@ -13,24 +13,40 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :tag_args do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_JOB_ARGS, false) }
+              o.env_var Ext::ENV_TAG_JOB_ARGS
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :service_name
             option :client_service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
             option :quantize, default: {}
             option :distributed_tracing, default: false
           end
diff --git a/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb b/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb
index 44900cc0a19..4dd5f501bb9 100644
--- a/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb
@@ -14,15 +14,27 @@ class Settings < Contrib::Configuration::Settings
             }.freeze
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :distributed_tracing, default: true
diff --git a/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb b/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb
index f4215a97f3c..ebab031a0d2 100644
--- a/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb
@@ -11,19 +11,31 @@ module Configuration
           # Default settings for the Shoryuken integration
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
-            option :error_handler, experimental_default_proc: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
             option :tag_body, default: false
           end
         end
diff --git a/lib/datadog/tracing/contrib/span_attribute_schema.rb b/lib/datadog/tracing/contrib/span_attribute_schema.rb
index dd850f3a04f..920dd74bf4e 100644
--- a/lib/datadog/tracing/contrib/span_attribute_schema.rb
+++ b/lib/datadog/tracing/contrib/span_attribute_schema.rb
@@ -7,14 +7,14 @@ module Contrib
       module SpanAttributeSchema
         module_function
 
-        def fetch_service_name(env, default)
-          ENV.fetch(env) do
-            if Datadog.configuration.tracing.span_attribute_schema ==
-                Tracing::Configuration::Ext::SpanAttributeSchema::VERSION_ONE
-              Datadog.configuration.service
-            else
-              default
-            end
+        def fetch_service_name(value, default)
+          if value
+            value
+          elsif Datadog.configuration.tracing.span_attribute_schema ==
+              Tracing::Configuration::Ext::SpanAttributeSchema::VERSION_ONE
+            Datadog.configuration.service
+          else
+            default
           end
         end
 
diff --git a/lib/datadog/tracing/contrib/stripe/configuration/settings.rb b/lib/datadog/tracing/contrib/stripe/configuration/settings.rb
index 4c38a7af540..1017b93fb8f 100644
--- a/lib/datadog/tracing/contrib/stripe/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/stripe/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
           end
         end
diff --git a/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb b/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb
index 8005bb46050..d1bf269bc37 100644
--- a/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb
+++ b/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb
@@ -12,15 +12,27 @@ module Configuration
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+              o.env_var Ext::ENV_ENABLED
+              o.default true
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+              o.env_var Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+              o.setter do |value|
+                val_to_bool(value)
+              end
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+              o.env_var Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+              o.setter do |value|
+                val_to_float(value)
+              end
             end
 
             option :service_name
diff --git a/spec/datadog/appsec/configuration/settings_spec.rb b/spec/datadog/appsec/configuration/settings_spec.rb
index 45ebf410a8d..074d0c86992 100644
--- a/spec/datadog/appsec/configuration/settings_spec.rb
+++ b/spec/datadog/appsec/configuration/settings_spec.rb
@@ -75,7 +75,7 @@ def patcher
       end
 
       context 'when given a truthy value' do
-        let(:appsec_enabled) { 'enabled' }
+        let(:appsec_enabled) { true }
 
         before { set_appsec_enabled }
 
@@ -342,7 +342,7 @@ def patcher
       end
 
       context 'when given a truthy value' do
-        let(:appsec_waf_debug) { 'waf_debug' }
+        let(:appsec_waf_debug) { true }
 
         before { set_appsec_waf_debug }
 
diff --git a/spec/datadog/core/configuration/settings_spec.rb b/spec/datadog/core/configuration/settings_spec.rb
index 0b995633395..437061ab578 100644
--- a/spec/datadog/core/configuration/settings_spec.rb
+++ b/spec/datadog/core/configuration/settings_spec.rb
@@ -516,7 +516,7 @@
         it 'logs a warning informing customers this has been deprecated for removal' do
           expect(Datadog.logger).to receive(:warn).with(/deprecated for removal/)
 
-          settings.profiling.advanced.force_enable_legacy_profiler = 1234
+          settings.profiling.advanced.force_enable_legacy_profiler = true
         end
 
         context 'when value is set to false' do
@@ -1273,7 +1273,7 @@
         context 'is not defined' do
           let(:env_var_value) { nil }
 
-          it { is_expected.to be 60 }
+          it { is_expected.to be 60.0 }
         end
 
         context 'is defined' do
diff --git a/spec/datadog/core/diagnostics/environment_logger_spec.rb b/spec/datadog/core/diagnostics/environment_logger_spec.rb
index eb2eefa3982..2ea4da15bd7 100644
--- a/spec/datadog/core/diagnostics/environment_logger_spec.rb
+++ b/spec/datadog/core/diagnostics/environment_logger_spec.rb
@@ -2,6 +2,7 @@
 
 require 'datadog/core/diagnostics/environment_logger'
 require 'ddtrace/transport/io'
+require 'datadog/profiling/profiler'
 
 RSpec.describe Datadog::Core::Diagnostics::EnvironmentLogger do
   subject(:env_logger) { described_class }
diff --git a/spec/datadog/core/telemetry/collector_spec.rb b/spec/datadog/core/telemetry/collector_spec.rb
index 8128c4134b6..e0d7a83679d 100644
--- a/spec/datadog/core/telemetry/collector_spec.rb
+++ b/spec/datadog/core/telemetry/collector_spec.rb
@@ -10,6 +10,7 @@
 require 'datadog/core/telemetry/v1/integration'
 require 'datadog/core/telemetry/v1/product'
 require 'ddtrace/transport/ext'
+require 'datadog/profiling/profiler'
 
 require 'ddtrace'
 require 'ddtrace/version'