Fix nested_call edge case (#488)

scoutapp · Feb 5, 2024 · 3b802ec · 3b802ec
1 parent a124643
commit 3b802ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/lib/scout_apm/auto_instrument/rails.rb b/lib/scout_apm/auto_instrument/rails.rb
@@ -142,7 +142,7 @@ def on_hash(node)
             key_node, value_node = pair.children
             next unless key_node.type == :sym && value_node.type == :send
             key = key_node.children[0]
-            next unless value_node.children[0].nil? && key == value_node.children[1]
+            next unless value_node.children.size == 2 && value_node.children[0].nil? && key == value_node.children[1]
 
             # Extract useful metadata for instrumentation:
             line = pair.location.line || 'line?'

diff --git a/test/unit/auto_instrument/hash_shorthand_controller-instrumented.rb b/test/unit/auto_instrument/hash_shorthand_controller-instrumented.rb
@@ -11,13 +11,18 @@ def hash
       non_nil_receiver: ::ScoutApm::AutoInstrument("non_nil_receiver.value",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:11:in `hash'"]){non_nil_receiver.value},
       nested: {
         shorthand: ::ScoutApm::AutoInstrument("shorthand:",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:13:in `hash'"]){shorthand},
-      }
+      },
+      nested_call: ::ScoutApm::AutoInstrument("nested_call(params[\"timestamp\"])",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:15:in `hash'"]){nested_call(params["timestamp"])}
     }
-    ::ScoutApm::AutoInstrument("render json:",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:16:in `hash'"]){render json:}
+    ::ScoutApm::AutoInstrument("render json:",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:17:in `hash'"]){render json:}
   end
 
   private
 
+  def nested_call(noop)
+    noop
+  end
+
   def shorthand
     "shorthand"
   end
@@ -31,6 +36,6 @@ def hash_rocket
   end
 
   def non_nil_receiver
-    ::ScoutApm::AutoInstrument("OpenStruct.new(value: \"value\")",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:34:in `non_nil_receiver'"]){OpenStruct.new(value: "value")}
+    ::ScoutApm::AutoInstrument("OpenStruct.new(value: \"value\")",["ROOT/test/unit/auto_instrument/hash_shorthand_controller.rb:39:in `non_nil_receiver'"]){OpenStruct.new(value: "value")}
   end
 end
diff --git a/test/unit/auto_instrument/hash_shorthand_controller.rb b/test/unit/auto_instrument/hash_shorthand_controller.rb
@@ -11,13 +11,18 @@ def hash
       non_nil_receiver: non_nil_receiver.value,
       nested: {
         shorthand:,
-      }
+      },
+      nested_call: nested_call(params["timestamp"])
     }
     render json:
   end
 
   private
 
+  def nested_call(noop)
+    noop
+  end
+
   def shorthand
     "shorthand"
   end