diff --git a/manifests/ruby.yml b/manifests/ruby.yml index 74bd26d787e..50cc5c540c0 100644 --- a/manifests/ruby.yml +++ b/manifests/ruby.yml @@ -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 diff --git a/utils/build/docker/ruby/rack/config.ru b/utils/build/docker/ruby/rack/config.ru index 04372221115..052e19f13e9 100644 --- a/utils/build/docker/ruby/rack/config.ru +++ b/utils/build/docker/ruby/rack/config.ru @@ -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| @@ -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 diff --git a/utils/build/docker/ruby/rails42/config/routes.rb b/utils/build/docker/ruby/rails42/config/routes.rb index 9ed67f5b6ec..0b1f2d79d04 100644 --- a/utils/build/docker/ruby/rails42/config/routes.rb +++ b/utils/build/docker/ruby/rails42/config/routes.rb @@ -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' diff --git a/utils/build/docker/ruby/rails52/config/routes.rb b/utils/build/docker/ruby/rails52/config/routes.rb index 9f50430f5e2..ab80e699f5e 100644 --- a/utils/build/docker/ruby/rails52/config/routes.rb +++ b/utils/build/docker/ruby/rails52/config/routes.rb @@ -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' diff --git a/utils/build/docker/ruby/rails61/config/routes.rb b/utils/build/docker/ruby/rails61/config/routes.rb index 9f50430f5e2..ab80e699f5e 100644 --- a/utils/build/docker/ruby/rails61/config/routes.rb +++ b/utils/build/docker/ruby/rails61/config/routes.rb @@ -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' diff --git a/utils/build/docker/ruby/rails72/config/routes.rb b/utils/build/docker/ruby/rails72/config/routes.rb index e1d8fd25c0c..3cb87346b5e 100644 --- a/utils/build/docker/ruby/rails72/config/routes.rb +++ b/utils/build/docker/ruby/rails72/config/routes.rb @@ -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' diff --git a/utils/build/docker/ruby/rails80/config/routes.rb b/utils/build/docker/ruby/rails80/config/routes.rb index 2d425c691e9..8a1443ef9fb 100644 --- a/utils/build/docker/ruby/rails80/config/routes.rb +++ b/utils/build/docker/ruby/rails80/config/routes.rb @@ -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'