gitlab-labkit 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1966ecde160ebd4af3cf1e131cdc2f5e7665e327bc0074128d293f4b33710c8
-  data.tar.gz: 0abde88973ac84a12862be74f5a438ae5a76852d805dc690852f121eb0466cce
+  metadata.gz: 67d751c41c569f082517aca92fb16a5671d9b82693a6a02065ad349ad648c4ab
+  data.tar.gz: 94ac25bcad3f2cdb07626e882866b232e75328d5ad458d99dd7feeb81d656852
 SHA512:
-  metadata.gz: 7a18b78e676c89304be5db049ea675fe2b8671d0f4eabfec557340328821dc14f56a9b4a6e80a86fa62c72a657e97dd5f667e63a5da2eedb419114ce68480eeb
-  data.tar.gz: 2aeb4a0f9b5cd31e89d169654992977bbab625539da4511de6e989ec8dfae31693a4180e0def980437cdc89b258d18ea577d5f9ca70b06797e7080ea4b7d5e08
+  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/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.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -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