Swap to grouped cache_key settings

Author: bouwkast

lib/datadog/tracing/contrib/active_support/cache/events/cache.rb

@@ -81,7 +81,9 @@ def on_start(span, event, _id, payload)
 
                 span.set_tag('EVENT', event)
 
-                set_cache_key(span, key, mapping[:multi_key]) if configuration[:cache_key_enabled]
+                if Datadog.configuration.tracing[:active_support][:cache_key].enabled
+                  set_cache_key(span, key, mapping[:multi_key])
+                end
               rescue StandardError => e
                 Datadog.logger.error(e.message)
                 Datadog::Core::Telemetry::Logger.report(e)

lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -60,7 +60,7 @@ def trace(action, store, key: nil, multi_key: nil)
 
                 span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
 
-                set_cache_key(span, key, multi_key) if configuration[:cache_key_enabled]
+                set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key].enabled
 
                 yield
               end

lib/datadog/tracing/contrib/active_support/configuration/settings.rb

@@ -40,9 +40,14 @@ class Settings < Contrib::Configuration::Settings
               end
             end
 
-            option :cache_key_enabled do |o|
-              o.type :bool
-              o.default true
+            # grouped "cache_key.*" settings
+            settings :cache_key do
+              # enable or disabling the inclusion of the cache_key in the span
+              option :enabled do |o|
+                # cache_key.enabled
+                o.type :bool
+                o.default true
+              end
             end
           end
         end