Remove redis_instance from options to avoid TypError for redis 3.x

DataDog · Nov 14, 2022 · 48de53c · 48de53c
1 parent a39c4c1
commit 48de53c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/datadog/tracing/contrib/redis/instrumentation.rb b/lib/datadog/tracing/contrib/redis/instrumentation.rb
@@ -69,10 +69,7 @@ def get_pipeline_commands(args)
             end
 
             def datadog_configuration
-              # attribute reader `options` would works for Redis 4.x
-              # But Redis 3.x raises `TypeError: singleton can't be dumped`
-              # since overwritten with `Marshal.load(Marshal.dump(@options))`
-              Datadog.configuration.tracing[:redis, @options]
+              Datadog.configuration.tracing[:redis, options]
             end
           end
         end

diff --git a/lib/datadog/tracing/contrib/redis/patcher.rb b/lib/datadog/tracing/contrib/redis/patcher.rb
@@ -37,7 +37,7 @@ def self.included(base)
             # Instance method patch for redis client
             module InstanceMethods
               def initialize(options = {})
-                @redis_instance = options[:redis_instance]
+                @redis_instance = options.delete(:redis_instance)
 
                 super(options)
               end