Skip to content

Commit c909b1a

Browse files
committed
Reapply "Use shorthand configuration access"
This reverts commit 866c888. It's missing a require_relative
1 parent 6811a33 commit c909b1a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def on_start(span, event, _id, payload)
8181

8282
span.set_tag('EVENT', event)
8383

84-
set_cache_key(span, key, mapping[:multi_key]) if Datadog.configuration.tracing[:active_support][:cache_key_enabled]
84+
set_cache_key(span, key, mapping[:multi_key]) if configuration[:cache_key_enabled]
8585
rescue StandardError => e
8686
Datadog.logger.error(e.message)
8787
Datadog::Core::Telemetry::Logger.report(e)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require_relative '../../../../core/utils'
44
require_relative '../../../metadata/ext'
55
require_relative '../ext'
6+
require_relative 'event'
67

78
module Datadog
89
module Tracing
@@ -59,7 +60,7 @@ def trace(action, store, key: nil, multi_key: nil)
5960

6061
span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
6162

62-
set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key_enabled]
63+
set_cache_key(span, key, multi_key) if configuration[:cache_key_enabled]
6364

6465
yield
6566
end

0 commit comments

Comments
 (0)