|
59 | 59 | end |
60 | 60 |
|
61 | 61 | it 'strips (:format) from http.route' do |
62 | | - skip "Rails #{Rails.gem_version} does not define ActionDispatch::Request#route_uri_pattern" if Rails.gem_version < Gem::Version.new('7.1') |
63 | | - |
64 | 62 | get 'items/1234' |
65 | 63 |
|
66 | 64 | _(span.attributes['http.route']).must_equal '/items/:id' |
|
150 | 148 | describe 'span naming' do |
151 | 149 | describe 'when using the default span_naming configuration' do |
152 | 150 | describe 'successful requests' do |
153 | | - describe 'Rails Version < 7.1' do |
154 | | - it 'uses the http method controller and action name' do |
155 | | - skip "Rails #{Rails.gem_version} uses ActionDispatch::Request#route_uri_pattern" if Rails.gem_version >= Gem::Version.new('7.1') |
156 | | - get '/ok' |
157 | | - |
158 | | - _(span.name).must_equal 'GET /example/ok' |
159 | | - end |
160 | | - |
161 | | - it 'excludes route params' do |
162 | | - skip "Rails #{Rails.gem_version} uses ActionDispatch::Request#route_uri_pattern" if Rails.gem_version >= Gem::Version.new('7.1') |
163 | | - get '/items/1234' |
| 151 | + it 'uses the Rails route' do |
| 152 | + get '/ok' |
164 | 153 |
|
165 | | - _(span.name).must_equal 'GET /example/item' |
166 | | - end |
| 154 | + _(span.name).must_equal 'GET /ok' |
167 | 155 | end |
168 | 156 |
|
169 | | - describe 'Rails Version >= 7.1' do |
170 | | - it 'uses the Rails route' do |
171 | | - skip "Rails #{Rails.gem_version} does not define ActionDispatch::Request#route_uri_pattern" if Rails.gem_version < Gem::Version.new('7.1') |
172 | | - get '/ok' |
| 157 | + it 'includes route params' do |
| 158 | + get '/items/1234' |
173 | 159 |
|
174 | | - _(span.name).must_equal 'GET /ok' |
175 | | - end |
176 | | - |
177 | | - it 'includes route params' do |
178 | | - skip "Rails #{Rails.gem_version} does not define ActionDispatch::Request#route_uri_pattern" if Rails.gem_version < Gem::Version.new('7.1') |
179 | | - get '/items/1234' |
180 | | - |
181 | | - _(span.name).must_equal 'GET /items/:id' |
182 | | - end |
| 160 | + _(span.name).must_equal 'GET /items/:id' |
183 | 161 | end |
184 | 162 | end |
185 | 163 |
|
186 | 164 | describe 'server errors' do |
187 | | - it 'uses the http method controller and action name for server side errors' do |
188 | | - skip "Rails #{Rails.gem_version} uses ActionDispatch::Request#route_uri_pattern" if Rails.gem_version >= Gem::Version.new('7.1') |
189 | | - |
190 | | - get 'internal_server_error' |
191 | | - |
192 | | - _(span.name).must_equal 'GET /example/internal_server_error' |
193 | | - end |
194 | | - |
195 | 165 | it 'uses the Rails route for server side errors' do |
196 | | - skip "Rails #{Rails.gem_version} uses ActionDispatch::Request#route_uri_pattern" if Rails.gem_version < Gem::Version.new('7.1') |
197 | | - |
198 | 166 | get 'internal_server_error' |
199 | 167 |
|
200 | 168 | _(span.name).must_equal 'GET /internal_server_error' |
|
0 commit comments