Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add http.route tag to rails, grape, and sinatra integrations #3849

Merged
merged 38 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
be47189
Add http.route to rails journey router
y9v Aug 14, 2024
0cc1427
Add http.route tag to sinatra route span
y9v Aug 14, 2024
632e687
Add comment to Journey::Router instrumentation
y9v Aug 15, 2024
8e4df61
Fix http route identification for rails engines
y9v Aug 15, 2024
fc667ff
Fix version checking for ActionPack patcher
y9v Aug 15, 2024
8c96b50
Add type signatures for action pack patcher and instrumentation
y9v Aug 16, 2024
4014673
Add http.route to Grape
y9v Aug 16, 2024
7d47f3e
Add integration tests for Rails journey router patch
y9v Aug 16, 2024
73d5706
Fix comment in rails 7 spec support file
y9v Aug 16, 2024
3cd9d3e
Add rails7 spec helper file to rubocop ignore list
y9v Aug 16, 2024
7bd59cb
Remove active_job require from Journey test
y9v Aug 19, 2024
aa4cf48
Fix rails configuration spec helpers
y9v Aug 19, 2024
ec064d8
Fix engine route handling for rails < 7.1
y9v Aug 19, 2024
ba280ac
Fix sinatra integration
y9v Aug 19, 2024
40f02e4
Disable datadog static analysis for rails 7 spec helper
y9v Aug 19, 2024
30c9362
Fix checking of route presence in ActionDispatch instrumentation
y9v Aug 21, 2024
bb72ebc
Add appraisals for action_pack
y9v Aug 21, 2024
0bdc2b9
Remove ::set_http_route_tag and add a method to format the route
y9v Aug 21, 2024
ddb1ccd
Fix Journey router instrumentation test description
y9v Aug 21, 2024
5ba0fef
Remove actionpack appraisal
y9v Aug 22, 2024
7609f54
Fix Matrixfile for ruby 2.x for actionpack
y9v Aug 22, 2024
2a6130d
Add http.route tag setting to rack middleware as fallback
y9v Aug 26, 2024
079872b
Change patching of journey router for rails > 7.1
y9v Aug 28, 2024
60ceee4
Add handling of ambiguous rails routes with constraints
y9v Aug 29, 2024
2e3a70b
Add handling for rack applications mounted in Rails
y9v Aug 29, 2024
d5bbc94
Add concatenation of route and script name to rack middleware
y9v Aug 30, 2024
4b6f5ed
Use a constant in rack http route specs
y9v Aug 30, 2024
8a42cc1
Merge branch 'master' into add-http-route
y9v Aug 30, 2024
cae659f
Improve configuration reset in specs
y9v Sep 13, 2024
df0bd9a
Merge branch 'master' into add-http-route
y9v Sep 13, 2024
3207b16
Improve rack instrumentation and specs
y9v Sep 13, 2024
81217b9
Update gemfiles/*
y9v Sep 13, 2024
fedd3e3
Change around(:example) to around(:suite) for rack http route test
y9v Sep 14, 2024
7317018
Fix route path tag in rack, improve grape route instrumentation code
y9v Sep 17, 2024
c62c24d
Add a comment to grape endpoint explaining route format removal
y9v Sep 17, 2024
b72916c
Add handling for possible nil value of env['SCRIPT_NAME']
y9v Sep 17, 2024
704eb19
Merge branch 'master' into add-http-route
y9v Sep 17, 2024
deaba02
Remove debugging code
y9v Sep 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,4 @@ Style/ClassVars:
- 'spec/datadog/tracing/contrib/rails/support/rails4.rb'
- 'spec/datadog/tracing/contrib/rails/support/rails5.rb'
- 'spec/datadog/tracing/contrib/rails/support/rails6.rb'
- 'spec/datadog/tracing/contrib/rails/support/rails7.rb'
5 changes: 4 additions & 1 deletion Matrixfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
'opentelemetry' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'
},
'action_pack' => {
'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
'rails5-mysql2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
'rails6-mysql2' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ 3.4 / ✅ jruby',
'rails7' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
'rails71' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby',
},
'action_view' => {
'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
Expand Down
4 changes: 4 additions & 0 deletions appraisal/ruby-2.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@
gem 'ruby-kafka', '>= 0.7.10'
end

appraise 'actionpack-5.0' do
gem 'rails', '~> 5.0'
end

appraise 'contrib' do
gem 'concurrent-ruby'
gem 'dalli', '>= 3.0.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
gem 'net-smtp'
end

appraise 'rails7' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end

appraise 'resque2-redis3' do
gem 'redis', '< 4.0'
gem 'resque', '>= 2.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
gem 'net-smtp'
end

appraise 'rails7' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end

appraise 'resque2-redis3' do
gem 'redis', '< 4.0'
gem 'resque', '>= 2.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
gem 'net-smtp'
end

appraise 'rails7' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end

appraise 'resque2-redis3' do
gem 'redis', '< 4.0'
gem 'resque', '>= 2.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
gem 'net-smtp'
end

appraise 'rails7' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end

appraise 'resque2-redis3' do
gem 'redis', '< 4.0'
gem 'resque', '>= 2.0'
Expand Down
8 changes: 8 additions & 0 deletions appraisal/ruby-3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
gem 'net-smtp'
end

appraise 'rails7' do
gem 'rails', '~> 7.0.0'
end

appraise 'rails71' do
gem 'rails', '~> 7.1.0'
end

appraise 'resque2-redis3' do
gem 'redis', '< 4.0'
gem 'resque', '>= 2.0'
Expand Down
49 changes: 49 additions & 0 deletions gemfiles/ruby_3.0_rails7.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading