appmap 0.93.0 → 0.93.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837bc5a036d3217c12b40f46ed7e21406ef298b3ca5c8b712b8ce1f15707434e
-  data.tar.gz: 763d5c9abd0f8583035117a54c8a6bb0d841089c902ab2e1805ff0795f3acff1
+  metadata.gz: 44d648e81f7717cbf027f99687c3c69fb558f19540f5882d7098c163ff2968b1
+  data.tar.gz: '063487dc2a84f0a0632baadef8133ec8a94f2fad36d0d438f7fa015b6fafec14'
 SHA512:
-  metadata.gz: 7812c770c07f1e00dc93e0ce4c79598c26daff3fe1d737804dcfc012d29cdefe0754cd3ff06f2810feebe1952cb2038cee2f078d486067188875ec7eb71842de
-  data.tar.gz: 73db38443e22f4a57bf8575035b4735f7fe044f57dd78f6213ac2694434487732778cb0feacb3733c0565080dd859b22dfcf651ec129b70f028a1500a9ff63ea
+  metadata.gz: d3c6cb7ee444b886b97fb5bbac3825b8aa76efa10f09ab8985e44b1cf421231bf783202d47db166c269a0f80a524d674df9d09a3b2004daf79bb21f31faad528
+  data.tar.gz: 7ce3d2ae17406c01360a4cc4319e00b2f940c8a110d96d9bcdcb3418af93d65efb2bbd4fe94c059eb92896044da38a1d6f03293ad44c4a55892bcb77ccabba2e

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.93.2](https://github.com/getappmap/appmap-ruby/compare/v0.93.1...v0.93.2) (2022-10-07)
+
+
+### Bug Fixes
+
+* Add language, appmap_dir to generated appmap.yml ([9b5e590](https://github.com/getappmap/appmap-ruby/commit/9b5e590cd9d3d5e5b1115917766a2be6c20f3015))
+
+## [0.93.1](https://github.com/getappmap/appmap-ruby/compare/v0.93.0...v0.93.1) (2022-10-04)
+
+
+### Bug Fixes
+
+* Unyield static asset requests ([4041e4b](https://github.com/getappmap/appmap-ruby/commit/4041e4bbfb44612c5ade2cba334e1ab36a7929e5))
+
 # [0.93.0](https://github.com/getappmap/appmap-ruby/compare/v0.92.1...v0.93.0) (2022-09-22)
 
 

data/lib/appmap/config.rb

@@ -346,6 +346,8 @@ module AppMap
         load(config_data).tap do |config|
           {
             'name' => config.name,
+            'language' => 'ruby',
+            'appmap_dir' => AppMap::DEFAULT_APPMAP_DIR,
             'packages' => config.packages.select{|p| p.path}.map do |pkg|
               { 'path' => pkg.path }
             end,

data/lib/appmap/middleware/remote_recording.rb

@@ -89,39 +89,46 @@ module AppMap
         # into a separate Tracer.
         tracer = AppMap.tracing.trace(thread: Thread.current) if record_all_requests?
 
-        @app.call(env).tap do |status, headers|
-          if tracer
-            AppMap.tracing.delete(tracer)
-
-            events = tracer.events.map(&:to_h)
-
-            appmap_name = "#{req.request_method} #{req.path} (#{status}) - #{start_time.strftime('%T.%L')}"
-            appmap_file_name = AppMap::Util.scenario_filename([ start_time.to_f, req.url ].join('_'))
-            output_dir = File.join(AppMap::DEFAULT_APPMAP_DIR, 'requests')
-            appmap_file_path = File.join(output_dir, appmap_file_name)
-
-            metadata = AppMap.detect_metadata
-            metadata[:name] = appmap_name
-            metadata[:timestamp] = start_time.to_f
-            metadata[:recorder] = {
-              name: 'rack',
-              type: 'requests'
-            }
-    
-            appmap = {
-              version: AppMap::APPMAP_FORMAT_VERSION,
-              classMap: AppMap.class_map(tracer.event_methods),
-              metadata: metadata,
-              events: events
-            }
-
-            FileUtils.mkdir_p(output_dir)
-            File.write(appmap_file_path, JSON.generate(appmap))
-
-            headers['AppMap-Name'] = File.expand_path(appmap_name)
-            headers['AppMap-File-Name'] = File.expand_path(appmap_file_path)
-          end
+        record_request = lambda do |args|
+          return unless tracer
+
+          AppMap.tracing.delete(tracer)
+
+          status, headers = args
+          events = tracer.events.map(&:to_h)
+
+          event_fields = events.map(&:keys).flatten.map(&:to_sym).uniq.sort
+          return unless %i[http_server_request http_server_response].all? { |field| event_fields.include?(field) }
+
+          path = req.path.gsub(/\/{2,}/, '/') # Double slashes have been observed
+          appmap_name = "#{req.request_method} #{path} (#{status}) - #{start_time.strftime('%T.%L')}"
+          appmap_file_name = AppMap::Util.scenario_filename([ start_time.to_f, req.url ].join('_'))
+          output_dir = File.join(AppMap::DEFAULT_APPMAP_DIR, 'requests')
+          appmap_file_path = File.join(output_dir, appmap_file_name)
+
+          metadata = AppMap.detect_metadata
+          metadata[:name] = appmap_name
+          metadata[:timestamp] = start_time.to_f
+          metadata[:recorder] = {
+            name: 'rack',
+            type: 'requests'
+          }
+  
+          appmap = {
+            version: AppMap::APPMAP_FORMAT_VERSION,
+            classMap: AppMap.class_map(tracer.event_methods),
+            metadata: metadata,
+            events: events
+          }
+
+          FileUtils.mkdir_p(output_dir)
+          File.write(appmap_file_path, JSON.generate(appmap))
+
+          headers['AppMap-Name'] = File.expand_path(appmap_name)
+          headers['AppMap-File-Name'] = File.expand_path(appmap_file_path)
         end
+
+        @app.call(env).tap(&record_request)
       end
 
       def recording_state

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.93.0'
+  VERSION = '0.93.2'
 
   APPMAP_FORMAT_VERSION = '1.9.0'
 

metadata

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