Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion manifests/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,15 @@ tests/:
test_profiling.py:
Test_Profile: missing_feature (temporary fix, scenario not working on dd-trace-rb CI)
test_protobuf.py: missing_feature
test_resource_renaming.py: missing_feature
test_resource_renaming.py:
Test_Resource_Renaming_HTTP_Endpoint_Tag:
"*": v2.23.0.dev
sinatra14: irrelevant
sinatra22: irrelevant
sinatra32: irrelevant
sinatra41: irrelevant
uds-sinatra: irrelevant
Test_Resource_Renaming_Stats_Aggregation_Keys: missing_feature
test_sampling_rates.py:
Test_SampleRateFunction: v2.15.0 # real version unknown
Test_SamplingDecisionAdded: v2.12.1 # real version unknown
Expand Down
8 changes: 8 additions & 0 deletions utils/build/docker/ruby/rack/config.ru
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,12 @@ module Flush
end
end

module ResourceRenaming
def run
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end

# trivial rack endpoint. We use a proc instead of Rack Builder because
# we compare the request path using regexp and include?
app = proc do |env|
Expand Down Expand Up @@ -473,6 +479,8 @@ app = proc do |env|
UserLoginFailureEventV2.run(request)
elsif request.path == '/flush'
Flush.run(request)
elsif request.path.start_with?('/resource_renaming')
ResourceRenaming.run
else
NotFound.run
end
Expand Down
7 changes: 7 additions & 0 deletions utils/build/docker/ruby/rails42/config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
Rails.application.routes.draw do
class ResourceRenamingRackApp
def call(_env)
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end
mount ResourceRenamingRackApp.new => '/resource_renaming'

get '/' => 'system_test#root'
post '/' => 'system_test#root'

Expand Down
7 changes: 7 additions & 0 deletions utils/build/docker/ruby/rails52/config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

class ResourceRenamingRackApp
def call(_env)
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end
mount ResourceRenamingRackApp.new => '/resource_renaming'

get '/' => 'system_test#root'
post '/' => 'system_test#root'

Expand Down
7 changes: 7 additions & 0 deletions utils/build/docker/ruby/rails61/config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Rails.application.routes.draw do
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

class ResourceRenamingRackApp
def call(_env)
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end
mount ResourceRenamingRackApp.new => '/resource_renaming'

get '/' => 'system_test#root'
post '/' => 'system_test#root'

Expand Down
7 changes: 7 additions & 0 deletions utils/build/docker/ruby/rails72/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
# Defines the root path route ("/")
# root "articles#index"

class ResourceRenamingRackApp
def call(_env)
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end
mount ResourceRenamingRackApp.new => '/resource_renaming'

get '/' => 'system_test#root'
post '/' => 'system_test#root'

Expand Down
7 changes: 7 additions & 0 deletions utils/build/docker/ruby/rails80/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
# Defines the root path route ("/")
# root "articles#index"

class ResourceRenamingRackApp
def call(_env)
[200, {'Content-Type' => 'text/plain'}, ['OK']]
end
end
mount ResourceRenamingRackApp.new => '/resource_renaming'

get '/' => 'system_test#root'
post '/' => 'system_test#root'

Expand Down
Loading