Fix frozen input for Redis

docs/GettingStarted.md

@@ -507,7 +507,7 @@ For a list of available integrations, and their configuration options, please re
 | Rack                       | `rack`                     | `>= 1.1`                 | `>= 1.1`                  | *[Link](#rack)*                     | *[Link](https://github.com/rack/rack)*                                         |
 | Rails                      | `rails`                    | `>= 3.2`                 | `>= 3.2`                  | *[Link](#rails)*                    | *[Link](https://github.com/rails/rails)*                                       |
 | Rake                       | `rake`                     | `>= 12.0`                | `>= 12.0`                 | *[Link](#rake)*                     | *[Link](https://github.com/ruby/rake)*                                         |
-| Redis                      | `redis`                    | `>= 3.2`                 | `>= 3.2`                  | *[Link](#redis)*                    | *[Link](https://github.com/redis/redis-rb)*                                    |
+| Redis                      | `redis`                    | `>= 3.2`, `< 5`                | `>= 3.2`, `< 5`                    | *[Link](#redis)*                    | *[Link](https://github.com/redis/redis-rb)*                                    |
 | Resque                     | `resque`                   | `>= 1.0`                 | `>= 1.0`                  | *[Link](#resque)*                   | *[Link](https://github.com/resque/resque)*                                     |
 | Rest Client                | `rest-client`              | `>= 1.8`                 | `>= 1.8`                  | *[Link](#rest-client)*              | *[Link](https://github.com/rest-client/rest-client)*                           |
 | Sequel                     | `sequel`                   | `>= 3.41`                | `>= 3.41`                 | *[Link](#sequel)*                   | *[Link](https://github.com/jeremyevans/sequel)*                                |

lib/datadog/tracing/contrib/redis/integration.rb

@@ -13,6 +13,7 @@ class Integration
           include Contrib::Integration
 
           MINIMUM_VERSION = Gem::Version.new('3.2')
+          MAX_VERSION = Gem::Version.new('5')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :redis, auto_patch: true
@@ -26,7 +27,7 @@ def self.loaded?
           end
 
           def self.compatible?
-            super && version >= MINIMUM_VERSION
+            super && version >= MINIMUM_VERSION && version < MAX_VERSION
           end
 
           def new_configuration

lib/datadog/tracing/contrib/redis/patcher.rb

@@ -20,10 +20,9 @@ def self.included(base)
 
             # Instance method patch for redis instance
             module InstanceMethods
+              # `options` could be frozen
               def initialize(options = {})
-                options[:redis_instance] = self
-
-                super(options)
+                super(options.merge(redis_instance: self))
               end
             end
           end

spec/datadog/tracing/contrib/redis/instrumentation_spec.rb

@@ -60,7 +60,8 @@
     let(:default_service_name) { 'default-service' }
     let(:service_name) { 'multiplex-service' }
     let(:redis_url) { "redis://#{test_host}:#{test_port}/#{test_database}" }
-    let(:client) { Redis.new(url: redis_url) }
+    let(:redis_options) { { url: redis_url } }
+    let(:client) { Redis.new(redis_options.freeze) }
 
     before do
       Datadog.configure do |c|
@@ -105,7 +106,8 @@
   describe 'when multiplexed configuration is provided via hash' do
     let(:default_service_name) { 'default-service' }
     let(:service_name) { 'multiplex-service' }
-    let(:client) { Redis.new(host: test_host, port: test_port, db: test_database) }
+    let(:redis_options) { { host: test_host, port: test_port, db: test_database } }
+    let(:client) { Redis.new(redis_options.freeze) }
 
     before do
       Datadog.configure do |c|

spec/datadog/tracing/contrib/redis/integration_test_spec.rb

@@ -22,8 +22,8 @@
     Datadog.registry[:redis].reset_configuration!
     without_warnings { Datadog.configuration.reset! }
   end
-
-  let(:redis) { Redis.new(host: host, port: port) }
+  let(:redis_options) { { host: host, port: port } }
+  let(:redis) { Redis.new(redis_options.freeze) }
   let(:host) { ENV.fetch('TEST_REDIS_HOST', '127.0.0.1') }
   let(:port) { ENV.fetch('TEST_REDIS_PORT', 6379).to_i }
 

spec/datadog/tracing/contrib/redis/miniapp_spec.rb

@@ -18,7 +18,8 @@
     Datadog.configure_onto(redis, service_name: 'test-service')
   end
 
-  let(:redis) { Redis.new(host: host, port: port) }
+  let(:redis_options) { { host: host, port: port } }
+  let(:redis) { Redis.new(redis_options.freeze) }
   let(:host) { ENV.fetch('TEST_REDIS_HOST', '127.0.0.1') }
   let(:port) { ENV.fetch('TEST_REDIS_PORT', 6379).to_i }
 

spec/datadog/tracing/contrib/redis/redis_spec.rb

@@ -26,7 +26,8 @@
   end
 
   shared_examples_for 'a Redis driver' do |driver|
-    let(:redis) { Redis.new(host: host, port: port, driver: driver) }
+    let(:redis_options) { { host: host, port: port, driver: driver } }
+    let(:redis) { Redis.new(redis_options.freeze) }
     let(:host) { ENV.fetch('TEST_REDIS_HOST', '127.0.0.1') }
     let(:port) { ENV.fetch('TEST_REDIS_PORT', 6379).to_i }
 
@@ -39,7 +40,8 @@
     end
 
     shared_context 'password-protected Redis server' do
-      let(:redis) { Redis.new(host: host, port: port, driver: driver, password: password) }
+      let(:redis_options) { { host: host, port: port, driver: driver, password: password } }
+      let(:redis) { Redis.new(redis_options.freeze) }
       let(:password) { 'foobar' }
 
       before do