Store the profiler in the context instead of a thread-local variable (#1364)

lib/liquid/profiler.rb

@@ -85,21 +85,6 @@ module Liquid
       end
     end
 
-    def self.profile_node_render(node, template_name)
-      if Profiler.current_profile && node.respond_to?(:render)
-        Profiler.current_profile.start_node(node, template_name)
-        output = yield
-        Profiler.current_profile.end_node
-        output
-      else
-        yield
-      end
-    end
-
-    def self.current_profile
-      Thread.current[:liquid_profiler]
-    end
-
     attr_reader :total_render_time
 
     def initialize
@@ -108,12 +93,10 @@ module Liquid
     end
 
     def start
-      Thread.current[:liquid_profiler] = self
       @render_start_at = monotonic_time
     end
 
     def stop
-      Thread.current[:liquid_profiler] = nil
       @total_render_time = monotonic_time - @render_start_at
     end
 
@@ -129,6 +112,15 @@ module Liquid
       @root_timing.children.length
     end
 
+    def profile_node(node, template_name)
+      start_node(node, template_name)
+      yield
+    ensure
+      end_node
+    end
+
+    private
+
     def start_node(node, template_name)
       @timing_stack.push(Timing.start(node, template_name))
     end
@@ -140,8 +132,6 @@ module Liquid
       @timing_stack.last.children << timing
     end
 
-    private
-
     def monotonic_time
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end

lib/liquid/profiler/hooks.rb

@@ -3,10 +3,25 @@
 module Liquid
   module BlockBodyProfilingHook
     def render_node(context, output, node)
-      Profiler.profile_node_render(node, context.template_name) do
+      if (profiler = context.profiler)
+        profiler.profile_node(node, context.template_name) do
+          super
+        end
+      else
         super
       end
     end
   end
   BlockBody.prepend(BlockBodyProfilingHook)
+
+  module ContextProfilingHook
+    attr_accessor :profiler
+
+    def new_isolated_subcontext
+      new_context = super
+      new_context.profiler = profiler
+      new_context
+    end
+  end
+  Context.prepend(ContextProfilingHook)
 end

lib/liquid/template.rb

@@ -106,9 +106,13 @@ module Liquid
     # Parse source code.
     # Returns self for easy chaining
     def parse(source, options = {})
+      if (profiling = options[:profile])
+        raise "Profiler not loaded, require 'liquid/profiler' first" unless defined?(Liquid::Profiler)
+      end
+
       @options      = options
-      @profiling    = options[:profile]
+      @profiling    = profiling
-      @line_numbers = options[:line_numbers] || @profiling
+      @line_numbers = options[:line_numbers] || profiling
       parse_context = options.is_a?(ParseContext) ? options : ParseContext.new(options)
       @root         = Document.parse(tokenize(source), parse_context)
       @warnings     = parse_context.warnings
@@ -217,10 +221,8 @@ module Liquid
     end
 
     def with_profiling(context)
-      if @profiling && !context.partial
+      if @profiling && context.profiler.nil?
-        raise "Profiler not loaded, require 'liquid/profiler' first" unless defined?(Liquid::Profiler)
+        @profiler = context.profiler = Profiler.new
-
-        @profiler = Profiler.new
         @profiler.start
 
         begin