Conditionally handle for ruby 7.1

aws · Aug 23, 2024 · 8d232b1 · 8d232b1
1 parent 373b1ac
commit 8d232b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/lib/aws-xray-sdk/facets/rails/active_record.rb b/lib/aws-xray-sdk/facets/rails/active_record.rb
@@ -1,5 +1,4 @@
 require 'active_record'
-require 'aws-xray-sdk/utils/math_utils'
 
 module XRay
   module Rails
@@ -28,9 +27,11 @@ def record(transaction)
           subsegment = XRay.recorder.begin_subsegment name, namespace: 'remote'
           # subsegment is nil in case of context missing
           return if subsegment.nil?
-          subsegment.start_time = (::Rails::VERSION::MAJOR == 7 and ::Rails::VERSION::MINOR == 1) ? convert_time_in_seconds(transaction.time.to_f) : transaction.time.to_f
+          # Rails 7.1 introduced time measurement in milliseconds instead seconds of causing xray-sdk to report wrong duration for transaction calls.
+          # This is being handled in rails 7.2 and later. https://github.com/rails/rails/pull/50779 
+          subsegment.start_time = (::Rails::VERSION::MAJOR == 7 and ::Rails::VERSION::MINOR == 1) ? transaction.time.to_f/1000 : transaction.time.to_f
           subsegment.sql = sql
-          XRay.recorder.end_subsegment end_time: (::Rails::VERSION::MAJOR == 7 and ::Rails::VERSION::MINOR == 1) ? convert_time_in_seconds(transaction.end.to_f) : transaction.end.to_f
+          XRay.recorder.end_subsegment end_time: (::Rails::VERSION::MAJOR == 7 and ::Rails::VERSION::MINOR == 1) ? transaction.end.to_f/1000 : transaction.end.to_f
         end
 
         private

diff --git a/lib/aws-xray-sdk/utils/math_utils.rb b/lib/aws-xray-sdk/utils/math_utils.rb
diff --git a/test/aws-xray-sdk/tc_time_conversion.rb b/test/aws-xray-sdk/tc_time_conversion.rb