feat(sidekiq): Don't record redis-url if url can't be safely extracte…

…d from client Signed-off-by: Ferenc Géczi <[email protected]>
instana · Dec 7, 2023 · 5ebf813 · 5ebf813
1 parent 195996c
commit 5ebf813
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/instana/instrumentation/sidekiq-client.rb b/lib/instana/instrumentation/sidekiq-client.rb
@@ -21,8 +21,8 @@ def call(worker_class, msg, queue, _redis_pool)
                          [client.connection[:host], client.connection[:port]]
                        elsif client.respond_to?(:client) && client.client.respond_to?(:options)
                          [client.client.options[:host], client.client.options[:port]]
-                       else
-                         ['Unknown', 'Unknown']
+                       else # Unexpected version, continue without recording any redis-url
+                         break
                        end
           kv_payload[:'sidekiq-client'][:'redis-url'] = "#{host}:#{port}"
         end

diff --git a/lib/instana/instrumentation/sidekiq-worker.rb b/lib/instana/instrumentation/sidekiq-worker.rb
@@ -21,8 +21,8 @@ def call(_worker, msg, _queue)
                          [client.connection[:host], client.connection[:port]]
                        elsif client.respond_to?(:client) && client.client.respond_to?(:options)
                          [client.client.options[:host], client.client.options[:port]]
-                       else
-                         ['Unknown', 'Unknown']
+                       else # Unexpected version, continue without recording any redis-url
+                         break
                        end
           kv_payload[:'sidekiq-worker'][:'redis-url'] = "#{host}:#{port}"
         end