WIP

Author: solnic

sentry-ruby/lib/sentry/hub.rb

@@ -18,26 +18,6 @@ def initialize(client, scope)
       first_layer = Layer.new(client, scope)
       @stack = [first_layer]
       @last_event_id = nil
-      @current_profiler = {}
-    end
-
-    def start_profiler!(transaction)
-      MUTEX.synchronize do
-        transaction.start_profiler!
-        @current_profiler[transaction.__id__] = transaction.profiler
-      end
-    end
-
-    def stop_profiler!(transaction)
-      MUTEX.synchronize do
-        @current_profiler.delete(transaction.__id__)&.stop
-      end
-    end
-
-    def profiler_running?
-      MUTEX.synchronize do
-        !@current_profiler.empty?
-      end
     end
 
     def new_from_top
@@ -120,7 +100,7 @@ def start_transaction(transaction: nil, custom_sampling_context: {}, instrumente
       sampling_context.merge!(custom_sampling_context)
       transaction.set_initial_sample_decision(sampling_context: sampling_context)
 
-      start_profiler!(transaction)
+      transaction.start_profiler!
 
       transaction
     end

sentry-ruby/lib/sentry/transaction.rb

@@ -85,10 +85,7 @@ def initialize(
       @effective_sample_rate = nil
       @contexts = {}
       @measurements = {}
-
-      unless @hub.profiler_running?
-        @profiler = @configuration.profiler_class.new(@configuration)
-      end
+      @profiler = @configuration.profiler_class.new(@configuration)
 
       init_span_recorder
     end
@@ -261,7 +258,7 @@ def finish(hub: nil, end_timestamp: nil)
         @name = UNLABELD_NAME
       end
 
-      @hub.stop_profiler!(self)
+      @profiler.stop
 
       if @sampled
         event = hub.current_client.event_from_transaction(self)

sentry-ruby/lib/sentry/vernier/profiler.rb

@@ -8,13 +8,14 @@ module Sentry
   module Vernier
     class Profiler
       EMPTY_RESULT = {}.freeze
+      MUTEX = Mutex.new
 
-      attr_reader :started, :event_id, :result
+      attr_reader :event_id, :result
 
       def initialize(configuration)
         @event_id = SecureRandom.uuid.delete("-")
 
-        @started = false
+        @vernier_collector = nil
         @sampled = nil
 
         @profiling_enabled = defined?(Vernier) && configuration.profiling_enabled?
@@ -51,15 +52,28 @@ def set_initial_sample_decision(transaction_sampled)
         log("Discarding profile due to sampling decision") unless @sampled
       end
 
-      def start
-        return unless @sampled
-        return if @started
+      def other_vernier_running?
+        MUTEX.synchronize do
+          @vernier_collector && vernier_collector_id != @vernier_collector.__id__
+        end
+      end
 
-        @started = ::Vernier.start_profile
+      def this_vernier_running?
+        MUTEX.synchronize do
+          @vernier_collector && vernier_collector_id == @vernier_collector.__id__
+        end
+      end
 
-        log("Started")
+      def vernier_collector_id
+        Vernier.instance_variable_get(:@collector).__id__ if Vernier.instance_variable_get(:@collector)
+      end
 
-        @started
+      def start
+        return if !@sampled || other_vernier_running?
+
+        @vernier_collector = ::Vernier.start_profile
+
+        log("Started with Vernier collector id: #{vernier_collector_id}")
       rescue RuntimeError => e
         # TODO: once Vernier raises something more dedicated, we should catch that instead
         if e.message.include?("Profile already started")
@@ -71,18 +85,18 @@ def start
 
       def stop
         return unless @sampled
-        return unless @started
 
-        @result = ::Vernier.stop_profile
-        @started = false
+        @result = ::Vernier.stop_profile if this_vernier_running?
 
         log("Stopped")
-      rescue RuntimeError => e
-        if e.message.include?("Profile not started")
-          log("Not stopped since not started")
-        else
-          log("Failed to stop Vernier: #{e.message}")
-        end
+        # rescue RuntimeError => e
+        # if e.message.include?("Profile not started")
+        #   log("Not stopped since not started")
+        # else
+        #   log("Failed to stop Vernier: #{e.message}")
+        # end
+      ensure
+        @vernier_collector = nil
       end
 
       def active_thread_id

sentry-ruby/spec/sentry/transactions/profiler_spec.rb

@@ -15,19 +15,16 @@
   end
 
   it 'starts profiler just once inside nested transactions' do
-    10.times do
+    10000.times do
       parent_transaction = Sentry.start_transaction(name: "parent")
       nested_transaction = Sentry.start_transaction(name: "nested")
 
-      ProfilerTest::Bar.bar
-
-      expect(Sentry.get_current_hub.profiler_running?).to be(true)
-
-      expect(parent_transaction.profiler).to_not be_nil
-      expect(nested_transaction.profiler).to be_nil
+      ProfilerTest::Bar::Foo.foo(10)
 
       nested_transaction.finish
       parent_transaction.finish
+
+      expect(parent_transaction.profiler.to_hash).to_not be_empty
     end
   end
 end

sentry-ruby/spec/support/profiler.rb

@@ -3,8 +3,8 @@
 module ProfilerTest
   module Bar
     module Foo
-      def self.foo
-        1e6.to_i.times { 2**2 }
+      def self.foo(count = 1e6.to_i)
+        count.times { 2**2 }
       end
     end