activesupport 7.2.3.1 → 8.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 261d0e3b9b660e219ce3e59ae3cbc65626e77898ecfd1f8dc7c8ed96e4121b0c
-  data.tar.gz: 8c4d30dde1dab152e5584ec01c9c0863b4a3b9b6451ae0e068d0a3091a3c66a1
+  metadata.gz: cb0921bb41abade78e004303dc1f7fb4f2ea47dd3f30effe50934cff4d99491e
+  data.tar.gz: 64520b181d47ce4b0d61fa734ed07d69ef3da8e9da43b9f205893273ce2dc683
 SHA512:
-  metadata.gz: 3947053b6497e31d25efbaba030b6a0e2fd01a0e1fe260256efd775964cb0df6542b93de6a87da65b1f2385695a3bdbbdd5d829eb4fa6c4ee6af55dca88d1ba2
-  data.tar.gz: bcc914be8d4e83f8ded6c746568b91e7a80578437045c145f9dd9c811b3f17d40485080e5566b536b8505a787e91a611597fdf19de129e6c02be7c91e23bfbfe
+  metadata.gz: 87f65a473e188c7eaa1335595ab2e24027a7b9fd1cd203f195cb895e00e56b0e67f338df288087f87b7be127680304e2d71b347fbd3f8b3b8aae0a3199333de6
+  data.tar.gz: a8b5a241aab71e727ecf824e35bb1833e9fc50156872d2ba5e6c03a5ade4071d0a9f17ca12c297a2ee94368ec877590c9485af9a3e4004ce2b9b8d3ce5aff3dc

data/CHANGELOG.md

@@ -1,4 +1,42 @@
-## Rails 7.2.3.1 (March 23, 2026) ##
+## Rails 8.0.5.1 (July 29, 2026) ##
+
+*   No changes.
+
+
+## Rails 8.0.5 (March 24, 2026) ##
+
+*   Fix inflections to better handle overlapping acronyms.
+
+    ```ruby
+    ActiveSupport::Inflector.inflections(:en) do |inflect|
+      inflect.acronym "USD"
+      inflect.acronym "USDC"
+    end
+
+    "USDC".underscore # => "usdc"
+    ```
+
+    *Said Kaldybaev*
+
+*   Silence Dalli 4.0+ warning when using `ActiveSupport::Cache::MemCacheStore`.
+
+    *zzak*
+
+*   Make `delegate` and `delegate_missing_to` work in BasicObject subclasses.
+
+    *Rafael Mendonça França*
+
+*   Fix `ActiveSupport::Inflector.humanize` with international characters.
+
+    ```ruby
+    ActiveSupport::Inflector.humanize("áÉÍÓÚ")  # => "Áéíóú"
+    ActiveSupport::Inflector.humanize("аБВГДЕ") # => "Абвгде"
+    ```
+
+    *Jose Luis Duran*
+
+
+## Rails 8.0.4.1 (March 23, 2026) ##
 
 *   Reject scientific notation in NumberConverter
 
@@ -19,7 +57,7 @@
     *Jean Boussier*
 
 
-## Rails 7.2.3 (October 28, 2025) ##
+## Rails 8.0.4 (October 28, 2025) ##
 
 *   Fix `Enumerable#sole` to return the full tuple instead of just the first element of the tuple.
 
@@ -32,6 +70,22 @@
 
     *Joshua Young*
 
+*   Fix `NameError` when `class_attribute` is defined on instance singleton classes.
+
+    Previously, calling `class_attribute` on an instance's singleton class would raise
+    a `NameError` when accessing the attribute through the instance.
+
+    ```ruby
+    object = MyClass.new
+    object.singleton_class.class_attribute :foo, default: "bar"
+    object.foo # previously raised NameError, now returns "bar"
+    ```
+
+    *Joshua Young*
+
+
+## Rails 8.0.3 (September 22, 2025) ##
+
 *   `ActiveSupport::FileUpdateChecker` does not depend on `Time.now` to prevent unnecessary reloads with time travel test helpers
 
     *Jan Grodowski*
@@ -40,6 +94,10 @@
 
     *Jared Armstrong*
 
+*   Make `ActiveSupport::Logger` `#freeze`-friendly.
+
+    *Joshua Young*
+
 *   Fix `ActiveSupport::HashWithIndifferentAccess#transform_keys!` removing defaults.
 
     *Hartley McGuire*
@@ -60,17 +118,57 @@
 
     ```ruby
     >> {a: 1, b: 2}.with_indifferent_access.transform_keys!(&:succ)
-    => {"c" => 1, "d" => 2}
+    => {"b" => 1, "c" => 2}
     ```
 
     *Jason T Johnson*, *Jean Boussier*
 
+    **Note on overwrite precedence:**
+
+    This fix also changed the overwrite precedence when distinct keys are transformed into the same key.
+    The later key now overwrites the earlier one (matching standard Ruby `Hash` behavior).
+    Previously, the earlier key's value was preserved.
+
+    Before:
+
+    ```ruby
+    >> {XY: 1, xy: 2}.with_indifferent_access.transform_keys!(&:downcase)
+    => {"xy"=>1}
+    ```
+
+    After:
+
+    ```ruby
+    >> {XY: 1, xy: 2}.with_indifferent_access.transform_keys!(&:downcase)
+    => {"xy"=>2}
+    ```
+
 *   Fix `ActiveSupport::Cache::MemCacheStore#read_multi` to handle network errors.
 
     This method specifically wasn't handling network errors like other codepaths.
 
     *Alessandro Dal Grande*
 
+*   Fix configuring `RedisCacheStore` with `raw: true`.
+
+    *fatkodima*
+
+*   Fix `Enumerable#sole` for infinite collections.
+
+    *fatkodima*
+
+
+## Rails 8.0.2.1 (August 13, 2025) ##
+
+*   No changes.
+
+
+## Rails 8.0.2 (March 12, 2025) ##
+
+*   Fix setting `to_time_preserves_timezone` from `new_framework_defaults_8_0.rb`.
+
+    *fatkodima*
+
 *   Fix Active Support Cache `fetch_multi` when local store is active.
 
     `fetch_multi` now properly yield to the provided block for missing entries
@@ -157,297 +255,161 @@
 
     *Jean Boussier*
 
-*   Fix a bug in `ERB::Util.tokenize` that causes incorrect tokenization when ERB tags are preceeded by multibyte characters.
-
-    *Martin Emde*
-
-
-## Rails 7.2.2.2 (August 13, 2025) ##
-
-*   No changes.
 
+## Rails 8.0.1 (December 13, 2024) ##
 
-## Rails 7.2.2.1 (December 10, 2024) ##
+*   Fix a bug in `ERB::Util.tokenize` that causes incorrect tokenization when ERB tags are preceeded by multibyte characters.
 
-*   No changes.
+    *Martin Emde*
 
+*   Restore the ability to decorate methods generated by `class_attribute`.
 
-## Rails 7.2.2 (October 30, 2024) ##
+    It always has been complicated to use Module#prepend or an alias method chain
+    to decorate methods defined by `class_attribute`, but became even harder in 8.0.
 
-*   Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
+    This capability is now supported for both reader and writer methods.
 
-    *Adam Renberg Tamm*
-
-*   Print test names when running `rails test -v` for parallel tests.
-
-    *John Hawthorn*, *Abeid Ahmed*
+    *Jean Boussier*
 
 
-## Rails 7.2.1.2 (October 23, 2024) ##
+## Rails 8.0.0.1 (December 10, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.2.1.1 (October 15, 2024) ##
+## Rails 8.0.0 (November 07, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.2.1 (August 22, 2024) ##
+## Rails 8.0.0.rc2 (October 30, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.2.0 (August 09, 2024) ##
-
-*   Fix `delegate_missing_to allow_nil: true` when called with implict self
-
-    ```ruby
-    class Person
-      delegate_missing_to :address, allow_nil: true
-
-      def address
-        nil
-      end
-
-      def berliner?
-        city == "Berlin"
-      end
-    end
-
-    Person.new.city # => nil
-    Person.new.berliner? # undefined local variable or method `city' for an instance of Person (NameError)
-    ```
-
-    *Jean Boussier*
-
-*   Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
-
-    *Earlopain*
-
-*   Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
+## Rails 8.0.0.rc1 (October 19, 2024) ##
 
-    *Xavier Noria*
-
-*   Support `duration` type in `ActiveSupport::XmlMini`.
-
-    *heka1024*
-
-*   Remove deprecated `ActiveSupport::Notifications::Event#children` and  `ActiveSupport::Notifications::Event#parent_of?`.
+*   Remove deprecated support to passing an array of strings to `ActiveSupport::Deprecation#warn`.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated support to call the following methods without passing a deprecator:
-
-    - `deprecate`
-    - `deprecate_constant`
-    - `ActiveSupport::Deprecation::DeprecatedObjectProxy.new`
-    - `ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new`
-    - `ActiveSupport::Deprecation::DeprecatedConstantProxy.new`
-    - `assert_deprecated`
-    - `assert_not_deprecated`
-    - `collect_deprecations`
+*   Remove deprecated support to setting `attr_internal_naming_format` with a `@` prefix.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `ActiveSupport::Deprecation` delegation to instance.
+*   Remove deprecated `ActiveSupport::ProxyObject`.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `SafeBuffer#clone_empty`.
-
-    *Rafael Mendonça França*
+*   Don't execute i18n watcher on boot. It shouldn't catch any file changes initially,
+    and unnecessarily slows down boot of applications with lots of translations.
 
-*   Remove deprecated `#to_default_s` from `Array`, `Date`, `DateTime` and `Time`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `config.active_support.remove_deprecated_time_with_zone_name`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `config.active_support.disable_to_s_conversion`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated support to bolding log text with positional boolean in `ActiveSupport::LogSubscriber#color`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated constants `ActiveSupport::LogSubscriber::CLEAR` and `ActiveSupport::LogSubscriber::BOLD`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated support for `config.active_support.cache_format_version = 6.1`.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `:pool_size` and `:pool_timeout` options for the cache storage.
-
-    *Rafael Mendonça França*
+    *Gannon McGibbon*, *David Stosik*
 
-*   Warn on tests without assertions.
+*   Fix `ActiveSupport::HashWithIndifferentAccess#stringify_keys` to stringify all keys not just symbols.
 
-    `ActiveSupport::TestCase` now warns when tests do not run any assertions.
-    This is helpful in detecting broken tests that do not perform intended assertions.
+    Previously:
 
-    *fatkodima*
-
-*   Support `hexBinary` type in `ActiveSupport::XmlMini`.
-
-    *heka1024*
-
-*   Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
-
-    *Earlopain*
-
-*   `stub_const` now accepts a `exists: false` parameter to allow stubbing missing constants.
-
-    *Jean Boussier*
-
-*   Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
-
-    Previously the copy would still share the internal silencers and filters array,
-    causing state to leak.
-
-    *Jean Boussier*
-
-*   Updating Astana with Western Kazakhstan TZInfo identifier.
-
-    *Damian Nelson*
+    ```ruby
+    { 1 => 2 }.with_indifferent_access.stringify_keys[1] # => 2
+    ```
 
-*   Add filename support for `ActiveSupport::Logger.logger_outputs_to?`.
+    After this change:
 
     ```ruby
-    logger = Logger.new('/var/log/rails.log')
-    ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
+    { 1 => 2 }.with_indifferent_access.stringify_keys["1"] # => 2
     ```
 
-    *Christian Schmidt*
+    This change can be seen as a bug fix, but since it behaved like this for a very long time, we're deciding
+    to not backport the fix and to make the change in a major release.
 
-*   Include `IPAddr#prefix` when serializing an `IPAddr` using the
-    `ActiveSupport::MessagePack` serializer.
+    *Jean Boussier*
 
-    This change is backward and forward compatible — old payloads can
-    still be read, and new payloads will be readable by older versions of Rails.
+## Rails 8.0.0.beta1 (September 26, 2024) ##
 
-    *Taiki Komaba*
+*   Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
 
-*   Add `default:` support for `ActiveSupport::CurrentAttributes.attribute`.
+    *Adam Renberg Tamm*
 
-    ```ruby
-    class Current < ActiveSupport::CurrentAttributes
-      attribute :counter, default: 0
-    end
-    ```
+*   Print test names when running `rails test -v` for parallel tests.
 
-    *Sean Doyle*
+    *John Hawthorn*, *Abeid Ahmed*
 
-*   Yield instance to `Object#with` block.
+*   Deprecate `Benchmark.ms` core extension.
 
-    ```ruby
-    client.with(timeout: 5_000) do |c|
-      c.get("/commits")
-    end
-    ```
+    The `benchmark` gem will become bundled in Ruby 3.5
 
-    *Sean Doyle*
+    *Earlopain*
 
-*   Use logical core count instead of physical core count to determine the
-    default number of workers when parallelizing tests.
+*   `ActiveSupport::TimeWithZone#inspect` now uses ISO 8601 style time like `Time#inspect`
 
-    *Jonathan Hefner*
+    *John Hawthorn*
 
-*   Fix `Time.now/DateTime.now/Date.today` to return results in a system timezone after `#travel_to`.
+*   `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
 
-    There is a bug in the current implementation of #travel_to:
-    it remembers a timezone of its argument, and all stubbed methods start
-    returning results in that remembered timezone. However, the expected
-    behavior is to return results in a system timezone.
+    Previously reporting an un-raised exception would result in an error report without
+    a backtrace. Now it automatically generates one.
 
-    *Aleksei Chernenkov*
+    *Jean Boussier*
 
-*   Add `ErrorReported#unexpected` to report precondition violations.
+*   Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
 
-    For example:
+    This allows for overriding the global configuration found at
+    `ActiveSupport.escape_html_entities_in_json` for specific calls to `to_json`.
 
+    This should be usable from controllers in the following manner:
     ```ruby
-    def edit
-      if published?
-        Rails.error.unexpected("[BUG] Attempting to edit a published article, that shouldn't be possible")
-        return false
+    class MyController < ApplicationController
+      def index
+        render json: { hello: "world" }, escape_html_entities: false
       end
-      # ...
     end
     ```
 
-    The above will raise an error in development and test, but only report the error in production.
+    *Nigel Baillie*
 
-    *Jean Boussier*
+*   Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
 
-*   Make the order of read_multi and write_multi notifications for `Cache::Store#fetch_multi` operations match the order they are executed in.
+    As is the case when trying to use an Integer or Float as a key, which is unsupported.
 
-    *Adam Renberg Tamm*
-
-*   Make return values of `Cache::Store#write` consistent.
-
-    The return value was not specified before. Now it returns `true` on a successful write,
-    `nil` if there was an error talking to the cache backend, and `false` if the write failed
-    for another reason (e.g. the key already exists and `unless_exist: true` was passed).
-
-    *Sander Verdonschot*
-
-*   Fix logged cache keys not always matching actual key used by cache action.
-
-    *Hartley McGuire*
+    *zzak*
 
-*   Improve error messages of `assert_changes` and `assert_no_changes`.
+*   Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
 
-    `assert_changes` error messages now display objects with `.inspect` to make it easier
-    to differentiate nil from empty strings, strings from symbols, etc.
-    `assert_no_changes` error messages now surface the actual value.
+    Previously adding time instances together such as `10.days.ago + 10.days.ago` or `10.days.ago.since(10.days.ago)` produced a nonsensical future date. This behavior is deprecated and will be removed in Rails 8.1.
 
-    *pcreux*
+    *Nick Schwaderer*
 
-*   Fix `#to_fs(:human_size)` to correctly work with negative numbers.
+*   Support rfc2822 format for Time#to_fs & Date#to_fs.
 
-    *Earlopain*
+    *Akshay Birajdar*
 
-*   Fix `BroadcastLogger#dup` so that it duplicates the logger's `broadcasts`.
+*   Optimize load time for `Railtie#initialize_i18n`. Filter `I18n.load_path`s passed to the file watcher to only those
+    under `Rails.root`. Previously the watcher would grab all available locales, including those in gems
+    which do not require a watcher because they won't change.
 
-    *Andrew Novoselac*
+    *Nick Schwaderer*
 
-*   Fix issue where `bootstrap.rb` overwrites the `level` of a `BroadcastLogger`'s `broadcasts`.
+*   Add a `filter` option to `in_order_of` to prioritize certain values in the sorting without filtering the results
+    by these values.
 
-    *Andrew Novoselac*
+    *Igor Depolli*
 
-*   Fix compatibility with the `semantic_logger` gem.
+*   Improve error message when using `assert_difference` or `assert_changes` with a
+    proc by printing the proc's source code (MRI only).
 
-    The `semantic_logger` gem doesn't behave exactly like stdlib logger in that
-    `SemanticLogger#level` returns a Symbol while stdlib `Logger#level` returns an Integer.
+    *Richard Böhme*, *Jean Boussier*
 
-    This caused the various `LogSubscriber` classes in Rails to break when assigned a
-    `SemanticLogger` instance.
+*   Add a new configuration value `:zone` for `ActiveSupport.to_time_preserves_timezone` and rename the previous `true` value to `:offset`. The new default value is `:zone`.
 
-    *Jean Boussier*, *ojab*
+    *Jason Kim*, *John Hawthorn*
 
-*   Fix MemoryStore to prevent race conditions when incrementing or decrementing.
+*   Align instrumentation `payload[:key]` in ActiveSupport::Cache to follow the same pattern, with namespaced and normalized keys.
 
-    *Pierre Jambet*
+    *Frederik Erbs Spang Thomsen*
 
-*   Implement `HashWithIndifferentAccess#to_proc`.
+*   Fix `travel_to` to set usec 0 when `with_usec` is `false` and the given argument String or DateTime.
 
-    Previously, calling `#to_proc` on `HashWithIndifferentAccess` object used inherited `#to_proc`
-    method from the `Hash` class, which was not able to access values using indifferent keys.
-
-    *fatkodima*
+    *mopp*
 
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activesupport/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/activesupport/CHANGELOG.md) for previous changes.

data/lib/active_support/backtrace_cleaner.rb

@@ -18,7 +18,7 @@ module ActiveSupport
   #
   #   bc = ActiveSupport::BacktraceCleaner.new
   #   root = "#{Rails.root}/"
-  #   bc.add_filter   { |line| line.start_with?(root) ? line.from(root.size) : line } # strip the Rails.root prefix
+  #   bc.add_filter   { |line| line.delete_prefix(root) } # strip the Rails.root prefix
   #   bc.add_silencer { |line| /puma|rubygems/.match?(line) } # skip any lines from puma or rubygems
   #   bc.clean(exception.backtrace) # perform the cleanup
   #

data/lib/active_support/benchmark.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveSupport
+  module Benchmark # :nodoc:
+    # Benchmark realtime in the specified time unit. By default,
+    # the returned unit is in seconds.
+    #
+    #   ActiveSupport::Benchmark.realtime { sleep 0.1 }
+    #   # => 0.10007
+    #
+    #   ActiveSupport::Benchmark.realtime(:float_millisecond) { sleep 0.1 }
+    #   # => 100.07
+    #
+    # `unit` can be any of the values accepted by Ruby's `Process.clock_gettime`.
+    def self.realtime(unit = :float_second, &block)
+      time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
+      yield
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, unit) - time_start
+    end
+  end
+end

data/lib/active_support/benchmarkable.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/benchmark"
 require "active_support/core_ext/hash/keys"
 
 module ActiveSupport
@@ -41,7 +40,9 @@ module ActiveSupport
         options[:level] ||= :info
 
         result = nil
-        ms = Benchmark.ms { result = options[:silence] ? logger.silence(&block) : yield }
+        ms = ActiveSupport::Benchmark.realtime(:float_millisecond) do
+          result = options[:silence] ? logger.silence(&block) : yield
+        end
         logger.public_send(options[:level], "%s (%.1fms)" % [ message, ms ])
         result
       else

data/lib/active_support/cache/file_store.rb

@@ -58,7 +58,12 @@ module ActiveSupport
       #   cache.increment("baz") # => 6
       #
       def increment(name, amount = 1, **options)
-        modify_value(name, amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+
+        instrument(:increment, key, amount: amount) do
+          modify_value(name, amount, options)
+        end
       end
 
       # Decrement a cached integer value. Returns the updated value.
@@ -73,7 +78,12 @@ module ActiveSupport
       #   cache.decrement("baz") # => 4
       #
       def decrement(name, amount = 1, **options)
-        modify_value(name, -amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+
+        instrument(:decrement, key, amount: amount) do
+          modify_value(name, -amount, options)
+        end
       end
 
       def delete_matched(matcher, options = nil)

data/lib/active_support/cache/mem_cache_store.rb

@@ -60,7 +60,7 @@ module ActiveSupport
         pool_options = retrieve_pool_options(options)
 
         if pool_options
-          ConnectionPool.new(pool_options) { Dalli::Client.new(addresses, options.merge(threadsafe: false)) }
+          ConnectionPool.new(**pool_options) { Dalli::Client.new(addresses, options.merge(threadsafe: false)) }
         else
           Dalli::Client.new(addresses, options)
         end
@@ -90,6 +90,9 @@ module ActiveSupport
         # The value "compress: false" prevents duplicate compression within Dalli.
         @mem_cache_options[:compress] = false
         (OVERRIDDEN_OPTIONS - %i(compress)).each { |name| @mem_cache_options.delete(name) }
+        # Set the default serializer for Dalli to prevent warning about
+        # inheriting the default serializer.
+        @mem_cache_options[:serializer] = Marshal
         @data = self.class.build_mem_cache(*(addresses + [@mem_cache_options]))
       end
 

data/lib/active_support/cache/memory_store.rb

@@ -147,7 +147,9 @@ module ActiveSupport
       #   cache.increment("baz") # => 6
       #
       def increment(name, amount = 1, **options)
-        modify_value(name, amount, **options)
+        instrument(:increment, name, amount: amount) do
+          modify_value(name, amount, **options)
+        end
       end
 
       # Decrement a cached integer value. Returns the updated value.
@@ -162,7 +164,9 @@ module ActiveSupport
       #   cache.decrement("baz") # => 4
       #
       def decrement(name, amount = 1, **options)
-        modify_value(name, -amount, **options)
+        instrument(:decrement, name, amount: amount) do
+          modify_value(name, -amount, **options)
+        end
       end
 
       # Deletes cache entries if the cache key matches a given pattern.

data/lib/active_support/cache/redis_cache_store.rb

@@ -150,7 +150,7 @@ module ActiveSupport
         universal_options = redis_options.extract!(*UNIVERSAL_OPTIONS)
 
         if pool_options = self.class.send(:retrieve_pool_options, redis_options)
-          @redis = ::ConnectionPool.new(pool_options) { self.class.build_redis(**redis_options) }
+          @redis = ::ConnectionPool.new(**pool_options) { self.class.build_redis(**redis_options) }
         else
           @redis = self.class.build_redis(**redis_options)
         end
@@ -173,9 +173,12 @@ module ActiveSupport
         return {} if names.empty?
 
         options = names.extract_options!
-        instrument_multi(:read_multi, names, options) do |payload|
+        options = merged_options(options)
+        keys    = names.map { |name| normalize_key(name, options) }
+
+        instrument_multi(:read_multi, keys, options) do |payload|
           read_multi_entries(names, **options).tap do |results|
-            payload[:hits] = results.keys
+            payload[:hits] = results.keys.map { |name| normalize_key(name, options) }
           end
         end
       end