Merge branch 'main' into rubocop-perf

instrumentation/active_record/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_record
 
+### v0.8.1 / 2024-11-21
+
+* FIXED: Pass block argument in ActiveRecord `find_by_sql` patch.
+
 ### v0.8.0 / 2024-10-22
 
 * BREAKING CHANGE: Rename Active Record find_by_sql spans to query

instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb

@@ -20,9 +20,9 @@ class << base
           module ClassMethods
             method_name = ::ActiveRecord.version >= Gem::Version.new('7.0.0') ? :_query_by_sql : :find_by_sql
 
-            define_method(method_name) do |*args, **kwargs|
+            define_method(method_name) do |*args, **kwargs, &block|
               tracer.in_span("#{self} query") do
-                super(*args, **kwargs)
+                super(*args, **kwargs, &block)
               end
             end
 

instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
-      VERSION = '0.8.0'
+      VERSION = '0.8.1'
     end
   end
 end

instrumentation/active_record/test/instrumentation/active_record/patches/querying_test.rb

@@ -14,6 +14,11 @@
   let(:spans) { exporter.finished_spans }
 
   before { exporter.reset }
+  after do
+    ActiveRecord::Base.subclasses.each do |model|
+      model.connection.truncate(model.table_name)
+    end
+  end
 
   describe 'query' do
     it 'traces' do
@@ -28,5 +33,79 @@
       _(user_find_spans.length).must_equal(2)
       _(account_find_span).wont_be_nil
     end
+
+    describe 'find_by_sql' do
+      it 'creates a span' do
+        Account.create!
+
+        Account.find_by_sql('SELECT * FROM accounts')
+
+        account_find_span = spans.find { |s| s.name == 'Account query' }
+        _(account_find_span).wont_be_nil
+        _(account_find_span.attributes).must_be_empty
+      end
+
+      describe 'given a block' do
+        it 'creates a span' do
+          account = Account.create!
+
+          record_ids = []
+
+          Account.find_by_sql('SELECT * FROM accounts') do |record|
+            record_ids << record.id
+          end
+
+          account_find_span = spans.find { |s| s.name == 'Account query' }
+          _(account_find_span).wont_be_nil
+          _(account_find_span.attributes).must_be_empty
+
+          _(record_ids).must_equal([account.id])
+        end
+      end
+    end
+
+    describe 'find_by' do
+      it 'creates a span' do
+        account = Account.create!
+        User.create!(account: account)
+
+        Account.find_by(id: account.id)
+
+        account_find_span = spans.find { |s| s.name == 'Account query' }
+        _(account_find_span).wont_be_nil
+        _(account_find_span.attributes).must_be_empty
+      end
+    end
+
+    describe 'find' do
+      it 'creates a span' do
+        account = Account.create!
+        User.create!(account: account)
+
+        Account.find(account.id)
+
+        account_find_span = spans.find { |s| s.name == 'Account query' }
+        _(account_find_span).wont_be_nil
+        _(account_find_span.attributes).must_be_empty
+      end
+
+      describe 'given a block' do
+        it 'creates a span' do
+          account = Account.create!
+          User.create!(account: account)
+
+          record_ids = []
+
+          Account.find(account.id) do |record|
+            record_ids << record.id
+          end
+
+          account_find_span = spans.find { |s| s.name == 'Account query' }
+          _(account_find_span).wont_be_nil
+          _(account_find_span.attributes).must_be_empty
+          _(record_ids).must_equal([account.id])
+        end
+      end
+    end
   end
 end

instrumentation/pg/lib/opentelemetry/instrumentation/pg/patches/connection.rb

@@ -15,7 +15,7 @@ module Patches
         # Module to prepend to PG::Connection for instrumentation
         module Connection # rubocop:disable Metrics/ModuleLength
           # Capture the first word (including letters, digits, underscores, & '.', ) that follows common table commands
-          TABLE_NAME = /\b(?:FROM|INTO|UPDATE|CREATE\s+TABLE(?:\s+IF\s+NOT\s+EXISTS)?|DROP\s+TABLE(?:\s+IF\s+EXISTS)?|ALTER\s+TABLE(?:\s+IF\s+EXISTS)?)\s+([\w\.]+)/i
+          TABLE_NAME = /\b(?:FROM|INTO|UPDATE|CREATE\s+TABLE(?:\s+IF\s+NOT\s+EXISTS)?|DROP\s+TABLE(?:\s+IF\s+EXISTS)?|ALTER\s+TABLE(?:\s+IF\s+EXISTS)?)\s+["]?([\w\.]+)["]?/i
 
           PG::Constants::EXEC_ISH_METHODS.each do |method|
             define_method method do |*args, &block|

instrumentation/pg/test/fixtures/sql_table_name.json

@@ -50,5 +50,9 @@
     {
       "name": "from_with_join",
       "sql": "SELECT columns FROM test_table JOIN table2 ON test_table.column = table2.column"
+    },
+    {
+      "name": "table_name_with_double_quotes",
+      "sql": "SELECT columns FROM \"test_table\""
     }
-  ]
+]