julewire-gcp 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7770e24c27f9957004b7e38a1fc5b49161a07f65173fe687bea6a8102f3796d5
-  data.tar.gz: 37376ea4aa3f56d0488a15a36d5d2a9e82a4244c5accd18fca224c50a9e070f3
+  metadata.gz: 0bb2a1472182d07e7099ea1d254a8f56d6fcad94527eb5c9959974191d3b4bc5
+  data.tar.gz: 6a2ce085d54af374465210210496dc5bcf14692710f44c09717d500b9ad8dc5e
 SHA512:
-  metadata.gz: 853abdb1eee58dfb2d61178f50ec572df0504131d2af476abd7fd9a4b8b141249dbe82b585b0880a8c17d882b110fdd0be0e3fecce74cfe2b2441afa02f6c79c
-  data.tar.gz: 97b6621b589e538254db6455522270860d1b643a6f7f730f10f9b448d0d534b0abf4d04129bb028707aef90c739978180a052e01b996d84d203eccdd4dd86d33
+  metadata.gz: 383c1c579384c7ffeeb2b95c3b6ad7ec12f75ab3625955e7e11c62c6fbbdea907e8e53a8405b206a1f3e1be92f4d9fe5723e03241b4ba5f39151947645fa8735
+  data.tar.gz: 832fdcf7596afe7de1113ca3bc7599414a8ff87c76f969b0ca09452bcd06f088a11952dd3632ec0c5ad0af9d8ee91d8b680927eb018316e99ddf5e2995d92f6f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Unreleased
 
+## 1.1.0 - 2026-07-20
+
+- Keep Cloud Logging formatting and decoding aligned with the core record field
+  taxonomy and deterministic trace/source parsing.
+- Require julewire-core 1.1.0.
+
+## 1.0.1 - 2026-06-25
+
+- Replace the fallback backtrace regex with deterministic parsing so GCP source
+  location inference stays boring under CodeQL.
+- Require julewire-core 1.0.1.
+
 ## 1.0.0 - 2026-06-21
 
 - Initial release: Google Cloud Logging formatter, trace fields, source

data/julewire-gcp.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.executables = []
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "julewire-core", ">= 1.0"
+  spec.add_dependency "julewire-core", ">= 1.1.0"
   spec.add_dependency "zeitwerk", ">= 2.8.1"
 end

data/lib/julewire/gcp/destination.rb

@@ -3,7 +3,7 @@
 module Julewire
   module GCP
     class Destination < Julewire::Core::Destinations::Destination
-      def initialize(output:, name: :gcp, formatter: nil, encoder: Julewire::JsonEncoder.new,
+      def initialize(output:, name: :gcp, formatter: nil, encoder: JsonEncoder.new,
                      max_record_bytes: DEFAULT_MAX_RECORD_BYTES, close_output: false, on_drop: nil,
                      on_failure: nil)
         super(

data/lib/julewire/gcp/formatter.rb

@@ -41,11 +41,11 @@ module Julewire
       end
 
       def call(record)
-        Julewire::Record.validate_normalized!(record)
+        Record.validate_normalized!(record)
 
         error = record.fetch(:error)
         operation_options = operation_options(record)
-        neutral_attributes = Core::Fields::AttributeKeys.from(record.fetch(:neutral))
+        neutral_attributes = record.fetch(:neutral)
         source_location_options = SourceLocationOptions.call(record, neutral_attributes)
         entry = {
           "severity" => severity(record.fetch(:severity)),
@@ -67,7 +67,7 @@ module Julewire
 
       private
 
-      def frozen_service_context(value) = value ? Core::Fields::FieldSet.frozen_copy(value) : nil
+      def frozen_service_context(value) = Core::Fields::FieldSet.frozen_copy(value)
 
       def append_special_fields(entry, record, error:, operation_options:, source_location_options:,
                                 neutral_attributes:)
@@ -110,7 +110,6 @@ module Julewire
         return if (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
 
         entry[key] = value
-        nil
       end
 
       def severity(value) = SEVERITIES.fetch(value)
@@ -134,17 +133,19 @@ module Julewire
       end
 
       def operation_options(record)
-        options = record.dig(:payload, :gcp, :operation)
+        control = record.fetch(:payload)[:gcp]
+        return EMPTY_HASH unless control.is_a?(Hash)
+
+        options = control[:operation]
         options.is_a?(Hash) ? options : EMPTY_HASH
       end
 
       def operation_producer(record, options)
-        options[:producer] || @operation_producer || record[:source] || record[:logger]
+        options[:producer] || @operation_producer || record.fetch(:source) || record.fetch(:logger)
       end
 
       def source_location(error, options)
         return SourceLocation.call(options) unless options.empty?
-        return unless error.is_a?(Hash) && !error.empty?
 
         SourceLocation.from_error(error)
       end
@@ -183,7 +184,7 @@ module Julewire
       end
 
       def remove_gcp_control_payload(payload, control)
-        return payload unless control.is_a?(Hash) && gcp_control_payload?(control)
+        return payload unless control.is_a?(Hash)
 
         cleaned_payload = payload.dup
         cleaned_control = control.dup
@@ -197,11 +198,7 @@ module Julewire
         cleaned_payload
       end
 
-      def gcp_control_payload?(control)
-        control.key?(:operation) || control.key?(:source_location)
-      end
-
-      def julewire_payload(record, error:, operation_options:, stack_trace: nil)
+      def julewire_payload(record, error:, operation_options:, stack_trace:)
         {}.tap do |payload|
           append_log_field(payload, :kind, record.fetch(:kind))
           append_log_field(payload, :event, record.fetch(:event))
@@ -214,19 +211,17 @@ module Julewire
           )
           append_log_field(payload, :context, record.fetch(:context))
           append_log_field(payload, :error, julewire_error(error, stack_trace: stack_trace))
-          append_log_field(payload, :metrics, record[:metrics])
+          append_log_field(payload, :metrics, record.fetch(:metrics))
         end
       end
 
       def julewire_error(error, stack_trace:)
-        return error unless error.is_a?(Hash) && stack_trace
+        return error unless stack_trace
 
         StackTrace.remove_backtraces(error)
       end
 
       def stack_trace(error)
-        return unless error.is_a?(Hash) && !error.empty?
-
         StackTrace.call(error)
       end
 

data/lib/julewire/gcp/formatter_options.rb

@@ -20,7 +20,7 @@ module Julewire
         end
 
         def trace_headers_paths(paths)
-          Array(paths).filter_map { normalize_path(it, min_length: 1) }.freeze
+          Array(paths).filter_map { normalize_path(it, min_length: 1) }
         end
 
         def trace_value_path(path)
@@ -34,7 +34,7 @@ module Julewire
         def label_options(options)
           label_options = options.fetch(:label_options, {}).dup
           %i[max_labels max_label_key_bytes max_label_value_bytes].each do |key|
-            label_options[key] = options[key] if options.key?(key)
+            label_options[key] = options.fetch(key) if options.key?(key)
           end
           label_options
         end
@@ -42,12 +42,10 @@ module Julewire
         private
 
         def normalize_path(path, min_length:)
-          return if path.nil?
-
           normalized = Array(path).map { normalize_path_segment(it) }
           return if normalized.length < min_length
 
-          normalized.freeze
+          normalized
         end
 
         def normalize_path_segment(segment)

data/lib/julewire/gcp/label_formatter.rb

@@ -3,19 +3,17 @@
 module Julewire
   module GCP
     class LabelFormatter
-      def initialize(max_labels: GCP::DEFAULT_MAX_LABELS,
-                     max_label_key_bytes: GCP::DEFAULT_MAX_LABEL_KEY_BYTES,
-                     max_label_value_bytes: GCP::DEFAULT_MAX_LABEL_VALUE_BYTES)
+      def initialize(max_labels: DEFAULT_MAX_LABELS,
+                     max_label_key_bytes: DEFAULT_MAX_LABEL_KEY_BYTES,
+                     max_label_value_bytes: DEFAULT_MAX_LABEL_VALUE_BYTES)
         @max_labels = validate_count_limit(max_labels, name: :max_labels)
         @max_label_key_bytes = validate_byte_limit(max_label_key_bytes, name: :max_label_key_bytes)
         @max_label_value_bytes = validate_byte_limit(max_label_value_bytes, name: :max_label_value_bytes)
       end
 
       def call(labels)
-        return if labels.empty?
-
         labels.each_with_object({}) do |(key, value), result|
-          break result if @max_labels && result.size >= @max_labels
+          break result if result.size == @max_labels
 
           label_key = label_key(key)
           next unless label_key
@@ -28,18 +26,20 @@ module Julewire
 
       def label_key(value)
         key = label_string(value)
-        return key unless @max_label_key_bytes && key.bytesize > @max_label_key_bytes
-
-        nil
+        key unless @max_label_key_bytes && key.bytesize > @max_label_key_bytes
       end
 
       def bounded_label_string(value, max_bytes)
         string = label_string(value)
-        return string unless max_bytes && string.bytesize > max_bytes
+        return string unless label_too_long?(string, max_bytes)
 
         label_string(string.byteslice(0, max_bytes))
       end
 
+      def label_too_long?(string, max_bytes)
+        !max_bytes.nil? && string.bytesize > max_bytes
+      end
+
       def label_string(value)
         Core::Serialization::EncodingSanitizer.call(value.to_s)
       end
@@ -52,7 +52,6 @@ module Julewire
 
       def validate_byte_limit(value, name:)
         Core::Validation.validate_byte_limit!(value, name: name)
-        value
       end
     end
   end

data/lib/julewire/gcp/log_decoder.rb

@@ -36,7 +36,7 @@ module Julewire
         def record_base(payload, julewire)
           {
             timestamp: payload["time"] || payload["timestamp"],
-            severity: Julewire::Core::Records::Severity.normalize(payload["severity"] || :info),
+            severity: Core::Records::Severity.normalize(payload["severity"] || :info),
             kind: RecordDecoder.kind(julewire["kind"] || :point),
             event: julewire["event"],
             message: payload["message"],
@@ -46,7 +46,7 @@ module Julewire
         end
 
         def record_sections(payload, julewire)
-          RecordDecoder.sections(payload) do |section, _source|
+          RecordDecoder.sections(nil) do |section, _source|
             gcp_section_value(section, payload, julewire)
           end
         end

data/lib/julewire/gcp/source_location.rb

@@ -3,8 +3,9 @@
 module Julewire
   module GCP
     module SourceLocation
-      BACKTRACE_PATTERN = /\A(?<file>.+?):(?<line>\d+)(?::in (?:[`'](?<quoted>.*)[`']|(?<plain>.*)))?\z/
-      private_constant :BACKTRACE_PATTERN
+      FUNCTION_SEPARATOR = ":in "
+      QUOTE_BYTES = [39, 96].freeze
+      private_constant :FUNCTION_SEPARATOR, :QUOTE_BYTES
 
       class << self
         def call(options)
@@ -27,13 +28,22 @@ module Julewire
         end
 
         def from_backtrace_line(line)
-          match = BACKTRACE_PATTERN.match(line.to_s)
-          return unless match
+          line = line.to_s
+          index = line.rindex(FUNCTION_SEPARATOR)
+          if index
+            location = line[0, index]
+            function = line[(index + FUNCTION_SEPARATOR.length)..]
+          else
+            location = line
+            function = nil
+          end
+          file, line_number = split_file_and_line(location)
+          return unless line_number
 
           call(
-            file: match[:file],
-            line: match[:line],
-            function: match[:quoted] || match[:plain]
+            file: file,
+            line: line_number,
+            function: normalize_function(function)
           )
         end
 
@@ -47,6 +57,31 @@ module Julewire
           string = value.to_s
           string if string.match?(/\A\d+\z/)
         end
+
+        def split_file_and_line(location)
+          index = location.rindex(":")
+          return unless index
+
+          file = location[0, index]
+          line = location[(index + 1)..]
+          return if file.empty? || !line.match?(/\A\d+\z/)
+
+          [file, line]
+        end
+
+        def normalize_function(function)
+          return unless function
+
+          if function.length >= 2 && quoted?(function.getbyte(0)) && quoted?(function.getbyte(-1))
+            function[1...-1]
+          else
+            function
+          end
+        end
+
+        def quoted?(byte)
+          QUOTE_BYTES.include?(byte)
+        end
       end
     end
   end

data/lib/julewire/gcp/source_location_options.rb

@@ -3,12 +3,12 @@
 module Julewire
   module GCP
     module SourceLocationOptions
-      EMPTY_HASH = {}.freeze
-      private_constant :EMPTY_HASH
-
       class << self
         def call(record, neutral_attributes)
-          options = record.dig(:payload, :gcp, :source_location)
+          control = record.fetch(:payload)[:gcp]
+          return from_neutral_attributes(neutral_attributes) unless control.is_a?(Hash)
+
+          options = control[:source_location]
           return options if options.is_a?(Hash)
 
           from_neutral_attributes(neutral_attributes)
@@ -18,8 +18,6 @@ module Julewire
           file = neutral_attributes[Core::Fields::AttributeKeys::CODE_FILE_PATH]
           line = neutral_attributes[Core::Fields::AttributeKeys::CODE_LINE_NUMBER]
           function = neutral_attributes[Core::Fields::AttributeKeys::CODE_FUNCTION_NAME]
-          return EMPTY_HASH if file.nil? && line.nil? && function.nil?
-
           values = Core::Integration::Values::Shape
           options = {}
           values.append_field(options, :file, file)

data/lib/julewire/gcp/trace_context.rb

@@ -25,13 +25,7 @@ module Julewire
       module Hex
         class << self
           def zero?(value)
-            offset = 0
-            while offset < value.bytesize
-              return false unless value.getbyte(offset) == 48
-
-              offset += 1
-            end
-            true
+            value.each_byte.all? { it == 48 }
           end
         end
       end

data/lib/julewire/gcp/version.rb

@@ -2,6 +2,6 @@
 
 module Julewire
   module GCP
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: julewire-gcp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Grebennik
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Google Cloud Logging formatter for Julewire.
 test_files: []