appmap 0.74.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb314cb1f41f3735c773670cd8082bbc8cedb98d9b01c6c71a0c6a2d2b094da5
-  data.tar.gz: fb4f94b03bb6c50465d22db22f5cc1d25bfb95e3638543986306ca63ce5603e7
+  metadata.gz: 72b52604fce9e01c3e4bc760d12f877a47b846a2f42a3e880dc3fbe3a3caf07b
+  data.tar.gz: 50428860dafdf6f79add97f9f51787014358b6178f5206ebc915c85dced62eb7
 SHA512:
-  metadata.gz: 2da7b411bf29e42b6c81dad1c897021e67e85b4770037543508ea2562a6132d3e8c7d2fe8574971231c06f3ebaaa328264d9db461363f3f59166922d8327060f
-  data.tar.gz: 248770c6d301895621c72d6f46c6e6e1c18abaa368356c7c9deebd480e91ce8bb456374c04bd4547ae7423976d8911f1e627c137d2cffdb6801db50bef55a229
+  metadata.gz: ae7670741f126ccf52fc7916229f29831a4320a673db755ab9c38fa9286e970baa447134c96acab4f443a4115bd8bca8f49552a983212e328bacabd88abd8352
+  data.tar.gz: 5e7b760bc10d31a40ae44996a9200e1ef6c3976364b4a43e5dd6b7b9b81005f57e1efac758f54b4d8274dc420cc74baebf91629ab12bc2a26b8959642feba56d

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [0.77.0](https://github.com/applandinc/appmap-ruby/compare/v0.76.0...v0.77.0) (2022-03-22)
+
+
+### Features
+
+* Add label job.perform ([fb5e220](https://github.com/applandinc/appmap-ruby/commit/fb5e220a1f4fd724d8d0178fd4282fed73ff9371))
+* Add labels for devise ([734ec61](https://github.com/applandinc/appmap-ruby/commit/734ec617aa81d756acf3cb392b5eaabcf9521934))
+
+# [0.76.0](https://github.com/applandinc/appmap-ruby/compare/v0.75.0...v0.76.0) (2022-03-19)
+
+
+### Features
+
+* Autoload hook handlers ([4cc0e70](https://github.com/applandinc/appmap-ruby/commit/4cc0e7003a8c37d3b6c8c8bbc68cffac0335b878))
+
+# [0.75.0](https://github.com/applandinc/appmap-ruby/compare/v0.74.0...v0.75.0) (2022-03-17)
+
+
+### Features
+
+* Apply label deserialize.safe to ActiveSupport.run_load_hooks ([1f67f9b](https://github.com/applandinc/appmap-ruby/commit/1f67f9b260503772cba6824ef746f903def14323))
+* Print stacks if requested by env var ([72ef911](https://github.com/applandinc/appmap-ruby/commit/72ef9116d3248467632762ce63303a54bed998e9))
+
 # [0.74.0](https://github.com/applandinc/appmap-ruby/compare/v0.73.0...v0.74.0) (2022-03-14)
 
 

data/lib/appmap/config.rb

@@ -4,8 +4,7 @@ require 'pathname'
 require 'set'
 require 'yaml'
 require 'appmap/util'
-require 'appmap/handler/net_http'
-require 'appmap/handler/rails/template'
+require 'appmap/handler'
 require 'appmap/service/guesser'
 require 'appmap/swagger/configuration'
 require 'appmap/depends/configuration'
@@ -206,8 +205,8 @@ module AppMap
         }.compact
 
         handler_class = hook_decl['handler_class']
-        options[:handler_class] = Util.class_from_string(handler_class) if handler_class
-        
+        options[:handler_class] = Handler.find(handler_class) if handler_class
+
         package_hooks(methods, **options)
       end
 

data/lib/appmap/gem_hooks/activejob.yml

@@ -1,2 +1,6 @@
 - method: ActiveJob::Enqueuing#enqueue
   label: job.create
+- methods:
+  - ActiveJob::Execution#perform
+  - ActiveJob::Execution#perform_now
+  label: job.perform

data/lib/appmap/gem_hooks/activesupport.yml

@@ -10,3 +10,7 @@
   label: crypto.secure_compare
   require_name: active_support/security_utils
   force: true
+- method: ActiveSupport.run_load_hooks
+  label: deserialize.safe
+  require_name: active_support/lazy_load_hooks
+  force: true

data/lib/appmap/gem_hooks/devise.yml

@@ -0,0 +1,8 @@
+- method: Devise::TokenGenerator#generate
+  label: secret
+- method: Devise.friendly_token
+  label: secret
+- method: Devise.secure_compare
+  label: security.secure_compare
+- method: Devise::Strategies::DatabaseAuthenticatable#authenticate!
+  label: security.authentication

data/lib/appmap/handler.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector/methods'
+
+module AppMap
+  # Specific hook handler classes and general related utilities.
+  module Handler
+    # Try to find handler module with a given name.
+    #
+    # If the module is not loaded, tries to require the appropriate file
+    # using the usual conventions, eg. `Acme::Handler::AppMap` will try
+    # to require `acme/handler/app_map`, then `acme/handler` and
+    # finally `acme`. Raises NameError if the module could not be loaded
+    # this way.
+    def self.find(name)
+      begin
+        return Object.const_get name
+      rescue NameError
+        try_load ActiveSupport::Inflector.underscore name
+      end
+      Object.const_get name
+    end
+
+    def self.try_load(fname)
+      fname = fname.sub %r{^app_map/}, 'appmap/'
+      fname = fname.split '/'
+      until fname.empty?
+        begin
+          require fname.join '/'
+          return
+        rescue LoadError
+          # pass
+        end
+        fname.pop
+      end
+    end
+  end
+end

data/lib/appmap/hook.rb

@@ -108,8 +108,11 @@ module AppMap
 
               warn "AppMap: Initiating hook for builtin #{class_name} #{method_name}" if LOG
 
-              base_cls = Util.class_from_string(class_name, must: false)
-              next unless base_cls
+              begin
+                base_cls = Object.const_get class_name
+              rescue NameError
+                next
+              end
 
               hook_method = lambda do |entry|
                 cls, method = entry

data/lib/appmap/trace.rb

@@ -84,12 +84,43 @@ module AppMap
     end
   end
 
+  class StackPrinter
+    class << self
+      def enabled?
+        ENV['APPMAP_PRINT_STACKS'] == 'true'
+      end
+
+      def depth
+        (ENV['APPMAP_STACK_DEPTH'] || 20).to_i
+      end
+    end
+
+    def initialize
+      @@stacks ||= Hash.new
+    end
+
+    def record(event)
+      stack = caller.select { |line| !line.index('/lib/appmap/') }[0...StackPrinter.depth].join("\n  ")
+      stack_hash = Digest::SHA256.hexdigest(stack)
+      unless @@stacks[stack_hash]
+        @@stacks[stack_hash] = stack
+        puts
+        puts 'Event: ' + event.to_h.map { |k, v| [ "#{k}: #{v}" ] }.join(", ")
+        puts '  ' + stack
+        puts
+      end
+    end
+  end
+
   class Tracer
+    attr_accessor :stacks
+
     # Records the events which happen in a program.
     def initialize
       @events = []
       @last_package_for_thread = {}
       @methods = Set.new
+      @stack_printer = StackPrinter.new if StackPrinter.enabled?
       @enabled = false
     end
 
@@ -112,6 +143,7 @@ module AppMap
     def record_event(event, package: nil, defined_class: nil, method: nil)
       return unless @enabled
 
+      @stack_printer.record(event) if @stack_printer
       @last_package_for_thread[Thread.current.object_id] = package if package
       @events << event
       static = event.static if event.respond_to?(:static)

data/lib/appmap/util.rb

@@ -21,14 +21,6 @@ module AppMap
     WHITE   = "\e[37m"
 
     class << self
-      def class_from_string(fq_class, must: true)
-        fq_class.split('::').inject(Object) do |mod, class_name|
-          mod.const_get(class_name)
-        end
-      rescue NameError
-        raise if must
-      end
-
       def parse_function_name(name)
         package_tokens = name.split('/')
 

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.74.0'
+  VERSION = '0.77.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.77.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -369,11 +369,13 @@ files:
 - lib/appmap/gem_hooks/activerecord.yml
 - lib/appmap/gem_hooks/activesupport.yml
 - lib/appmap/gem_hooks/cancancan.yml
+- lib/appmap/gem_hooks/devise.yml
 - lib/appmap/gem_hooks/rails.yml
 - lib/appmap/gem_hooks/railties.yml
 - lib/appmap/gem_hooks/resque.yml
 - lib/appmap/gem_hooks/sidekiq.yml
 - lib/appmap/gem_hooks/sprockets.yml
+- lib/appmap/handler.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
 - lib/appmap/handler/rails/request_handler.rb