gitlab-labkit 0.41.2 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021f710ca320399402124ec377576c549cb5e323f59da70babd4e70f576cf12f
-  data.tar.gz: ef32fd2ac8e127847a7124f73155b8fc0d7397d2d07a563dde469d0f3c08b58d
+  metadata.gz: 869346480f346d49795eaf4f80e028c4cdbbdb8826345cfcfdff8ddf8e1887fd
+  data.tar.gz: 63ce86b345417ab4c6ad076dd6f83baca61d4e127c478b857e509c4b34814000
 SHA512:
-  metadata.gz: d6fa54d12f6fc16838d116316ca612ec5bc243e282b5b24ffca56547f9a4192e2ae59db05499cf18d4bb2d2f97c4295bb424dffadaa47f760c3614f8f6099e17
-  data.tar.gz: 6ed7ef8bc8a7fa9cfe212ef1329c4dd86ec5613db5e6b80b42cc8e432ba49f10b6af200fdd10a46fd0e63198be4fd061a3555627002de158950adf1a2060ae47
+  metadata.gz: c18e81580f71d9d6833e5d7c07d58fb699ec82df5d8707af38adbedabe6e7a197d0fe1e3cef00f0df7afa740dc5f343c100faf283e97d586419a1134bcf0501b
+  data.tar.gz: c5d346b9f186a33faa420e5e6fe8513f7af58c829748fe98470c5b6d45d27cb0c2620f56f4cca56729e896ea3daf59d9caa3bdca4aad95b79c3fed5b0052635c

data/.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
   # Documentation available at
   # https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/pre-commit.md
   - repo: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks
-    rev: v2.92  # renovate:managed
+    rev: v2.94  # renovate:managed
 
     hooks:
       - id: shellcheck  # Run shellcheck for changed Shell files

data/lib/gitlab-labkit.rb

@@ -15,6 +15,7 @@ module Labkit
   autoload :Logging, "labkit/logging"
   autoload :Metrics, "labkit/metrics"
   autoload :Middleware, "labkit/middleware"
+  autoload :Fields, "labkit/fields"
 
   # Publishers to publish notifications whenever a HTTP reqeust is made.
   # A broadcasted notification's payload in topic "request.external_http" includes:

data/lib/labkit/context.rb

@@ -7,6 +7,8 @@ require "active_support/core_ext/string/starts_ends_with"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/object/blank"
 
+require_relative "fields"
+
 module Labkit
   # A context can be used to provide structured information on what resources
   # GitLab is working on within a service.
@@ -24,9 +26,14 @@ module Labkit
   #   end
   #
   class Context
+    # The meta log key is used to effectively aggregate
+    # the attributes that we should be associating with
+    # the logs that we emit.
+    # These fields will get propagated across all services
+    # which will allow us to correlate logs across these
+    # different services.
     LOG_KEY = "meta"
-    CORRELATION_ID_KEY = "correlation_id"
-    RAW_KEYS = [CORRELATION_ID_KEY].freeze
+    RAW_KEYS = [Fields::CORRELATION_ID].freeze
 
     class << self
       def with_context(attributes = {})
@@ -92,7 +99,7 @@ module Labkit
     end
 
     def correlation_id
-      data[CORRELATION_ID_KEY]
+      data[Fields::CORRELATION_ID]
     end
 
     def get_attribute(attribute)
@@ -113,7 +120,7 @@ module Labkit
 
       # Assign a correlation if it was missing in the first context or when
       # explicitly removed
-      data[CORRELATION_ID_KEY] ||= new_id
+      data[Fields::CORRELATION_ID] ||= new_id
 
       data
     end

data/lib/labkit/correlation/correlation_id.rb

@@ -5,11 +5,11 @@ module Labkit
     # CorrelationId module provides access the Correlation-ID
     # of the current request
     module CorrelationId
-      LOG_KEY = Labkit::Context::CORRELATION_ID_KEY
-
       class << self
         def use_id(correlation_id)
-          Labkit::Context.with_context(LOG_KEY => correlation_id) do |context|
+          Labkit::Context.with_context(
+            Labkit::Fields::CORRELATION_ID => correlation_id
+          ) do |context|
             yield(context.correlation_id)
           end
         end

data/lib/labkit/fields.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Labkit
+  ##
+  # Fields is intended to be a SSOT for all of the common field names that
+  # we emit via any observability we add to our systems.
+  #
+  # These fields should span multiple services. This is
+  #
+  # The goal of this package is to reduce the likelihood for typos or
+  # subtly different naming conventions. This will help to ensure we
+  # are able to marry up logs between different systems as a request
+  # is being processed.
+  #
+  # Usage:
+  #   require 'labkit/fields'
+  #   ...
+  #   data[Labkit::Fields::GL_USER_ID] = user.id
+  #   ...
+  #
+  module Fields
+    # correlation_id - string
+    #
+    # This field is used to correlate
+    # the logs emitted by all of our systems.
+    #
+    # This should be present in all log line
+    # emissions.
+    CORRELATION_ID = "correlation_id"
+
+    # We'll need to add the rest of the top
+    # level fields here:
+    # [endpoint_id, duration_s, status_code]
+
+    # gl_user_id - integer
+    GL_USER_ID = "gl_user_id"
+
+    # gl_user_name - string
+    GL_USER_NAME = "gl_user_name"
+  end
+end

data/lib/labkit/logging/json_logger.rb

@@ -42,7 +42,7 @@ module Labkit
         data[:time] = timestamp.utc.iso8601(3)
 
         if self.class.exclude_context?
-          data[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id
+          data[Labkit::Fields::CORRELATION_ID] = Labkit::Correlation::CorrelationId.current_id
         else
           data.merge!(Labkit::Context.current.to_h)
         end

data/lib/labkit/logging/sanitizer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "pg_query"
+require "uri"
 
 module Labkit
   module Logging
@@ -47,8 +48,14 @@ module Labkit
         #     URI::RFC2396_PARSER.parse('ssh://') => raise URI::InvalidURIError
         return "" if p.host.empty?
 
-        p.password = "*****" if p.password.present?
+        # Starting from v1.0.4, the `uri` gem clears the `password` instance variable
+        # when the `user` setter is called. To preserve the current behavior,
+        # we store the `password` in a temporary variable.
+        password = p.password
+
         p.user = "*****" if p.user.present?
+        p.password = "*****" if password.present?
+
         p.to_s
       rescue URI::InvalidURIError
         ""

data/lib/labkit/middleware/rack.rb

@@ -18,7 +18,7 @@ module Labkit
       end
 
       def call(env)
-        Labkit::Context.with_context(Labkit::Context::CORRELATION_ID_KEY => correlation_id(env)) do |context|
+        Labkit::Context.with_context(Labkit::Fields::CORRELATION_ID => correlation_id(env)) do |context|
           status, headers, response = @app.call(env)
 
           headers[HEADER] = context_to_json(context)

data/lib/labkit/middleware/sidekiq/context/client.rb

@@ -15,7 +15,7 @@ module Labkit
             # will always generate a new correlation_id and we'd rather carry
             # through the correlation_id from the previous job if it is
             # present (eg. for retries).
-            attributes[Labkit::Context::CORRELATION_ID_KEY] = job["correlation_id"] if job["correlation_id"]
+            attributes[Labkit::Fields::CORRELATION_ID] = job["correlation_id"] if job["correlation_id"]
 
             Labkit::Context.with_context(attributes) do |context|
               job.merge!(context.to_h)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.41.2
+  version: 0.42.1
 platform: ruby
 authors:
 - Andrew Newdigate
@@ -466,6 +466,7 @@ files:
 - lib/labkit/covered_experience/null.rb
 - lib/labkit/covered_experience/registry.rb
 - lib/labkit/excon_publisher.rb
+- lib/labkit/fields.rb
 - lib/labkit/fips.rb
 - lib/labkit/httpclient_publisher.rb
 - lib/labkit/logging.rb