Skip to content

Commit fcd793b

Browse files
authored
Merge pull request #284 from applandinc/feat/recorder-type
feat: Emit metadata.recorder.type
2 parents 80b7d97 + 6358669 commit fcd793b

File tree

9 files changed

+17
-10
lines changed

9 files changed

+17
-10
lines changed

lib/appmap/cucumber.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ def update_metadata(scenario, base_metadata)
9292
'version' => Gem.loaded_specs['cucumber']&.version&.to_s
9393
}
9494
m['recorder'] = {
95-
'name' => 'cucumber'
95+
'name' => 'cucumber',
96+
'type' => 'tests'
9697
}
9798
end
9899
end

lib/appmap/middleware/remote_recording.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def ws_stop_recording(req)
6363

6464
metadata = AppMap.detect_metadata
6565
metadata[:recorder] = {
66-
name: 'remote_recording'
66+
name: 'remote_recording',
67+
type: 'remote'
6768
}
6869

6970
response = JSON.generate \
@@ -103,7 +104,8 @@ def call(env)
103104
metadata[:name] = appmap_name
104105
metadata[:timestamp] = start_time.to_f
105106
metadata[:recorder] = {
106-
name: 'record_requests'
107+
name: 'rack',
108+
type: 'requests'
107109
}
108110

109111
appmap = {

lib/appmap/minitest.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ def save(name:, class_map:, source_location:, test_status:, exception:, events:)
101101
version: Gem.loaded_specs['minitest']&.version&.to_s
102102
}
103103
m[:recorder] = {
104-
name: 'minitest'
104+
name: 'minitest',
105+
type: 'tests'
105106
}
106107
m[:test_status] = test_status
107108
if exception

lib/appmap/record.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
metadata = AppMap.detect_metadata
1616
metadata[:recorder] = {
17-
name: 'record_process'
17+
name: 'record_process',
18+
type: 'process'
1819
}
1920

2021
appmap = {

lib/appmap/rspec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ def save(name:, class_map:, source_location:, test_status:, exception:, events:)
192192
version: Gem.loaded_specs['rspec-core']&.version&.to_s
193193
}
194194
m[:recorder] = {
195-
name: 'rspec'
195+
name: 'rspec',
196+
type: 'tests'
196197
}
197198
m[:test_status] = test_status
198199
if exception

lib/appmap/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module AppMap
55

66
VERSION = '0.90.1'
77

8-
APPMAP_FORMAT_VERSION = '1.7.0'
8+
APPMAP_FORMAT_VERSION = '1.9.0'
99

1010
SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
1111

test/cucumber_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_cucumber
3535
assert_includes metadata.keys, 'client'
3636
assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client'])
3737
assert_includes metadata.keys, 'recorder'
38-
assert_equal({ name: 'cucumber' }.stringify_keys, metadata['recorder'])
38+
assert_equal({ name: 'cucumber', type: 'tests' }.stringify_keys, metadata['recorder'])
3939

4040
assert_includes metadata.keys, 'frameworks'
4141
cucumber = metadata['frameworks'].select {|f| f['name'] == 'cucumber'}
@@ -62,7 +62,7 @@ def test_cucumber4
6262
assert_includes metadata.keys, 'client'
6363
assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client'])
6464
assert_includes metadata.keys, 'recorder'
65-
assert_equal({ name: 'cucumber' }.stringify_keys, metadata['recorder'])
65+
assert_equal({ name: 'cucumber', type: 'tests' }.stringify_keys, metadata['recorder'])
6666

6767
assert_includes metadata.keys, 'frameworks'
6868
cucumber = metadata['frameworks'].select {|f| f['name'] == 'cucumber'}

test/minitest_test.rb

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def test_hello
2929
metadata = appmap['metadata']
3030
assert_equal 'minitest_recorder', metadata['app']
3131
assert_equal 'minitest', metadata['recorder']['name']
32+
assert_equal 'tests', metadata['recorder']['type']
3233
assert_equal 'ruby', metadata['language']['name']
3334
assert_equal 'Hello hello', metadata['name']
3435
assert_equal 'test/hello_test.rb:9', metadata['source_location']

test/rspec_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_record_decorated_rspec
3232
assert_includes metadata.keys, 'client'
3333
assert_equal({ name: 'appmap', url: AppMap::URL, version: AppMap::VERSION }.stringify_keys, metadata['client'])
3434
assert_includes metadata.keys, 'recorder'
35-
assert_equal({ name: 'rspec' }.stringify_keys, metadata['recorder'])
35+
assert_equal({ name: 'rspec', type: 'tests' }.stringify_keys, metadata['recorder'])
3636

3737
assert_includes metadata.keys, 'frameworks'
3838
rspec = metadata['frameworks'].select {|f| f['name'] == 'rspec'}

0 commit comments

Comments
 (0)