revision

lib/solarwinds_apm/patch/tag_sql/sw_pg_patch.rb

@@ -8,6 +8,9 @@ module SolarWindsAPM
   module Patch
     module TagSql
       module SWOPgPatch
+        # These are all alike in that they will have a SQL
+        # statement as the first parameter, and they are all
+        # non-prepared statement execute.
         EXEC_ISH_METHODS = %i[
           exec
           query
@@ -19,16 +22,17 @@ module SWOPgPatch
         ].freeze
 
         EXEC_ISH_METHODS.each do |method|
-          define_method method do |*args, &block|
+          define_method method do |*args|
             annotated_sql = ::SolarWindsAPM::Patch::TagSql::SWODboUtils.annotate_span_and_sql(args[0])
             args[0] = annotated_sql
-            super(*args, &block)
+            super(*args)
           end
         end
       end
     end
   end
 end
 
-# need to prepend before pg instrumentation
+# need to prepend before pg instrumentation patch itself
+# upstream instrumentation -> our patch -> original function
 PG::Connection.prepend(SolarWindsAPM::Patch::TagSql::SWOPgPatch) if defined?(PG::Connection)

test/patch/sw_pg_patch_integrate_test.rb

@@ -50,7 +50,7 @@ def pg_dbo_integration_verification(sql, finished_spans)
 
     pg_client = PG::Connection.new
 
-    args = ['SELECT * FROM ABC;', 'a1']
+    args = ['SELECT * FROM ABC;']
 
     sql = pg_client.query(*args)
     finished_spans = exporter.finished_spans