From ba657871bc4afe32c01415769d88063e6d340fc8 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 1 Dec 2020 14:37:23 -0500
Subject: [PATCH 1/2] Revert "Merge pull request #1359 from
 Shopify/pz-instrument-range-floats"

This reverts commit 300adfd7ae108b3eb5a9460f7b6180777086f1d5, reversing
changes made to ed0aebcbc93cade8719da79b72470435c54e938c.
---
 lib/liquid/range_lookup.rb          |  2 --
 test/integration/expression_test.rb | 22 ++--------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/lib/liquid/range_lookup.rb b/lib/liquid/range_lookup.rb
index 4636a0a..57bccd0 100644
--- a/lib/liquid/range_lookup.rb
+++ b/lib/liquid/range_lookup.rb
@@ -8,8 +8,6 @@ module Liquid
       if start_obj.respond_to?(:evaluate) || end_obj.respond_to?(:evaluate)
         new(start_obj, end_obj)
       else
-        Usage.increment('range_float') if start_obj.is_a?(Float) || end_obj.is_a?(Float)
-
         start_obj.to_i..end_obj.to_i
       end
     end
diff --git a/test/integration/expression_test.rb b/test/integration/expression_test.rb
index cc8ccae..91a0494 100644
--- a/test/integration/expression_test.rb
+++ b/test/integration/expression_test.rb
@@ -31,33 +31,15 @@ class ExpressionTest < Minitest::Test
     assert_equal(3..4, parse_and_eval(" ( 3 .. 4 ) "))
   end
 
-  def test_instrument_range_float
-    assert_usage_increment('range_float') do
-      parse("(1.0..2.0)")
-    end
-
-    assert_usage_increment('range_float') do
-      parse("(1.0..2)")
-    end
-
-    assert_usage_increment('range_float', times: 0) do
-      parse("(1..2)")
-    end
-  end
-
   private
 
-  def parse(markup)
+  def parse_and_eval(markup, **assigns)
     if Liquid::Template.error_mode == :strict
       p = Liquid::Parser.new(markup)
       markup = p.expression
       p.consume(:end_of_string)
     end
-    Liquid::Expression.parse(markup)
-  end
-
-  def parse_and_eval(markup, **assigns)
-    expression = parse(markup)
+    expression = Liquid::Expression.parse(markup)
     context = Liquid::Context.new(assigns)
     context.evaluate(expression)
   end

From bbfcaa2cc07695123773fa64aad35b7e72e40528 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 1 Dec 2020 14:38:04 -0500
Subject: [PATCH 2/2] Revert "Merge pull request #1350 from
 Shopify/pz-instrument-invalid-end-tag"

This reverts commit e6eef4b2c40f54d03aceffd0d8ab5f2da90db5b7, reversing
changes made to c7c21e88f018af6a02095cd8161d065d2967ea21.
---
 lib/liquid/block.rb            |  3 ---
 test/integration/block_test.rb | 20 --------------------
 2 files changed, 23 deletions(-)

diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index c74f7c2..dc22a47 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -77,9 +77,6 @@ module Liquid
         body.parse(tokens, parse_context) do |end_tag_name, end_tag_params|
           @blank &&= body.blank?
 
-          # Instrument for bug 1346
-          Usage.increment("end_tag_params") if end_tag_params && !end_tag_params.empty?
-
           return false if end_tag_name == block_delimiter
           raise_tag_never_closed(block_name) unless end_tag_name
 
diff --git a/test/integration/block_test.rb b/test/integration/block_test.rb
index 91569b5..5cc2aa4 100644
--- a/test/integration/block_test.rb
+++ b/test/integration/block_test.rb
@@ -55,24 +55,4 @@ class BlockTest < Minitest::Test
       assert_equal buf.object_id, output.object_id
     end
   end
-
-  def test_instrument_for_bug_1346
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor {% foo %}")
-    end
-    assert_equal(["end_tag_params"], calls)
-
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor test %}")
-    end
-    assert_equal(["end_tag_params"], calls)
-
-    calls = []
-    Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
-      Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor %}")
-    end
-    assert_equal([], calls)
-  end
 end