gitlab-labkit 0.16.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1af5bacbedb8ce602015ad3de86ac23ddd28e2e17e78fac4dfb9d232ebe164f
-  data.tar.gz: caa3cb59ed0f1521530b7edfaa17234dcee23f7cdfca628d6aa2aac183fb3b4e
+  metadata.gz: 2ffa08defed93e465326a1f5db11670aacc69f3ebf2382d25459e4a9db3834b0
+  data.tar.gz: 81e98feb830a7247ecfb21b227d0b8f9bd632a1e7d3a90b95e4563d7a6ccfb6c
 SHA512:
-  metadata.gz: 36c847453715c4e1206839927383371369cfca346e1c2736f28b37a1425530047ea6d6c16bb5a7b732c7aa5d29eb2ab7a86f443b316d2abfbeae22828dcf04a9
-  data.tar.gz: f6c53e51b35f5e504f8f01d5b38578cc9ebdf41b34239385df4c7c0b8499be7ddfb375614e922297cff52affff96d8287477681153e854bf2fd86aa7ade9a425
+  metadata.gz: 8132d375526e57b7afa78b4edcc93268cfffbe9b3c1cf5db9de0f18e6f4c8ac22b934d7e2deed413caf13583e483a896584acd8e56fa1318a748fedf19cd98a0
+  data.tar.gz: 1f18c8ab7c8bacf6f8549d741c8ed500eebbca0e3fc4a47bed3fc5d239fc19eac9316c43ddfefdc771eb58ef11adc52e1a358ef46502bf4de0c7a6bca2e08207

data/.gitlab-ci.yml

@@ -1,3 +1,6 @@
+default:
+  image: ruby:2.7
+
 workflow:
   rules:
     # For merge requests, create a pipeline.
@@ -14,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
@@ -22,9 +29,11 @@ test:2.6:
   image: ruby:2.6
   <<: *test_definition
 
-test:2.5:
-  image: ruby:2.5
-  <<: *test_definition
+static-analysis:
+  before_script:
+    - bundle install
+  script:
+    - rake verify
 
 deploy:
   stage: deploy

data/.rubocop.yml

@@ -1,8 +1,11 @@
-AllCops:
-  TargetRubyVersion: 2.4
+inherit_from: .rubocop_todo.yml
+
+inherit_gem:
+  gitlab-styles:
+    - rubocop-default.yml
 
-require:
-  - rubocop-rspec
+AllCops:
+  TargetRubyVersion: 2.7
 
 Style/HashSyntax:
   EnforcedStyle: no_mixed_keys
@@ -28,11 +31,11 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
-Style/UseLambda:
+Style/Lambda:
   Enabled: false
 
-Layout/MultilineMethodCallIndentation:
-  Enabled: No
+Layout/LineLength:
+  Enabled: false
 
 Layout/SpaceInLambdaLiteral:
   Enabled: No
@@ -43,69 +46,6 @@ Layout/SpaceInsideBlockBraces:
 Layout/FirstParameterIndentation:
   Enabled: No
 
-Metrics/AbcSize:
-  Enabled: true
-  Max: 54.28
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Enabled: true
-  Max: 4
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: true
-  Max: 13
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: true
-  Max: 8
-
-Metrics/PerceivedComplexity:
-  Enabled: true
-  Max: 14
-
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/BeEql:
-  Enabled: true
-
-RSpec/BeforeAfterAll:
-  Enabled: false
-
-RSpec/DescribeClass:
-  Enabled: false
-
-RSpec/DescribeMethod:
-  Enabled: false
-
-RSpec/DescribeSymbol:
-  Enabled: true
-
-RSpec/DescribedClass:
-  Enabled: true
-
-RSpec/EmptyExampleGroup:
-  Enabled: true
-
-RSpec/ExampleLength:
-  Enabled: false
-  Max: 5
-
 RSpec/ExampleWording:
   Enabled: false
   CustomTransform:
@@ -114,63 +54,9 @@ RSpec/ExampleWording:
     not: does not
   IgnoredWords: []
 
-RSpec/ExpectActual:
-  Enabled: true
-
-RSpec/ExpectOutput:
+Lint/HashCompareByIdentity: # (new in 0.93)
   Enabled: true
-
-RSpec/FilePath:
+Lint/RedundantSafeNavigation: # (new in 0.93)
   Enabled: true
-  IgnoreMethods: true
-
-RSpec/Focus:
-  Enabled: true
-
-RSpec/HookArgument:
-  Enabled: true
-  EnforcedStyle: implicit
-
-RSpec/ImplicitExpect:
-  Enabled: true
-  EnforcedStyle: is_expected
-
-RSpec/InstanceVariable:
-  Enabled: false
-
-RSpec/LeadingSubject:
-  Enabled: false
-
-RSpec/LetSetup:
-  Enabled: false
-
-RSpec/MessageChain:
-  Enabled: false
-
-RSpec/MessageSpies:
-  Enabled: false
-
-RSpec/MultipleDescribes:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/NamedSubject:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Enabled: false
-
-RSpec/NotToNot:
-  EnforcedStyle: not_to
+Style/ClassEqualityComparison: # (new in 0.93)
   Enabled: true
-
-RSpec/RepeatedDescription:
-  Enabled: false
-
-RSpec/SubjectStub:
-  Enabled: false
-
-RSpec/VerifiedDoubles:
-  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,238 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2021-04-18 00:00:00 UTC using RuboCop version 0.93.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 51
+# Cop supports --auto-correct.
+CodeReuse/ActiveRecord:
+  Exclude:
+    - 'spec/labkit/correlation/grpc/client_interceptor_spec.rb'
+    - 'spec/labkit/correlation/grpc/server_interceptor_spec.rb'
+    - 'spec/labkit/middleware/rack_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/server_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/tracing/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/tracing/server_spec.rb'
+    - 'spec/labkit/tracing/factory_spec.rb'
+    - 'spec/labkit/tracing/grpc/client_interceptor_spec.rb'
+    - 'spec/labkit/tracing/grpc/server_interceptor_spec.rb'
+    - 'spec/labkit/tracing_spec.rb'
+    - 'spec/support/tracing/shared_examples.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'gitlab-labkit.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/labkit/context_spec.rb'
+
+# Offense count: 1
+Lint/BinaryOperatorWithIdenticalOperands:
+  Exclude:
+    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'
+
+# Offense count: 4
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/labkit/middleware/sidekiq/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/context/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/server_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - 'lib/labkit/tracing.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/labkit/logging/grpc/server_interceptor.rb'
+
+# Offense count: 2
+Performance/MethodObjectAsBlock:
+  Exclude:
+    - 'lib/labkit/context.rb'
+
+# Offense count: 1
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/labkit/middleware/sidekiq/server_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: SkipBlocks, EnforcedStyle.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/labkit/tracing_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.
+RSpec/FilePath:
+  Exclude:
+    - 'spec/labkit/httpclient_publisher_spec.rb'
+    - 'spec/logging/sanitizer_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: single_line_only, single_statement_only, disallow
+RSpec/ImplicitSubject:
+  Exclude:
+    - 'spec/labkit/correlation/correlation_id_spec.rb'
+
+# Offense count: 4
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/labkit/middleware/sidekiq/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/context/client_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'
+    - 'spec/labkit/middleware/sidekiq/server_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+RSpec/LetBeforeExamples:
+  Exclude:
+    - 'spec/labkit/tracing_spec.rb'
+
+# Offense count: 18
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 7
+
+# Offense count: 15
+# Cop supports --auto-correct.
+RSpec/ScatteredLet:
+  Exclude:
+    - 'spec/labkit/excon_publisher_spec.rb'
+    - 'spec/labkit/httpclient_publisher_spec.rb'
+    - 'spec/labkit/net_http_publisher_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/NegateInclude:
+  Exclude:
+    - 'spec/labkit/correlation/grpc/client_interceptor_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: **/Rakefile, **/*.rake
+Rails/RakeEnvironment:
+  Exclude:
+    - 'lib/capistrano/tasks/**/*.rake'
+    - 'Rakefile'
+
+# Offense count: 1
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:
+  Exclude:
+    - 'spec/support/grpc_service/test_service_impl.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/CaseLikeIf:
+  Exclude:
+    - 'lib/labkit/excon_publisher.rb'
+
+# Offense count: 23
+# Cop supports --auto-correct.
+Style/ExplicitBlockArgument:
+  Exclude:
+    - 'lib/labkit/correlation/grpc/server_interceptor.rb'
+    - 'lib/labkit/logging/grpc/server_interceptor.rb'
+    - 'lib/labkit/middleware/sidekiq/client.rb'
+    - 'lib/labkit/middleware/sidekiq/context/server.rb'
+    - 'lib/labkit/middleware/sidekiq/server.rb'
+    - 'lib/labkit/middleware/sidekiq/tracing/server.rb'
+    - 'lib/labkit/tracing/grpc/client_interceptor.rb'
+    - 'lib/labkit/tracing/grpc/server_interceptor.rb'
+    - 'lib/labkit/tracing/redis/redis_interceptor_helper.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'spec/labkit/tracing/rails/active_record/sql_instrumenter_spec.rb'
+    - 'spec/labkit/tracing/rails/active_support/cache_delete_instrumenter_spec.rb'
+    - 'spec/labkit/tracing/rails/active_support/cache_fetch_hit_instrumenter_spec.rb'
+    - 'spec/labkit/tracing/rails/active_support/cache_generate_instrumenter_spec.rb'
+    - 'spec/labkit/tracing/rails/active_support/cache_read_instrumenter_spec.rb'
+    - 'spec/labkit/tracing/rails/active_support/cache_write_instrumenter_spec.rb'
+    - 'spec/support/grpc_service/test_pb.rb'
+    - 'tools/update-changelog.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/GlobalStdStream:
+  Exclude:
+    - 'lib/labkit/tracing/jaeger_factory.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'spec/labkit/excon_publisher_spec.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'Rakefile'
+    - 'spec/labkit/net_http_publisher_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/labkit/logging/sanitizer.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/labkit/tracing/redis/redis_interceptor_helper.rb'
+
+# Offense count: 28
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArrayLiteral:
+  Exclude:
+    - 'spec/labkit/excon_publisher_spec.rb'
+    - 'spec/labkit/httpclient_publisher_spec.rb'
+    - 'spec/labkit/net_http_publisher_spec.rb'

data/Rakefile

@@ -3,13 +3,13 @@
 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::RakeTask.new(:rubocop) do |task|
+  task.options = %w[--parallel]
+end
 
 desc "Alias for `rake rufo:run`"
 task :format => ["rufo:run"]

data/gitlab-labkit.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|tools)/}) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   # Please maintain alphabetical order for dependencies
   spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 7.0.0"
@@ -24,12 +24,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grpc", "~> 1.19" # Be sure to update the "grpc-tools" dev_depenency too
   spec.add_runtime_dependency "jaeger-client", "~> 1.1"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
-  spec.add_runtime_dependency "pg_query", "~> 1.3"
+  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 "httparty", "~> 0.17.3"
   spec.add_development_dependency "httpclient", "~> 2.8.3"
@@ -37,10 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rest-client", "~> 2.1.0"
-  spec.add_development_dependency "rspec", "~> 3.8.0"
+  spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rspec-parameterized", "~> 0.4"
-  spec.add_development_dependency "rubocop", "~> 0.65.0"
-  spec.add_development_dependency "rubocop-rspec", "~> 1.22.1"
   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/gitlab-labkit.rb

@@ -1,8 +1,6 @@
 # rubocop:disable Naming/FileName
 # frozen_string_literal: true
 
-require "active_support/all"
-
 # LabKit is a module for handling cross-project
 # infrastructural concerns, partcularly related to
 # observability.

data/lib/labkit/context.rb

@@ -1,5 +1,11 @@
 # 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
   # GitLab is working on within a service.

data/lib/labkit/correlation/grpc/client_interceptor.rb

@@ -2,9 +2,8 @@
 
 # Disable the UnusedMethodArgument linter, since we need to declare the kwargs
 # in the methods, but we don't actually use them.
-# rubocop:disable Lint/UnusedMethodArgument
-
 require "grpc"
+require "singleton"
 
 module Labkit
   module Correlation
@@ -48,5 +47,3 @@ module Labkit
     end
   end
 end
-
-# rubocop:enable Lint/UnusedMethodArgument

data/lib/labkit/correlation/grpc/server_interceptor.rb

@@ -2,7 +2,6 @@
 
 # Disable the UnusedMethodArgument linter, since we need to declare the kwargs
 # in the methods, but we don't actually use them.
-# rubocop:disable Lint/UnusedMethodArgument
 
 require "grpc"
 
@@ -51,5 +50,3 @@ module Labkit
     end
   end
 end
-
-# rubocop:enable Lint/UnusedMethodArgument

data/lib/labkit/excon_publisher.rb

@@ -99,10 +99,12 @@ module Labkit
         query: generate_query_string(datum[:query]),
         start_time: ::Labkit::System.monotonic_time,
       }
+
       unless datum[:proxy].nil?
         payload[:proxy_host] = datum[:proxy][:host]
         payload[:proxy_port] = datum[:proxy][:port]
       end
+
       payload
     end
 
@@ -133,7 +135,7 @@ module Labkit
 
     def nil_or_int(int)
       int&.to_i
-    rescue
+    rescue StandardError
       nil
     end
 

data/lib/labkit/logging/grpc/server_interceptor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/time_with_zone"
+require "active_support/values/time_zone"
 require "grpc"
 require "json"
 

data/lib/labkit/logging/sanitizer.rb

@@ -19,9 +19,7 @@ module Labkit
 
       def self.sanitize_field(content)
         content = content.gsub(URL_REGEXP) { |url| mask_url(url) }
-        content = content.gsub(SCP_URL_REGEXP) { |scp_url| mask_scp_url(scp_url) }
-
-        content
+        content.gsub(SCP_URL_REGEXP) { |scp_url| mask_scp_url(scp_url) }
       end
 
       def self.sanitize_sql(sql)
@@ -30,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/middleware/sidekiq/context/server.rb

@@ -8,7 +8,8 @@ module Labkit
         # reinstantiate a context in which the job will run.
         class Server
           def call(_worker_class, job, _queue)
-            data = job.merge(Labkit::Context.log_key(:caller_id) => job["class"])
+            worker_name = (job["wrapped"].presence || job["class"]).to_s
+            data = job.merge(Labkit::Context.log_key(:caller_id) => worker_name)
 
             Labkit::Context.with_context(data) do |_context|
               yield

data/lib/labkit/tracing.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/all"
-
 module Labkit
   # Tracing provides distributed tracing functionality
   module Tracing

data/lib/labkit/tracing/abstract_instrumenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "opentracing"
-require "active_support/all"
 
 module Labkit
   module Tracing

data/lib/labkit/tracing/external_http/request_instrumenter.rb

@@ -21,10 +21,12 @@ module Labkit
             "path" => payload[:path],
             "scheme" => payload[:scheme],
           }
+
           unless payload[:proxy_host].nil?
             tags["proxy_host"] = payload[:proxy_host]
             tags["proxy_port"] = payload[:proxy_port]
           end
+
           tags
         end
       end

data/lib/labkit/tracing/grpc/client_interceptor.rb

@@ -2,9 +2,9 @@
 
 # Disable the UnusedMethodArgument linter, since we need to declare the kwargs
 # in the methods, but we don't actually use them.
-# rubocop:disable Lint/UnusedMethodArgument
 require "opentracing"
 require "grpc"
+require "singleton"
 
 module Labkit
   module Tracing
@@ -45,5 +45,3 @@ module Labkit
     end
   end
 end
-
-# rubocop:enable Lint/UnusedMethodArgument

data/lib/labkit/tracing/grpc/server_interceptor.rb

@@ -2,7 +2,6 @@
 
 # Disable the UnusedMethodArgument linter, since we need to declare the kwargs
 # in the methods, but we don't actually use them.
-# rubocop:disable Lint/UnusedMethodArgument
 
 require "opentracing"
 require "grpc"
@@ -60,5 +59,3 @@ module Labkit
     end
   end
 end
-
-# rubocop:enable Lint/UnusedMethodArgument

data/lib/labkit/tracing/rack_middleware.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "opentracing"
-require "active_support/all"
 require "action_dispatch"
 
 module Labkit

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

data/lib/labkit/tracing/tracing_common.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "active_support/all"
+require "active_support/concern"
+require "active_support/notifications"
 
 module Labkit
   module Tracing

data/lib/labkit/tracing/tracing_utils.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/starts_ends_with"
 require "opentracing"
 
 module Labkit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: gitlab-styles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +272,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
@@ -281,61 +295,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: 5.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
-- !ruby/object:Gem::Dependency
-  name: rufo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 5.2.7
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.7
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.7
+        version: 1.7.0
 description: 
 email:
 - andrew@gitlab.com
@@ -348,6 +348,7 @@ files:
 - ".gitlab/CODEOWNERS"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".rufo"
 - Gemfile
@@ -428,14 +429,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Instrumentation for GitLab