appmap 0.90.0 → 0.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463d826fad7ff1f1f143f350e329e0d9f58c649c6a517b519c42e852d620318a
-  data.tar.gz: f1429c965be9a9913c2163245e3cee99b6b014d73c85d77c19b1d1198b5e92ec
+  metadata.gz: 4d721301c87647a2778b1019519a7ada3fc225761b32149070ee38d8e47c5643
+  data.tar.gz: b4a130739d8974a3adbe44a9020618e9f88530174de19e8aaa0713dad23336c4
 SHA512:
-  metadata.gz: 8fb3886bd1f864f4619f5dc0bd158381b4c959a385990d786d45228c0a2f01169511ef0a3ebafec6e01874af566bb286edfb38367f34b83facb7959ded3bd4ae
-  data.tar.gz: 96adc82206bf8fb319675a6107281c1ebfb19c8254daac59ae9e88ebceeec8adc446b459a68fa3483108426cb5a65bfbecb42205b4b797ae3301777b6e473233
+  metadata.gz: 9f0778dc18e12f668bc072b94f21f61f1310c6d0163531e7e8407fd5e45d64d9a2e1b2a9d4c0cf98c1ba3f31697ca38ee50461f55b293893442a7b19f515ac3a
+  data.tar.gz: 9469680e79ccf0e8a43967c1c6d0104c48d35399fd39b205bfc9d3c41f32f2469d527989f38e965f80e00f320cfce9026c124ed775f27ba773bf58d449083d6c

data/.rubocop.yml

@@ -18,7 +18,7 @@ Layout/LineLength:
   Max: 120
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  AllowedMethods:
   - describe
   - it
   - context

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [0.91.0](https://github.com/applandinc/appmap-ruby/compare/v0.90.1...v0.91.0) (2022-09-19)
+
+
+### Features
+
+* Emit metadata.recorder.type ([6358669](https://github.com/applandinc/appmap-ruby/commit/6358669d5dc5123a613b18301519dac709614406))
+
+## [0.90.1](https://github.com/applandinc/appmap-ruby/compare/v0.90.0...v0.90.1) (2022-09-19)
+
+
+### Bug Fixes
+
+* Faster comment extraction ([f6199a6](https://github.com/applandinc/appmap-ruby/commit/f6199a607fadd58500d9cdc9394b39413e6b2930))
+
+
+### Performance Improvements
+
+* Don't save comment and source in classmap. ([c3c8e75](https://github.com/applandinc/appmap-ruby/commit/c3c8e755677d169610bfa7e55c12f0d418120eb7))
+
 # [0.90.0](https://github.com/applandinc/appmap-ruby/compare/v0.89.0...v0.90.0) (2022-09-15)
 
 

data/lib/appmap/class_map.rb

@@ -50,7 +50,7 @@ module AppMap
         end
       end
       Function = Struct.new(:name) do
-        attr_accessor :static, :location, :labels, :comment, :source
+        attr_accessor :static, :location, :labels
 
         def type
           'function'
@@ -63,8 +63,6 @@ module AppMap
             location: location,
             static: static,
             labels: labels,
-            comment: comment,
-            source: source
           }.delete_if { |_, v| v.nil? || v == [] }
         end
       end
@@ -126,7 +124,6 @@ module AppMap
           end
 
         comment = method.comment
-        function_info[:comment] = comment unless Util.blank?(comment)
 
         function_info[:labels] = parse_labels(comment) + (method.labels || [])
         object_infos << function_info

data/lib/appmap/cucumber.rb

@@ -92,7 +92,8 @@ module AppMap
             'version' => Gem.loaded_specs['cucumber']&.version&.to_s
           }
           m['recorder'] = {
-            'name' => 'cucumber'
+            'name' => 'cucumber',
+            'type' => 'tests'
           }
         end
       end

data/lib/appmap/middleware/remote_recording.rb

@@ -63,7 +63,8 @@ module AppMap
 
         metadata = AppMap.detect_metadata
         metadata[:recorder] = {
-          name: 'remote_recording'
+          name: 'remote_recording',
+          type: 'remote'
         }
 
         response = JSON.generate \
@@ -103,7 +104,8 @@ module AppMap
             metadata[:name] = appmap_name
             metadata[:timestamp] = start_time.to_f
             metadata[:recorder] = {
-              name: 'record_requests'
+              name: 'rack',
+              type: 'requests'
             }
     
             appmap = {

data/lib/appmap/minitest.rb

@@ -101,7 +101,8 @@ module AppMap
             version: Gem.loaded_specs['minitest']&.version&.to_s
           }
           m[:recorder] = {
-            name: 'minitest'
+            name: 'minitest',
+            type: 'tests'
           }
           m[:test_status] = test_status
           if exception

data/lib/appmap/record.rb

@@ -14,7 +14,8 @@ at_exit do
 
   metadata = AppMap.detect_metadata
   metadata[:recorder] = {
-    name: 'record_process'
+    name: 'record_process',
+    type: 'process'
   }
 
   appmap = {

data/lib/appmap/rspec.rb

@@ -192,7 +192,8 @@ module AppMap
             version: Gem.loaded_specs['rspec-core']&.version&.to_s
           }
           m[:recorder] = {
-            name: 'rspec'
+            name: 'rspec',
+            type: 'tests'
           }
           m[:test_status] = test_status
           if exception

data/lib/appmap/trace.rb

@@ -21,8 +21,11 @@ module AppMap
       end
 
       def comment
-        @method.comment
-      rescue MethodSource::SourceNotFoundError, Errno::EINVAL
+        return nil if source_location.nil? || source_location.first.start_with?('<')
+
+        # Do not use method_source's comment method because it's slow
+        @comment ||= RubyMethod.last_comment *source_location
+      rescue Errno::EINVAL, Errno::ENOENT
         nil
       end
 
@@ -37,6 +40,21 @@ module AppMap
       def labels
         @package.labels
       end
+
+      private
+
+      # Read file and get last comment before line.
+      def self.last_comment(file, line_number)
+        File.open(file) do |f|
+          buffer = []
+          f.each_line.lazy.take(line_number - 1).reverse_each do |line|
+            break unless (line =~ /^\s*#/) || (line =~ /^\s*$/)
+
+            buffer << line.lstrip
+          end
+          buffer.reverse.join
+        end
+      end
     end
 
     class Tracing

data/lib/appmap/version.rb

@@ -3,9 +3,9 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.90.0'
+  VERSION = '0.91.0'
 
-  APPMAP_FORMAT_VERSION = '1.7.0'
+  APPMAP_FORMAT_VERSION = '1.9.0'
 
   SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 0.91.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source