opentelemetry-instrumentation-pg 0.22.1 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 179f178f264fbe7f2c157f4253e7d96194484301ffc2079e8026cdc67d7e98dd
-  data.tar.gz: 6e24f6c7d3a005e517533e948d19ba060cb6e2ee184ccbf0ec5fbe8e0121b2bd
+  metadata.gz: e14d3c31673280352523e2c65a63630dd011198b2a5f80050c78498566028731
+  data.tar.gz: 7d6837fb749ecaa4603eaddbf6b7bf1e984d5da8592789e0dc8e8d2812b098d0
 SHA512:
-  metadata.gz: 04b33b5e664ba6e8601df65b8c6125f8ae75cf7b5c856363a3cc31d7430290b9f30fea4cdba5298f72c69a18b8fe9d565849df61a4893ce0a33179a894f5fd0b
-  data.tar.gz: 4f955fd3764ec0f40fdf5223920b9ebd7a429cb409d2d5aba88ca885ba793456614962fa0166928809b58793b789d336d1b449a354099e88b30e9de971b1ace2
+  metadata.gz: e0ae9029f10e93984a7e042a1703e5d1516ad8452c3bf3a7e777952309d0a394eacbbf950cee24df15d4bf51ed9b0396c762786fa63a346ed29bf5120d382bc8
+  data.tar.gz: fa0c955f672a5bc52743f64116a0c2b4f48edec1679d1924d0135db3079c7d4e38350e7aba7ec35bd8e6b5f68a465cdf162d50c9a946376fe60ca846ed1e754b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-pg
 
+### v0.22.3 / 2022-12-06
+
+* FIXED: Use attributes from the active PG connection
+
+### v0.22.2 / 2022-11-10
+
+* FIXED: Safeguard against host being nil
+
 ### v0.22.1 / 2022-10-27
 
 * FIXED: Only take the first item in a comma-separated list for pg attrs

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

@@ -97,7 +97,7 @@ module OpenTelemetry
           end
 
           def span_name(operation)
-            [validated_operation(operation), database_name].compact.join(' ')
+            [validated_operation(operation), db].compact.join(' ')
           end
 
           def validated_operation(operation)
@@ -123,41 +123,56 @@ module OpenTelemetry
             @generated_postgres_regex ||= Regexp.union(PG::Constants::POSTGRES_COMPONENTS.map { |component| PG::Constants::COMPONENTS_REGEX_MAP[component] })
           end
 
-          def database_name
-            conninfo_hash[:dbname]&.to_s
-          end
-
-          def first_in_list(item)
-            if (idx = item.index(','))
-              item[0...idx]
-            else
-              item
-            end
-          end
-
           def client_attributes
             attributes = {
               'db.system' => 'postgresql',
-              'db.user' => conninfo_hash[:user]&.to_s,
-              'db.name' => database_name,
-              'net.peer.name' => first_in_list(conninfo_hash[:host]&.to_s)
+              'db.user' => user,
+              'db.name' => db
             }
             attributes['peer.service'] = config[:peer_service] if config[:peer_service]
 
             attributes.merge(transport_attrs).reject { |_, v| v.nil? }
           end
 
+          def transport_addr
+            # The hostaddr method is available when the gem is built against
+            # a recent version of libpq.
+            return hostaddr if defined?(hostaddr)
+
+            # As a fallback, we can use the hostaddr of the parsed connection
+            # string when there is only one. Some older versions of libpq allow
+            # multiple without any way to discern which is presently connected.
+            addr = conninfo_hash[:hostaddr]
+            return addr unless addr&.include?(',')
+          end
+
           def transport_attrs
-            if conninfo_hash[:host]&.start_with?('/')
-              { 'net.transport' => 'Unix' }
+            h = host
+            if h&.start_with?('/')
+              {
+                'net.sock.family' => 'unix',
+                'net.peer.name' => h
+              }
             else
               {
-                'net.transport' => 'IP.TCP',
-                'net.peer.ip' => conninfo_hash[:hostaddr]&.to_s,
-                'net.peer.port' => first_in_list(conninfo_hash[:port]&.to_s)
+                'net.transport' => 'ip_tcp',
+                'net.peer.name' => h,
+                'net.peer.ip' => transport_addr,
+                'net.peer.port' => transport_port
               }
             end
           end
+
+          def transport_port
+            # The port method can fail in older versions of the gem. It is
+            # accurate and safe to use when the DEF_PGPORT constant is defined.
+            return port if defined?(::PG::DEF_PGPORT)
+
+            # As a fallback, we can use the port of the parsed connection
+            # string when there is exactly one.
+            p = conninfo_hash[:port]
+            return p.to_i unless p.nil? || p.empty? || p.include?(',')
+          end
         end
       end
     end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module PG
-      VERSION = '0.22.1'
+      VERSION = '0.22.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-pg
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.3
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -243,10 +243,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-pg/v0.22.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-pg/v0.22.3/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/pg
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-pg/v0.22.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-pg/v0.22.3
 post_install_message: 
 rdoc_options: []
 require_paths: