gitlab-labkit 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99765f42b600bc7e6307b75665409c3e3ee3b6aabf69f5bdb14d65fe20d8cdc
-  data.tar.gz: b2623750accd4178e7d938ebf87abbb6e1d40f14d4e252b9654f015d4141ce3c
+  metadata.gz: 84b7e5d8dd7ac808b13eddd6bd9b9c01e70a0542192a65ba2ef197648998d060
+  data.tar.gz: b597d7bdbf957cd7affb670255bff5fbb56a0efe3d2f2426a85e21651c07dd14
 SHA512:
-  metadata.gz: cfc0d196a34588965f17b6598b7bf8b1cdaa8d90d79e62bf5a4d75e07537473ee4a8011c7718e18af64d4ec216a85b7bd3a3099523404f6bd7c892b5a7b4ae35
-  data.tar.gz: fdb892b50ca446d76d999e7397c57df1539f6724e31ea698b440a7d08a5544e25246d2a4d7ed5bb4516dc5592b31fc7bb1860d29baac43bdc3b94052d011c24d
+  metadata.gz: d6f68fe206dceade497c046cb39d98157a16461e322e852e60618e4d3c4ae4c67b01155a1d73180a74898e4acffef6cfc9b076d61f3bd190c62c7cb766b79831
+  data.tar.gz: 3e087a7d38e003655216d3c2761b2dfcecd92c40fa18eaf3d49431105d4c9306e526e5bd8ab6c8625d54f9277eff5d177d43c541a5bcc8062010c369e3cb35c9

data/lib/labkit/fields.rb

@@ -118,6 +118,44 @@ module Labkit
     # The endpoint_id of the original caller at the root of the call chain.
     ROOT_CALLER_ID = "root_caller_id"
 
+    # Maps each field constant to its logging field variant version.
+    # A version of 0 means the field is not yet assigned to any variant.
+    VARIANT_VERSION = {
+      CORRELATION_ID => 1,
+      GL_USER_ID => 1,
+      GL_USER_NAME => 1,
+      DUO_WORKFLOW_DEFINITION => 0,
+      ERROR_TYPE => 0,
+      ERROR_MESSAGE => 1,
+      HTTP_STATUS_CODE => 1,
+      HTTP_METHOD => 0,
+      HTTP_URL => 0,
+      DURATION_S => 1,
+      REMOTE_IP => 1,
+      TCP_ADDRESS => 0,
+      HTTP_URI => 0,
+      HTTP_HOST => 0,
+      HTTP_PROTO => 0,
+      REMOTE_ADDR => 0,
+      HTTP_REFERRER => 0,
+      HTTP_USER_AGENT => 0,
+      WRITTEN_BYTES => 0,
+      CONTENT_TYPE => 0,
+      TTFB_S => 0,
+      GL_PROJECT_ID => 1,
+      GL_PIPELINE_ID => 1,
+      TIMESTAMP => 0,
+      SEVERITY => 0,
+      LOG_MESSAGE => 1,
+      CLASS_NAME => 0,
+      SERVICE_NAME => 0,
+      GL_ORGANIZATION_ID => 1,
+      GL_PROJECT_PATH => 1,
+      ENDPOINT_ID => 0,
+      CALLER_ID => 1,
+      ROOT_CALLER_ID => 0,
+    }.freeze
+
     # Get the constant name for a field value
     # @param field_value [String] The field value (e.g., "gl_user_id")
     # @return [String, nil] The constant name (e.g., "GL_USER_ID") or nil if not found

data/lib/labkit/redis/script.rb

@@ -33,7 +33,13 @@ module Labkit
       # @return the script's return value
       def eval(conn, keys:, argv:)
         conn.evalsha(@sha, keys: keys, argv: argv)
-      rescue ::Redis::CommandError => e
+      # Redis::CommandError and RedisClient::CommandError are sibling class trees
+      # with no common ancestor above StandardError -- neither inherits from the
+      # other. A NOSCRIPT response arrives as Redis::* on single-instance
+      # connections (the redis gem's translator runs) and as RedisClient::* on
+      # cluster connections when the cluster translator skips the conversion.
+      # Both shapes must reach the EVAL fallback, so we list both classes.
+      rescue ::Redis::CommandError, ::RedisClient::CommandError => e
         raise unless e.message.start_with?("NOSCRIPT")
 
         conn.eval(@body, keys: keys, argv: argv)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Andrew Newdigate