20846: Remove deprecated Random::DEFAULT usage.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 3e4502545b5d6103601d201d35135e5cfd592d60..e7441df4beecb0bb3f13214a95f61850be40dade 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -588,7 +588,7 @@ class ApplicationController < ActionController::Base
   def set_current_request_id
     response.headers['X-Request-Id'] =
       Thread.current[:request_id] =
-      "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+      "req-" + Random.new.rand(2**128).to_s(36)[0..19]
     yield
     Thread.current[:request_id] = nil
   end

diff --git a/sdk/ruby/lib/arvados.rb b/sdk/ruby/lib/arvados.rb
index 7b99ba5788943581b4c0a2da469ebd60f32a1c03..73a0d0d2f7c6c05f6674e2260fe788d33c4b2aa4 100644 (file)
--- a/sdk/ruby/lib/arvados.rb
+++ b/sdk/ruby/lib/arvados.rb
@@ -21,7 +21,7 @@ class Arvados
     attr_reader :request_id
 
     def execute(*args)
-      @request_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+      @request_id = "req-" + Random.new.rand(2**128).to_s(36)[0..19]
       if args.last.is_a? Hash
         args.last[:headers] ||= {}
         args.last[:headers]['X-Request-Id'] = @request_id

diff --git a/services/api/config/initializers/request_id_middleware.rb b/services/api/config/initializers/request_id_middleware.rb
index e2158801e7618ba47dd756c55d497f17c6616679..cfb018ca9705dcc18a2ee53defbd9468a33d2a90 100644 (file)
--- a/services/api/config/initializers/request_id_middleware.rb
+++ b/services/api/config/initializers/request_id_middleware.rb
@@ -14,7 +14,7 @@ module CustomRequestId
   end
 
   def internal_request_id
-    "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+    "req-" + Random.new.rand(2**128).to_s(36)[0..19]
   end
 end
 
@@ -22,4 +22,4 @@ class ActionDispatch::RequestId
   # Instead of using the default UUID-like format for X-Request-Id headers,
   # use our own.
   prepend CustomRequestId
-end
\ No newline at end of file
+end