gitlab-labkit 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1b3569e3032ab75917a5fccc48dc4d29a7f8bb7ce25bd94b07552693cde66f
-  data.tar.gz: 521050774784e77217b6ac86e9faa4c82455802b10d9a33d263849e65c91be62
+  metadata.gz: 2eed1c5eae7363851222a82aaeae8088a5227912d0d01d1f1b30e3e0514a25e2
+  data.tar.gz: 44167dc3c31083dcb58028c7851106ba47dcd8ac590a02e3306d3f8ef741fd41
 SHA512:
-  metadata.gz: c7956a088be110af584ebc8f5e4979e6edd154cf8f13dc587b413afb1247feb9ed5712e5f76625bf48c800d5d36e896f58b62de909d212d4292235d02d57b9d6
-  data.tar.gz: 9dbc20edb7bf500cc30317c5c4f385de32cf03980907e993802850710f3d797ee05cc086e74948df4110c4a0f63a511e5c8857cb3aeb93288e9fe47acce0011e
+  metadata.gz: 44f99cd2425d95c738d522c496d37319f318360d5c79be3ab3822f38bd95c7aec7f40fb307c2435c28bb43642539d7c84f5501d1f83c4f1905f5cc6fd645f0f9
+  data.tar.gz: 5603763f8cee8f7fff87d963ef87e66989a5860d4d6dc58d35c5530383bfd7c99f88a62e768982e87e1b7a9fc56f20f0101db9a140a2765818d39807c9f2e14a

data/lib/labkit/logging/sanitizer.rb

@@ -28,6 +28,12 @@ module Labkit
         ""
       end
 
+      def self.sql_fingerprint(normalized_sql)
+        PgQuery.parse(normalized_sql)&.fingerprint
+      rescue PgQuery::ParseError
+        ""
+      end
+
       # Ensures that URLS are sanitized to hide credentials
       def self.mask_url(url)
         url = url.to_s.strip

data/lib/labkit/tracing/rails/active_record/sql_instrumenter.rb

@@ -14,7 +14,11 @@ module Labkit
           end
 
           def tags(payload)
-            sql = Labkit::Logging::Sanitizer.sanitize_sql(payload[:sql]) if Labkit::Tracing.sampled? && payload[:sql]
+            if Labkit::Tracing.sampled? && payload[:sql]
+              sql = Labkit::Logging::Sanitizer.sanitize_sql(payload[:sql])
+              fingerprint = Labkit::Logging::Sanitizer.sql_fingerprint(sql)
+            end
+
             {
               "component" => COMPONENT_TAG,
               "span.kind" => "client",
@@ -22,6 +26,7 @@ module Labkit
               "db.connection_id" => payload[:connection_id],
               "db.cached" => payload[:cached] || false,
               "db.statement" => sql,
+              "db.statement_fingerprint" => fingerprint,
             }
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack