gitlab-labkit 0.17.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235f0b00e0d08d7ee809ae43736e0ce5c900c0c75d402028bfb1247df868f9ac
-  data.tar.gz: 759c4d7bd91c75aeb7bc2b737f55558c6426b32940a399cca982efebb7b1740f
+  metadata.gz: e04a68390f7e0f702df828d84e7aca653078d2f2c9fd43c2a4d28ce4c0a0264c
+  data.tar.gz: 1a798386f1356e7accec88c005130a13bb362c7eb092689345f611d138823d5d
 SHA512:
-  metadata.gz: 42c83bbcdcb9c588a703400bd5d1830e426680e9d433a223026566d1417a7eb8000dec99530e2e9887935686938e6e2128c8953f44540ead950447c3a3d2b564
-  data.tar.gz: 9cd740e3bd04db453cf812b1efc71a6d5b516c875cfce4cfb0837660390c8457b86679c775f2d23b1dd373b59183255268340d710215d1f1bac5864fdf03c2f6
+  metadata.gz: f722b472734581147d9ec3352647623a1ad6095889a68f6366368932e9c96fc127494bb8aa66e16ec216df9136d8311707e1f0e4731d27e9779b6805323a1c08
+  data.tar.gz: ff2e00b52a0dd6ab6cc232fba570c8bd0f74adb682d3fe8f67e72934f9fba6cf28bfeb7f9ad1272df1f67203c25986a2313136738891254fdddb97ae2dc38cfe

data/.gitlab-ci.yml

@@ -17,6 +17,10 @@ workflow:
     - bundle install
     - bundle exec rake verify build install
 
+test:3.0:
+  image: ruby:3.0
+  <<: *test_definition
+
 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.38" # 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 "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.38"
   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.17.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-07-22 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.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     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.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.38'
 - !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