Merge branch 'main' into 669-add-net_ldap-instrumentation

Author: kaylareopelle

.github/workflows/ossf-scorecard.yml

@@ -43,6 +43,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

helpers/sql-processor/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-sql-processor
 
+### v0.3.0 / 2025-11-04
+
+* ADDED: Refactor SQL processor file structure for clarity
+
 ### v0.2.0 / 2025-10-22
 
 * BREAKING CHANGE: Min Ruby Version 3.2

helpers/sql-processor/lib/opentelemetry/helpers/sql_processor/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module SqlProcessor
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

instrumentation/all/opentelemetry-instrumentation-all.gemspec

@@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-mongo', '~> 0.25.0'
   spec.add_dependency 'opentelemetry-instrumentation-mysql2', '~> 0.31.0'
   spec.add_dependency 'opentelemetry-instrumentation-net_http', '~> 0.26.0'
-  spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.32.0'
+  spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.33.0'
   spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.11.1'
   spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.6.0'
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.29.0'

instrumentation/pg/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-pg
 
+### v0.33.0 / 2025-11-03
+
+* ADDED: Instrument PG connect
+
 ### v0.32.0 / 2025-10-22
 
 * BREAKING CHANGE: Min Ruby Version 3.2

instrumentation/pg/lib/opentelemetry/instrumentation/pg/constants.rb

@@ -94,6 +94,12 @@ module Constants
           async_exec_prepared
           sync_exec_prepared
         ].freeze
+
+        CONNECTION_METHODS = %i[
+          connect
+          open
+          async_connect
+        ].freeze
       end
     end
   end

instrumentation/pg/lib/opentelemetry/instrumentation/pg/instrumentation.rb

@@ -40,6 +40,7 @@ def require_dependencies
 
         def patch_client
           ::PG::Connection.prepend(Patches::Connection)
+          ::PG::Connection.singleton_class.prepend(Patches::Connect)
         end
       end
     end

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

@@ -12,6 +12,65 @@ module OpenTelemetry
   module Instrumentation
     module PG
       module Patches
+        # Utility methods for setting connection attributes from Connect module
+        module ConnectionHelper
+          module_function
+
+          def set_connection_attributes(span, conn, config)
+            attributes = {
+              'db.system' => 'postgresql',
+              'db.name' => conn.db,
+              'db.user' => conn.user
+            }
+            attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+
+            h = conn.host
+            if h&.start_with?('/')
+              attributes['net.sock.family'] = 'unix'
+              attributes['net.peer.name'] = h
+            else
+              attributes['net.transport'] = 'ip_tcp'
+              attributes['net.peer.name'] = h
+              attributes['net.peer.port'] = conn.port if defined?(::PG::DEF_PGPORT)
+            end
+
+            attributes.merge!(OpenTelemetry::Instrumentation::PG.attributes)
+            attributes.compact!
+
+            span.add_attributes(attributes)
+          end
+        end
+
+        # Module to prepend to PG::Connection singleton class for connection initialization
+        # We override `new` instead of `initialize` because PG::Connection.new is implemented
+        # as a Ruby method that calls the C-level connect_start, bypassing initialize.
+        # We also need to override the aliases (open, connect, async_connect) because they
+        # were aliased before our prepend, so they point to the original method.
+        # See: https://github.com/ged/ruby-pg/blob/master/lib/pg/connection.rb#L870
+        module Connect
+          def new(...)
+            tracer = OpenTelemetry::Instrumentation::PG::Instrumentation.instance.tracer
+            config = OpenTelemetry::Instrumentation::PG::Instrumentation.instance.config
+
+            tracer.in_span('connect', kind: :client) do |span|
+              if block_given?
+                super do |conn|
+                  ConnectionHelper.set_connection_attributes(span, conn, config)
+                  yield conn
+                end
+              else
+                conn = super
+                ConnectionHelper.set_connection_attributes(span, conn, config)
+                conn
+              end
+            end
+          end
+
+          PG::Constants::CONNECTION_METHODS.each do |method|
+            alias_method method, :new
+          end
+        end
+
         # 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

instrumentation/pg/lib/opentelemetry/instrumentation/pg/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module PG
-      VERSION = '0.32.0'
+      VERSION = '0.33.0'
     end
   end
 end