gitlab-labkit 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2b166e9a540a6314a2c5e863e7f109f6c3763f2649aa459dfec41a5018e57f
-  data.tar.gz: 7dc9c77305e855d930420dca4e59cba0e18bd990fae24a7a44e871a7e03e84ed
+  metadata.gz: 26359f4fec97f64445df7d373d67cd7344e415d4b8db5adedce24d02f03228ec
+  data.tar.gz: 11f8e6195ec18d7a3ea81b2b533609ae68f76f50f55ae32fb5b3c4b41434ebaf
 SHA512:
-  metadata.gz: 81819b7e4fd168c805e286f9315dd5a757423367938619021dcb7e81d5ad41a6f057224bfc046d96a132354688b33b0b4ed2c3e2196dfa09725176bb32b6ca3e
-  data.tar.gz: 35d67adc6f7561609f617df26af9a3942e77cd1b66000523584308bd160c88062dc0fcd1ed6e0d9662f1af6a5c6436c80fe80b53d5b6b4c86ba1e880b24f5a61
+  metadata.gz: 2fb683c423ec1e34fc92b5dda0e2973b2259768a6dccf5fca9c6f3d7089d3130bf8e820ca8e751f27c325399b0739a73ae145667702f395e98e09dd58ff18fac
+  data.tar.gz: 1dbab7f8469391b9d6105aef90d3cc0af93ac87622a49052780ce843be941f592f4174fa5bff493cf528c8e1aceef1aad0352b992215309935e6f1edbd5bacfd

data/gitlab-labkit.gemspec

@@ -21,10 +21,10 @@ 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 "gitlab-pg_query", "~> 1.3"
   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 "redis", ">3.0.0", "<5.0.0"
 
   # Please maintain alphabetical order for dev dependencies

data/lib/labkit/excon_publisher.rb

@@ -92,11 +92,11 @@ module Labkit
     def start_payload(datum)
       payload = {
         method: datum[:method].to_s.upcase,
-        host: datum[:host],
-        path: datum[:path],
-        port: datum[:port],
-        scheme: datum[:scheme],
-        query: datum[:query],
+        host: nil_or_string(datum[:host]),
+        path: nil_or_string(datum[:path]),
+        port: nil_or_int(datum[:port]),
+        scheme: nil_or_string(datum[:scheme]),
+        query: generate_query_string(datum[:query]),
         start_time: ::Labkit::System.monotonic_time,
       }
       unless datum[:proxy].nil?
@@ -126,5 +126,23 @@ module Labkit
     def remove_connection_payload(datum)
       connection_payload.delete(datum[:connection])
     end
+
+    def nil_or_string(str)
+      str&.to_s
+    end
+
+    def nil_or_int(int)
+      int&.to_i
+    rescue
+      nil
+    end
+
+    def generate_query_string(query)
+      if query.is_a?(Hash)
+        query.to_query
+      else
+        nil_or_string(query)
+      end
+    end
   end
 end

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

@@ -77,6 +77,8 @@ module Labkit
             time: Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ"),
           )
 
+          message["exception"] = ex.message if ex
+
           @log_file.puts(JSON.dump(message))
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -51,61 +51,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: gitlab-pg_query
+  name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
-  name: grpc
+  name: jaeger-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: jaeger-client
+  name: opentracing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: opentracing
+  name: pg_query
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement