app_profiler 0.0.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14252a4cfb042174369c9a1db2b36944b69e9ea3a1c5deecda4eb6875b88c66
-  data.tar.gz: 10c8227518e0cf32755479fc231df4d676c08bdd0052c347372fde5d39a81f73
+  metadata.gz: b93daeac19342da210b998d381259941dc1d12c96fa5d58097423d86b32c03f3
+  data.tar.gz: d7b50f279a8b197ba847363db5a6e92b394ac506804d9a499c519dcd36b6071c
 SHA512:
-  metadata.gz: ad09ac71560705b5ccb548f9fab69c9c7ffa2d1183621ab7eb8faa51af73020b7efa3a9323db65b9a092f98e2e649d31641a92f5ac3d5433d3f8f2f298274b73
-  data.tar.gz: 95ddee7961e0a52829ea9bc31819c13b8bec3531f00a202cbd03532b11266f52c8c47c5171fed54c7bf55bbe19be4fb2664c08681d38f0229587166d2fa1d1ff
+  metadata.gz: d996e6faf3bb8c02e8f34e462d3c74beac53d656d188330972ecba83770524b42dbc36132aa8b6e2cadd57fe0b6b5504a548a1d96ae58b3e7e14ac504d672f2e
+  data.tar.gz: 124bc292cff5decf4cdf7f7d4b8b22cc2820123a1fbda5f56970a1fd76da74675e68dbb5a953024c778eb64bb5c9a7ff8b41f0a62be5dcbdd0f6e214a7cc8fc7

data/lib/app_profiler.rb

@@ -24,7 +24,7 @@ module AppProfiler
   autoload :Profiler, "app_profiler/profiler"
   autoload :Profile, "app_profiler/profile"
 
-  mattr_accessor :logger
+  mattr_accessor :logger, default: Logger.new($stdout)
   mattr_accessor :root
   mattr_accessor :profile_root
 
@@ -32,6 +32,7 @@ module AppProfiler
   mattr_accessor :autoredirect, default: false
   mattr_reader   :profile_header, default: "X-Profile"
   mattr_accessor :context, default: nil
+  mattr_reader   :profile_url_formatter, default: nil
 
   mattr_accessor :storage, default: Storage::FileStorage
   mattr_accessor :viewer, default: Viewer::SpeedscopeViewer
@@ -42,6 +43,15 @@ module AppProfiler
       Profiler.run(*args, &block)
     end
 
+    def start(*args)
+      Profiler.start(*args)
+    end
+
+    def stop
+      Profiler.stop
+      Profiler.results
+    end
+
     def profile_header=(profile_header)
       @@profile_header = profile_header # rubocop:disable Style/ClassVars
       @@request_profile_header = nil    # rubocop:disable Style/ClassVars
@@ -57,5 +67,9 @@ module AppProfiler
     def profile_data_header
       @@profile_data_header ||= profile_header.dup << "-Data" # rubocop:disable Style/ClassVars
     end
+
+    def profile_url_formatter=(block)
+      @@profile_url_formatter = block # rubocop:disable Style/ClassVars
+    end
   end
 end

data/lib/app_profiler/middleware/upload_action.rb

@@ -34,7 +34,11 @@ module AppProfiler
         end
 
         def profile_url(upload)
-          "#{AppProfiler.speedscope_host}#profileURL=#{upload.url}"
+          if AppProfiler.profile_url_formatter.nil?
+            "#{AppProfiler.speedscope_host}#profileURL=#{upload.url}"
+          else
+            AppProfiler.profile_url_formatter.call(upload)
+          end
         end
 
         def profile_data_url(upload)

data/lib/app_profiler/profiler.rb

@@ -24,28 +24,13 @@ module AppProfiler
         stop if started
       end
 
-      def results
-        stackprof_profile = stackprof_results
-
-        return unless stackprof_profile
-
-        Profile.from_stackprof(stackprof_profile)
-      rescue => error
-        AppProfiler.logger.info(
-          "[Profiler] failed to obtain the profile error_class=#{error.class} error_message=#{error.message}"
-        )
-        nil
-      end
-
-      private
-
       def start(params = {})
         # Do not start the profiler if StackProf was started somewhere else.
         return false if running?
 
         clear
 
-        StackProf.start(DEFAULTS.merge(params))
+        StackProf.start(**DEFAULTS, **params)
       rescue => error
         AppProfiler.logger.info(
           "[Profiler] failed to start the profiler error_class=#{error.class} error_message=#{error.message}"
@@ -59,6 +44,21 @@ module AppProfiler
         StackProf.stop
       end
 
+      def results
+        stackprof_profile = stackprof_results
+
+        return unless stackprof_profile
+
+        Profile.from_stackprof(stackprof_profile)
+      rescue => error
+        AppProfiler.logger.info(
+          "[Profiler] failed to obtain the profile error_class=#{error.class} error_message=#{error.message}"
+        )
+        nil
+      end
+
+      private
+
       def stackprof_results
         StackProf.results
       end

data/lib/app_profiler/railtie.rb

@@ -25,6 +25,7 @@ module AppProfiler
         "tmp", "app_profiler"
       )
       AppProfiler.context = app.config.app_profiler.context || Rails.env
+      AppProfiler.profile_url_formatter = app.config.app_profiler.profile_url_formatter
     end
 
     initializer "app_profiler.add_middleware" do |app|

data/lib/app_profiler/request_parameters.rb

@@ -4,8 +4,8 @@ require "rack"
 
 module AppProfiler
   class RequestParameters
-    DEFAULT_INTERVALS = { "cpu" => 1000, "wall" => 1000, "object" => 10000 }.freeze
-    MIN_INTERVALS = { "cpu" => 200, "wall" => 200, "object" => 10000 }.freeze
+    DEFAULT_INTERVALS = { "cpu" => 1000, "wall" => 1000, "object" => 2000 }.freeze
+    MIN_INTERVALS = { "cpu" => 200, "wall" => 200, "object" => 400 }.freeze
     MODES = DEFAULT_INTERVALS.keys.freeze
 
     def initialize(request)

data/lib/app_profiler/storage/file_storage.rb

@@ -11,6 +11,10 @@ module AppProfiler
         def url
           @file
         end
+
+        def name
+          @file.basename
+        end
       end
 
       class << self

data/lib/app_profiler/version.rb

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

data/lib/app_profiler/viewer/speedscope_viewer.rb

@@ -14,6 +14,7 @@ module AppProfiler
       end
 
       def initialize(profile)
+        super()
         @profile = profile
       end
 
@@ -33,7 +34,10 @@ module AppProfiler
       def setup_yarn
         ensure_yarn_installed
         yarn("init --yes") unless package_json_exists?
-        yarn("add --dev speedscope")
+        # We currently only support this gem in the root Gemfile.
+        # See https://github.com/Shopify/app_profiler/issues/15
+        # for more information
+        yarn("add --dev --ignore-workspace-root-check speedscope") unless speedscope_added?
       end
 
       def ensure_yarn_installed
@@ -53,6 +57,10 @@ module AppProfiler
         AppProfiler.root.join("package.json").exist?
       end
 
+      def speedscope_added?
+        AppProfiler.root.join("node_modules/speedscope").exist?
+      end
+
       def exec(command)
         system(command).tap do |return_code|
           yield unless return_code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_profiler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.7
 platform: ruby
 authors:
 - Gannon McGibbon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,7 +165,8 @@ files:
 - lib/app_profiler/viewer/speedscope_viewer.rb
 homepage: https://github.com/Shopify/app_profiler
 licenses: []
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: