Commit 56f59d24 authored by Matthias Käppler's avatar Matthias Käppler 3️⃣
Browse files

Merge branch '34-relax-rejected-log-keys' into 'master' 

Do not reject Context log keys

See merge request !106
parents 8a48b478 00863c85

lib/labkit/logging/json_logger.rb

+4 −2
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ require "json" 
module Labkit

  module Logging

    class JsonLogger < ::Logger

      INTERNAL_LOG_KEYS = Labkit::Context::RAW_KEYS + [Labkit::Context::LOG_KEY]

      RESERVED_LOG_KEYS = INTERNAL_LOG_KEYS.map(&:to_sym) + [

      # We should also reject log keys coming from Labkit::Context, but we cannot

      # do this without breaking clients currently. This is tracked in

      # https://gitlab.com/gitlab-org/ruby/gems/labkit-ruby/-/issues/35

      RESERVED_LOG_KEYS = [

        :environment,

        :host,

        :shard,