diff --git a/lib/appmap/cucumber.rb b/lib/appmap/cucumber.rb index e407b59d..f56c339c 100644 --- a/lib/appmap/cucumber.rb +++ b/lib/appmap/cucumber.rb @@ -92,7 +92,8 @@ def update_metadata(scenario, base_metadata) 'version' => Gem.loaded_specs['cucumber']&.version&.to_s } m['recorder'] = { - 'name' => 'cucumber' + 'name' => 'cucumber', + 'type' => 'tests' } end end diff --git a/lib/appmap/middleware/remote_recording.rb b/lib/appmap/middleware/remote_recording.rb index 3d4895d6..e91cf082 100644 --- a/lib/appmap/middleware/remote_recording.rb +++ b/lib/appmap/middleware/remote_recording.rb @@ -63,7 +63,8 @@ def ws_stop_recording(req) metadata = AppMap.detect_metadata metadata[:recorder] = { - name: 'remote_recording' + name: 'remote_recording', + type: 'remote' } response = JSON.generate \ @@ -103,7 +104,8 @@ def call(env) metadata[:name] = appmap_name metadata[:timestamp] = start_time.to_f metadata[:recorder] = { - name: 'record_requests' + name: 'rack', + type: 'requests' } appmap = { diff --git a/lib/appmap/minitest.rb b/lib/appmap/minitest.rb index 5c66e391..eea0ce89 100644 --- a/lib/appmap/minitest.rb +++ b/lib/appmap/minitest.rb @@ -101,7 +101,8 @@ def save(name:, class_map:, source_location:, test_status:, exception:, events:) version: Gem.loaded_specs['minitest']&.version&.to_s } m[:recorder] = { - name: 'minitest' + name: 'minitest', + type: 'tests' } m[:test_status] = test_status if exception diff --git a/lib/appmap/record.rb b/lib/appmap/record.rb index 4ba8c8b3..12814e05 100644 --- a/lib/appmap/record.rb +++ b/lib/appmap/record.rb @@ -14,7 +14,8 @@ metadata = AppMap.detect_metadata metadata[:recorder] = { - name: 'record_process' + name: 'record_process', + type: 'process' } appmap = { diff --git a/lib/appmap/rspec.rb b/lib/appmap/rspec.rb index ed506abf..6da4646a 100644 --- a/lib/appmap/rspec.rb +++ b/lib/appmap/rspec.rb @@ -192,7 +192,8 @@ def save(name:, class_map:, source_location:, test_status:, exception:, events:) version: Gem.loaded_specs['rspec-core']&.version&.to_s } m[:recorder] = { - name: 'rspec' + name: 'rspec', + type: 'tests' } m[:test_status] = test_status if exception diff --git a/lib/appmap/version.rb b/lib/appmap/version.rb index 90f53861..3daa3a6a 100644 --- a/lib/appmap/version.rb +++ b/lib/appmap/version.rb @@ -5,7 +5,7 @@ module AppMap VERSION = '0.90.1' - 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 diff --git a/test/cucumber_test.rb b/test/cucumber_test.rb index 107afcea..0644f56c 100644 --- a/test/cucumber_test.rb +++ b/test/cucumber_test.rb @@ -35,7 +35,7 @@ def test_cucumber assert_includes metadata.keys, 'client' assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client']) assert_includes metadata.keys, 'recorder' - assert_equal({ name: 'cucumber' }.stringify_keys, metadata['recorder']) + assert_equal({ name: 'cucumber', type: 'tests' }.stringify_keys, metadata['recorder']) assert_includes metadata.keys, 'frameworks' cucumber = metadata['frameworks'].select {|f| f['name'] == 'cucumber'} @@ -62,7 +62,7 @@ def test_cucumber4 assert_includes metadata.keys, 'client' assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client']) assert_includes metadata.keys, 'recorder' - assert_equal({ name: 'cucumber' }.stringify_keys, metadata['recorder']) + assert_equal({ name: 'cucumber', type: 'tests' }.stringify_keys, metadata['recorder']) assert_includes metadata.keys, 'frameworks' cucumber = metadata['frameworks'].select {|f| f['name'] == 'cucumber'} diff --git a/test/minitest_test.rb b/test/minitest_test.rb index 2f3fc1bc..26f1e6d4 100644 --- a/test/minitest_test.rb +++ b/test/minitest_test.rb @@ -29,6 +29,7 @@ def test_hello metadata = appmap['metadata'] assert_equal 'minitest_recorder', metadata['app'] assert_equal 'minitest', metadata['recorder']['name'] + assert_equal 'tests', metadata['recorder']['type'] assert_equal 'ruby', metadata['language']['name'] assert_equal 'Hello hello', metadata['name'] assert_equal 'test/hello_test.rb:9', metadata['source_location'] diff --git a/test/rspec_test.rb b/test/rspec_test.rb index b30618b2..7a84b204 100644 --- a/test/rspec_test.rb +++ b/test/rspec_test.rb @@ -32,7 +32,7 @@ def test_record_decorated_rspec assert_includes metadata.keys, 'client' assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client']) assert_includes metadata.keys, 'recorder' - assert_equal({ name: 'rspec' }.stringify_keys, metadata['recorder']) + assert_equal({ name: 'rspec', type: 'tests' }.stringify_keys, metadata['recorder']) assert_includes metadata.keys, 'frameworks' rspec = metadata['frameworks'].select {|f| f['name'] == 'rspec'}