app_profiler 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ca2ed69abcd8cba935914ee16e8427fa8070fb3b0eecb488b06a027a64667a
-  data.tar.gz: fbcd17ddeeabfbbb8fe52c69d8744b0a8c73a9cd54ed6cd248f40e1c1a8f2662
+  metadata.gz: eded37ca4bd7b77dcf4bd68a1814eb0900ca1ba7e2cfdb0c5d2490d68f61ba7d
+  data.tar.gz: e69bf61f50c4d7baf3a8d9b748fb5e295d0901fb7d0d0903d3689e230e5526df
 SHA512:
-  metadata.gz: f41e6a149770dbffc1f85f3b280ef91cfc3c2ab966f6d9c8ce943c6c46e3ae2a2784b2864d2a8163593c83d0c116af1919598cc0576831423c5ed825a90b0770
-  data.tar.gz: d12e52408d4d5aedc048661bc96d35f55f038c1eeaedc01c6ed4b31612298d8203c33e5449d935a677a4ec3b75e0cc4c3cc938ae186a3a29c49d245da8093128
+  metadata.gz: '098504043e35bf17909c781047ba83eacdff0dffd7115e9f3910d5d3e3664ef58ee726ced428c6f5fb4750b06eb0193755d096f93d41692074e2eeb049e7f23a'
+  data.tar.gz: 7ea8cbe0cc7d6adfd7b386dae7386f7b08179f112d52e4280cce305e296bb70efe6baab5da983510832b4c511faa3ce9a789a377bd94a9816994c23122cec9ff

data/lib/app_profiler/backend/vernier_backend.rb

@@ -15,6 +15,10 @@ module AppProfiler
         :retained,
       ].freeze
 
+      PRIVATE_METADATA = [
+        :started_at, # started_at uses a monotonic source, not realtime
+      ].freeze
+
       class << self
         def name
           :vernier
@@ -29,7 +33,9 @@ module AppProfiler
         @mode = params.delete(:mode) || DEFAULTS[:mode]
         raise ArgumentError unless AVAILABLE_MODES.include?(@mode)
 
-        @metadata = params.delete(:metadata)
+        if Gem.loaded_specs["vernier"].version < Gem::Version.new("1.7.0")
+          @metadata = params.delete(:metadata)
+        end
         clear
 
         @collector ||= ::Vernier::Collector.new(@mode, **params)
@@ -60,11 +66,19 @@ module AppProfiler
 
         return unless vernier_profile
 
+        # Store all vernier metadata
+        meta = vernier_profile.meta.reject { |k, v| k == :user_metadata || v.nil? || PRIVATE_METADATA.include?(k) }
+        meta.merge!(@metadata) if @metadata
+
+        # Internal metadata takes precedence over user metadata, but store
+        # everything in user metadata
+        vernier_profile.meta[:user_metadata]&.merge!(meta)
+
         # HACK: - "data" is private, but we want to avoid serializing to JSON then
         # parsing back from JSON by just directly getting the hash
         data = ::Vernier::Output::Firefox.new(vernier_profile).send(:data)
-        data[:meta][:mode] = @mode # TODO: https://github.com/jhawthorn/vernier/issues/30
-        data[:meta].merge!(@metadata) if @metadata
+        data[:meta][:mode] = @mode
+        data[:meta][:vernierUserMetadata] ||= meta # for compatibility with < 1.7.0
         @mode = nil
         @metadata = nil
 

data/lib/app_profiler/base_profile.rb

@@ -23,7 +23,7 @@ module AppProfiler
       end
 
       def from_vernier(data)
-        options = INTERNAL_METADATA_KEYS.map { |key| [key, data[:meta]&.delete(key)] }.to_h
+        options = INTERNAL_METADATA_KEYS.map { |key| [key, data[:meta]&.[](:vernierUserMetadata)&.delete(key)] }.to_h
 
         VernierProfile.new(data, **options).tap do |profile|
           raise ArgumentError, "invalid profile data" unless profile.valid?

data/lib/app_profiler/railtie.rb

@@ -34,6 +34,7 @@ module AppProfiler
       )
       AppProfiler.profile_header = app.config.app_profiler.profile_header || "X-Profile"
       AppProfiler.profile_async_header = app.config.app_profiler.profile_async_header || "X-Profile-Async"
+      AppProfiler.profile_param = app.config.app_profiler.profile_param || "profile"
       AppProfiler.profile_root = app.config.app_profiler.profile_root || Rails.root.join(
         "tmp", "app_profiler"
       )

data/lib/app_profiler/request_parameters.rb

@@ -66,7 +66,7 @@ module AppProfiler
     private
 
     def mode
-      query_param("profile") || profile_header_param("mode")
+      query_param(AppProfiler.profile_param) || profile_header_param("mode")
     end
 
     def ignore_gc

data/lib/app_profiler/vernier_profile.rb

@@ -14,6 +14,7 @@ module AppProfiler
 
     def initialize(data, id: nil, context: nil)
       data[:meta] ||= {}
+      data[:meta][:vernierUserMetadata] ||= {}
       super(data, id: id, context: context)
     end
 
@@ -22,7 +23,7 @@ module AppProfiler
     end
 
     def metadata
-      @data[:meta]
+      @data[:meta][:vernierUserMetadata]
     end
 
     def format

data/lib/app_profiler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppProfiler
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/app_profiler.rb

@@ -41,15 +41,16 @@ module AppProfiler
   end
 
   autoload(:Middleware, "app_profiler/middleware")
-  autoload(:Parameters, "app_profiler/parameters")
-  autoload(:RequestParameters, "app_profiler/request_parameters")
   autoload(:BaseProfile, "app_profiler/base_profile")
   autoload :StackprofProfile, "app_profiler/stackprof_profile"
   autoload :VernierProfile, "app_profiler/vernier_profile"
   autoload(:Backend, "app_profiler/backend")
   autoload(:Server, "app_profiler/server")
-  autoload(:Sampler, "app_profiler/sampler")
-  autoload(:ProfileId, "app_profiler/profile_id")
+
+  require "app_profiler/parameters"
+  require "app_profiler/request_parameters"
+  require "app_profiler/profile_id"
+  require "app_profiler/sampler"
 
   mattr_accessor :logger, default: Logger.new($stdout)
   mattr_accessor :root
@@ -59,6 +60,7 @@ module AppProfiler
   mattr_accessor :autoredirect, default: false
   mattr_reader   :profile_header, default: "X-Profile"
   mattr_accessor :profile_async_header, default: "X-Profile-Async"
+  mattr_accessor :profile_param, default: "profile"
   mattr_accessor :context, default: nil
   mattr_reader   :profile_url_formatter, default: DefaultProfileFormatter
   mattr_accessor :storage, default: Storage::FileStorage
@@ -90,9 +92,13 @@ module AppProfiler
       end
       profiler.run(*args, **kwargs, &block)
     rescue BackendError => e
-      logger.error(
-        "[AppProfiler.run] exception #{e} configuring backend #{backend}: #{e.message}",
-      )
+      if ActiveSupport.respond_to?(:error_reporter)
+        ActiveSupport.error_reporter.report(e, context: { app_profiler: { backend: backend } })
+      else
+        logger.error(
+          "[AppProfiler.run] exception #{e} configuring backend #{backend}: #{e.message}",
+        )
+      end
       yield
     ensure
       self.backend = original_backend if backend
@@ -159,9 +165,13 @@ module AppProfiler
 
       @profile_sampler_enabled.is_a?(Proc) ? @profile_sampler_enabled.call : @profile_sampler_enabled
     rescue => e
-      logger.error(
-        "[AppProfiler.profile_sampler_enabled] exception: #{e}, message: #{e.message}",
-      )
+      if ActiveSupport.respond_to?(:error_reporter)
+        ActiveSupport.error_reporter.report(e)
+      else
+        logger.error(
+          "[AppProfiler.profile_sampler_enabled] exception: #{e}, message: #{e.message}",
+        )
+      end
       false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_profiler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Gannon McGibbon
@@ -12,7 +12,7 @@ authors:
 - Scott Francis
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,6 +28,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +236,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.2.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Collect performance profiles for your Rails application.
 test_files: []