gitlab-labkit 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e86f57fe5a7804f3b930b86abd75f74f7e4a6b01d67eba235c036ba88646052
-  data.tar.gz: ea7d3fe526de0859b739b108adebdf86110cc49f6c59ae98b9b834c876794bb7
+  metadata.gz: 67d751c41c569f082517aca92fb16a5671d9b82693a6a02065ad349ad648c4ab
+  data.tar.gz: 94ac25bcad3f2cdb07626e882866b232e75328d5ad458d99dd7feeb81d656852
 SHA512:
-  metadata.gz: 0a21a42f553c966c7bf5555afea1abaa72ab2837300bd09bae84c2b58f141a72c22cb3f2f20257c1ab1aadc789af47b2ed3104440b0ca3d66f37e67c17c32f0e
-  data.tar.gz: b8f72ab37a74c3523dfc8095d2ebe549c2710bed45741c9a6acb0211424a602695732340e94b7d9d7d3bcd3a1b95151540b3726462bf821ee03acc03951a3968
+  metadata.gz: 11754a10140341571519d42e999240c3f580b32e7313852c361ba93c42f9b9d0b18599d019d07217566440e128d8f8a00490ab39938e1dec7f813f1d45c03806
+  data.tar.gz: 7b993168a160a5beacf9757893b424f3da57eeb4fa71600d7ed41e99841a92d0bc7cb4a95fefa572697957c5e7081a672cbe570897db08e5d78e55d6bac3cedb

data/.gitlab-ci.yml

@@ -20,16 +20,11 @@ workflow:
 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
 
-test:2.6:
-  image: ruby:2.6
-  <<: *test_definition
-
 static-analysis:
   before_script:
     - bundle install

data/gitlab-labkit.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
   spec.add_runtime_dependency "pg_query", "~> 2.1"
-  spec.add_runtime_dependency "redis", ">3.0.0", "<5.0.0"
+  spec.add_runtime_dependency "redis", ">3.0.0", "<6.0.0"
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency "excon", "~> 0.78.1"

data/lib/labkit/context.rb

@@ -123,7 +123,7 @@ module Labkit
       data.merge!(attributes)
 
       # Remove keys that had their values set to `nil` in the new attributes
-      data.keep_if { |_, value| value.present? }
+      data.keep_if { |_, value| valid_data?(value) }
 
       # Assign a correlation if it was missing in the first context or when
       # explicitly removed
@@ -146,12 +146,16 @@ module Labkit
       data.transform_values do |value|
         value = call_or_value(value)
 
-        value.presence
+        value if valid_data?(value)
       end.compact
     end
 
     def new_id
       SecureRandom.hex
     end
+
+    def valid_data?(value)
+      value == false || value.present?
+    end
   end
 end

data/lib/labkit/logging/json_logger.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require "time"
+require "logger"
+require "json"
+
+module Labkit
+  module Logging
+    class JsonLogger < ::Logger
+      def self.log_level(fallback: ::Logger::DEBUG)
+        ENV.fetch("GITLAB_LOG_LEVEL", fallback)
+      end
+
+      def initialize(path, level: JsonLogger.log_level)
+        super
+      end
+
+      def format_message(severity, timestamp, progname, message)
+        data = default_attributes
+        data[:severity] = severity
+        data[:time] = timestamp.utc.iso8601(3)
+        data[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id
+
+        case message
+        when String
+          data[:message] = message
+        when Hash
+          data.merge!(message)
+        end
+
+        dump_json(data) << "\n"
+      end
+
+      private
+
+      def default_attributes
+        {}
+      end
+
+      def dump_json(data)
+        JSON.generate(data)
+      end
+    end
+  end
+end

data/lib/labkit/logging.rb

@@ -6,5 +6,6 @@ module Labkit
   module Logging
     autoload :GRPC, "labkit/logging/grpc"
     autoload :Sanitizer, "labkit/logging/sanitizer"
+    autoload :JsonLogger, "labkit/logging/json_logger"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -115,7 +115,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +386,7 @@ files:
 - lib/labkit/logging.rb
 - lib/labkit/logging/grpc.rb
 - lib/labkit/logging/grpc/server_interceptor.rb
+- lib/labkit/logging/json_logger.rb
 - lib/labkit/logging/sanitizer.rb
 - lib/labkit/middleware.rb
 - lib/labkit/middleware/rack.rb