Skip to content

Commit

Permalink
Merge pull request #3849 from DataDog/add-http-route
Browse files Browse the repository at this point in the history
Add http.route tag to rails, grape, and sinatra integrations
  • Loading branch information
y9v authored Sep 19, 2024
2 parents f6ec8b7 + deaba02 commit a9e360b
Show file tree
Hide file tree
Showing 49 changed files with 4,848 additions and 37 deletions.
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 @@ -189,6 +189,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

0 comments on commit a9e360b

Please sign in to comment.