Revert "Use shorthand configuration access"

This reverts commit 1f31567. This didn't work.
DataDog · Oct 23, 2024 · 866c888 · 866c888
1 parent 1c823a0
commit 866c888
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb b/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb
@@ -81,7 +81,7 @@ 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]
+                set_cache_key(span, key, mapping[:multi_key]) if Datadog.configuration.tracing[:active_support][:cache_key_enabled]
               rescue StandardError => e
                 Datadog.logger.error(e.message)
                 Datadog::Core::Telemetry::Logger.report(e)

diff --git a/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb b/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb
@@ -59,7 +59,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
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,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
@@ Expand Down @@