gitlab-labkit 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bf18910dd8b5fe524da8c6c935423a9aa059e48ba35a8773d1b5aaa85ac6dd4
-  data.tar.gz: 5793dbbe30934d2b4799fa6295e5a7994bbaeb172bcc18c85c062d83552eb1c3
+  metadata.gz: 3ab069c6e8587e5887a63bcf6859331f114c420223714986c6d9b4c1e2d81d4b
+  data.tar.gz: b14550055abb076dd52bd1c7d3e5d3d36431f50dc9707137057aaa98164b8278
 SHA512:
-  metadata.gz: 13e32000497293b6bc57c4114db05d13eac4ed928e7111f9f30e4ade7bfa0ad173143577cb8fe503b069903752ae200fc32c8341a23db469c4aca6a27af320b0
-  data.tar.gz: 93f1ad1a7f292732ad9c73f5b618aab676cb16d991ac55561e3e9f269ab58ff22d6c29dfd6452ea89e8b5bafc5d5b7d73f2456ac02af42047199fb689eef2958
+  metadata.gz: 93e3340bd0660af708f43e414dfc6a4662e108f69b5ce3d6bb16856ce4a57d7e3c5e8156a7313f09dea94fa08320338b4fb9a1d6104970f535b0eaf84fbea131
+  data.tar.gz: bac71cd6d4b3f9fff8aa7bac29cd4987025b89abd55d77dc63cc74fadf32d6e064c147d011a928e22b82b2e93428006034362bf96fe4c9c0dec2258eee22a4a0

data/gitlab-labkit.gemspec

@@ -24,7 +24,7 @@ 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", "~> 0.10"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
-  spec.add_runtime_dependency "redis", "~> 3.2"
+  spec.add_runtime_dependency "redis", ">3.0.0", "<5.0.0"
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency "grpc-tools", "~> 1.19"

data/lib/labkit/tracing/redis/redis_interceptor_helper.rb

@@ -42,12 +42,14 @@ module Labkit
         end
 
         def self.command_serialized(command)
+          return "" unless command.is_a?(Array)
+          return "" if command.empty?
+
           command_name, *arguments = command
+          command_name ||= "nil"
 
           info = [command_name]
           info << sanitize_argument_for_command(command_name, arguments.first) unless arguments.empty?
-
-          # Additional arguments? Only include the number
           info << "...#{arguments.size - 1} more value(s)" if arguments.size > 1
 
           info.join(" ")
@@ -70,7 +72,7 @@ module Labkit
         # get_first_argument_for_command returns a masked value representing the first argument
         # from a redis command, taking care of certain sensitive commands
         def self.sanitize_argument_for_command(command_name, first_argument)
-          return "*****" if command_is_sensitive(command_name)
+          return "*****" if command_is_sensitive?(command_name)
 
           return "nil" if first_argument.nil?
           return first if first_argument.is_a?(Numeric)
@@ -79,11 +81,18 @@ module Labkit
           mask_redis_arg(first_argument)
         end
 
-        def self.command_is_sensitive(command_name)
-          return true if command_name == :auth || "auth".casecmp(command_name).zero?
-          return true if command_name == :eval || "eval".casecmp(command_name).zero?
+        # Returns true if the arguments for the command should be masked
+        def self.command_is_sensitive?(command_name)
+          command_is?(command_name, :auth) || command_is?(command_name, :eval)
+        end
 
-          false
+        # Returns true if the command is equivalent to the command_symbol symbol
+        def self.command_is?(command_name, command_symbol)
+          if command_name.is_a?(Symbol)
+            command_name == command_symbol
+          else
+            command_name.to_s.casecmp(command_symbol.to_s).zero?
+          end
         end
 
         def self.mask_redis_arg(argument)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -84,16 +84,22 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement