gitlab-labkit 0.18.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1b3569e3032ab75917a5fccc48dc4d29a7f8bb7ce25bd94b07552693cde66f
-  data.tar.gz: 521050774784e77217b6ac86e9faa4c82455802b10d9a33d263849e65c91be62
+  metadata.gz: cab702ae904a5944ea08148c125e97e61544eb10d2e3d54d486bcac04df044c7
+  data.tar.gz: 5f4cde0cd0de5c85aae05bc925fb21de816176ceb2fb91ea540b45f41ca3918a
 SHA512:
-  metadata.gz: c7956a088be110af584ebc8f5e4979e6edd154cf8f13dc587b413afb1247feb9ed5712e5f76625bf48c800d5d36e896f58b62de909d212d4292235d02d57b9d6
-  data.tar.gz: 9dbc20edb7bf500cc30317c5c4f385de32cf03980907e993802850710f3d797ee05cc086e74948df4110c4a0f63a511e5c8857cb3aeb93288e9fe47acce0011e
+  metadata.gz: 88d91253e18d7159a192d5d46763eb8d6cb09f42c87c07a65612dceb0a63db0c4be0249b972a11b301ce1b82d7fbeb8480b57cc126238c3853e916dd80ddf34f
+  data.tar.gz: a7e67eadb6da426a7feaf44bc8b0431cc5eb8c99c642c616732b3b77dce3dee1499cbdd3c68fb6736ff9cba47d37812d3ccd6a002e0edaaaa0cf80652511bbf1

data/.gitlab-ci.yml

@@ -17,6 +17,11 @@ workflow:
     - bundle install
     - bundle exec rake verify build install
 
+test:3.0:
+  image: ruby:3.0
+  <<: *test_definition
+  allow_failure: true # until we resolve grpc compatibility, see https://gitlab.com/gitlab-org/labkit-ruby/-/merge_requests/81
+
 test:2.7:
   image: ruby:2.7
   <<: *test_definition

data/Rakefile

@@ -3,10 +3,8 @@
 require "bundler/gem_tasks"
 require "rufo"
 
-begin
-  require "rspec/core/rake_task"
-  RSpec::Core::RakeTask.new(:spec)
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
 
 require "rubocop/rake_task"
 RuboCop::RakeTask.new(:rubocop) do |task|

data/gitlab-labkit.gemspec

@@ -21,17 +21,17 @@ Gem::Specification.new do |spec|
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 7.0.0"
   spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 7.0.0"
-  spec.add_runtime_dependency "grpc", "~> 1.19" # Be sure to update the "grpc-tools" dev_depenency too
+  spec.add_runtime_dependency "grpc", "~> 1.30.2" # Be sure to update the "grpc-tools" dev_dependency too
   spec.add_runtime_dependency "jaeger-client", "~> 1.1"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
-  spec.add_runtime_dependency "gitlab-pg_query", "~> 2.0"
+  spec.add_runtime_dependency "pg_query", "~> 2.1"
   spec.add_runtime_dependency "redis", ">3.0.0", "<5.0.0"
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency "excon", "~> 0.78.1"
   spec.add_development_dependency "faraday", "~> 1.2.0"
   spec.add_development_dependency "gitlab-styles", "~> 6.2.0"
-  spec.add_development_dependency "grpc-tools", "~> 1.19"
+  spec.add_development_dependency "grpc-tools", "~> 1.30.2"
   spec.add_development_dependency "httparty", "~> 0.17.3"
   spec.add_development_dependency "httpclient", "~> 2.8.3"
   spec.add_development_dependency "pry", "~> 0.12"
@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-parameterized", "~> 0.4"
   spec.add_development_dependency "rufo", "0.9.0"
   spec.add_development_dependency "sidekiq", "~> 5.2.7"
+  spec.add_development_dependency "webrick", "~> 1.7.0"
 end

data/lib/labkit/context.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require "securerandom"
+
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/string/starts_ends_with"
+require "active_support/core_ext/string/inflections"
 
 module Labkit
   # A context can be used to provide structured information on what resources

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.21.1
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.2
 - !ruby/object:Gem::Dependency
   name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
@@ -93,19 +93,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: gitlab-pg_query
+  name: pg_query
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +322,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.7
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: 
 email:
 - andrew@gitlab.com