sidekiq 7.0.4 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e461cc2bc3884aff75bfd57ffb8039f8695e364d34f84e8522cd2fb3ffb8266e
-  data.tar.gz: bd752a0cc1d6a5be73e51cca34636413db291f92de0bc0723e3cb95b7a34f9dc
+  metadata.gz: fce9a2bde54477663fcf80408ba57e3653b7cabad880d442a931f92725c1ee3c
+  data.tar.gz: 5f3d322fa77edd6dc83e00f5f3c5c1d2e275830065e4637b778e726f2a08c608
 SHA512:
-  metadata.gz: d71996bea6ee081ab98bf626e0aa3bf3722e4ff1683b982bab4fd43abf371145573f7cd09392688f1db6739c57d3ceaf04834a605264db8c02747bd3eb623350
-  data.tar.gz: 81a1727add73469a9c2ea14b868e08f99c4b50b3cbc31f6277b312c055d207e285cc8b0ef749bb39b65ba832863b9ef05e7427147642bd7b9795344511b274d7
+  metadata.gz: 801864880ce896e750649e489d9b0f23e04a0c55ca1f3b3d13282dc71aa495cb7937027843321e10a02027d9316c7bb4f6399b1a58c4a1f66a1a4ca85440d66e
+  data.tar.gz: dcab086da52aca3518371632fc92dd469d22266f4b0728ec44ae5c42fbdbfe49485ed0c9244d8d0252b7203ef618304832cf8fb0d1bd95d0368f78bbbd10b7ca

data/Changes.md

@@ -2,7 +2,12 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
-HEAD
+7.0.5
+----------
+
+- More context for debugging json unsafe errors [#5787]
+
+7.0.4
 ----------
 
 - Performance and memory optimizations [#5768, fatkodima]

data/lib/sidekiq/job_util.rb

@@ -17,19 +17,23 @@ module Sidekiq
 
     def verify_json(item)
       job_class = item["wrapped"] || item["class"]
-      if Sidekiq::Config::DEFAULTS[:on_complex_arguments] == :raise
-        unless json_safe?(item["args"])
+      args = item["args"]
+      mode = Sidekiq::Config::DEFAULTS[:on_complex_arguments]
+
+      if mode == :raise || mode == :warn
+        if (unsafe_item = json_unsafe?(args))
           msg = <<~EOM
-            Job arguments to #{job_class} must be native JSON types, see https://github.com/sidekiq/sidekiq/wiki/Best-Practices.
+            Job arguments to #{job_class} must be native JSON types, but #{unsafe_item.inspect} is a #{unsafe_item.class}.
+            See https://github.com/sidekiq/sidekiq/wiki/Best-Practices.
             To disable this error, add `Sidekiq.strict_args!(false)` to your initializer.
           EOM
-          raise(ArgumentError, msg)
+
+          if mode == :raise
+            raise(ArgumentError, msg)
+          else
+            warn(msg)
+          end
         end
-      elsif Sidekiq::Config::DEFAULTS[:on_complex_arguments] == :warn
-        warn <<~EOM unless json_safe?(item["args"])
-          Job arguments to #{job_class} must be native JSON types, see https://github.com/sidekiq/sidekiq/wiki/Best-Practices.
-          To disable this warning, add `Sidekiq.strict_args!(false)` to your initializer.
-        EOM
       end
     end
 
@@ -65,27 +69,37 @@ module Sidekiq
 
     private
 
-    RECURSIVE_JSON_SAFE = {
-      Integer => ->(val) { true },
-      Float => ->(val) { true },
-      TrueClass => ->(val) { true },
-      FalseClass => ->(val) { true },
-      NilClass => ->(val) { true },
-      String => ->(val) { true },
+    RECURSIVE_JSON_UNSAFE = {
+      Integer => ->(val) {},
+      Float => ->(val) {},
+      TrueClass => ->(val) {},
+      FalseClass => ->(val) {},
+      NilClass => ->(val) {},
+      String => ->(val) {},
       Array => ->(val) {
-        val.all? { |e| RECURSIVE_JSON_SAFE[e.class].call(e) }
+        val.each do |e|
+          unsafe_item = RECURSIVE_JSON_UNSAFE[e.class].call(e)
+          return unsafe_item unless unsafe_item.nil?
+        end
+        nil
       },
       Hash => ->(val) {
-        val.all? { |k, v| String === k && RECURSIVE_JSON_SAFE[v.class].call(v) }
+        val.each do |k, v|
+          return k unless String === k
+
+          unsafe_item = RECURSIVE_JSON_UNSAFE[v.class].call(v)
+          return unsafe_item unless unsafe_item.nil?
+        end
+        nil
       }
     }
 
-    RECURSIVE_JSON_SAFE.default = ->(_val) { false }
-    RECURSIVE_JSON_SAFE.compare_by_identity
-    private_constant :RECURSIVE_JSON_SAFE
+    RECURSIVE_JSON_UNSAFE.default = ->(val) { val }
+    RECURSIVE_JSON_UNSAFE.compare_by_identity
+    private_constant :RECURSIVE_JSON_UNSAFE
 
-    def json_safe?(item)
-      RECURSIVE_JSON_SAFE[item.class].call(item)
+    def json_unsafe?(item)
+      RECURSIVE_JSON_UNSAFE[item.class].call(item)
     end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.0.4"
+  VERSION = "7.0.6"
   MAJOR = 7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.6
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby