julewire-core 1.0.0 → 1.1.0

data/lib/julewire/core/records/draft.rb

@@ -12,15 +12,14 @@ module Julewire
 
         class << self
           def build( # rubocop:disable Metrics/ParameterLists -- Record construction has fixed public sections.
-            input = {},
+            input = nil,
             context:,
             scope:,
-            attributes: {},
-            neutral: {},
-            carry: {},
-            static_labels: {},
-            freeze_sections: true,
-            error_backtrace_lines: Core::MAX_BACKTRACE_LINES,
+            attributes: nil,
+            neutral: nil,
+            carry: nil,
+            static_labels: nil,
+            error_backtrace_lines: DEFAULT_ERROR_BACKTRACE_LINES,
             invalid_severity_reporter: Diagnostics::InvalidSeverityReporter
           )
             build_with(
@@ -32,24 +31,21 @@ module Julewire
               static_labels: static_labels,
               scope: scope,
               invalid_severity_reporter: invalid_severity_reporter,
-              options: BuildOptions.defensive(
-                freeze_sections: freeze_sections,
-                error_backtrace_lines: error_backtrace_lines
-              )
+              fields_owned: false,
+              input_owned: false,
+              error_backtrace_lines: error_backtrace_lines
             )
           end
 
           def build_pipeline_owned( # rubocop:disable Metrics/ParameterLists -- Record construction has fixed public sections.
-            input = {},
+            input,
             context:,
             scope:,
-            attributes: {},
-            neutral: {},
-            carry: {},
-            static_labels: {},
+            attributes: nil,
+            neutral: nil,
+            carry: nil,
             input_owned: false,
-            freeze_sections: true,
-            error_backtrace_lines: Core::MAX_BACKTRACE_LINES,
+            error_backtrace_lines: DEFAULT_ERROR_BACKTRACE_LINES,
             invalid_severity_reporter: Diagnostics::InvalidSeverityReporter
           )
             build_with(
@@ -58,21 +54,20 @@ module Julewire
               neutral: neutral,
               attributes: attributes,
               carry: carry,
-              static_labels: static_labels,
+              static_labels: nil,
               scope: scope,
               invalid_severity_reporter: invalid_severity_reporter,
-              options: BuildOptions.pipeline_owned(
-                input_owned: input_owned,
-                freeze_sections: freeze_sections,
-                error_backtrace_lines: error_backtrace_lines
-              )
+              fields_owned: true,
+              input_owned: input_owned,
+              error_backtrace_lines: error_backtrace_lines
             )
           end
 
           private
 
           def build_with(input, context:, neutral:, attributes:, carry:, static_labels:, scope:, # rubocop:disable Metrics/ParameterLists
-                         invalid_severity_reporter:, options:)
+                         invalid_severity_reporter:, fields_owned:, input_owned:,
+                         error_backtrace_lines:)
             builder = Builder.new(
               input,
               context: context,
@@ -82,94 +77,45 @@ module Julewire
               static_labels: static_labels,
               scope: scope,
               invalid_severity_reporter: invalid_severity_reporter,
-              options: options
+              fields_owned: fields_owned,
+              input_owned: input_owned,
+              error_backtrace_lines: error_backtrace_lines
             )
-            new(builder.to_h, lineage: builder.lineage, freeze_sections: options.freeze_sections)
+            new(builder.to_h, lineage: builder.lineage)
           end
 
           public
 
-          def from_normalized_hash(data, lineage: nil, freeze_sections: true)
-            normalized = Fields::FieldSet.deep_symbolize_keys(data)
-            lineage ||= Execution::Lineage.from_execution_hash(normalized[:execution])
-            normalized[:execution] = Execution::Lineage.clean_lazy_relationship_hash(normalized[:execution])
-            normalized = Fields::Internal.frozen_deep_symbolize_keys(normalized) if freeze_sections
-            new(
-              normalized,
-              lineage: lineage,
-              freeze_sections: freeze_sections
-            )
+          def from_normalized_hash(data, lineage: nil)
+            Record.validate_normalized_hash!(data)
+            normalized = Fields::FieldSet.deep_dup_owned(data)
+            execution = normalized.fetch(:execution)
+            lineage ||= Execution::Lineage.from_execution_hash(execution)
+            normalized[:execution] = Execution::Lineage.clean_normalized_lazy_relationship_hash(execution)
+            new(normalized, lineage: lineage)
           end
 
-          def from_record(record, freeze_sections: true)
+          def from_record(record)
             Record.validate_normalized!(record)
-            from_normalized_hash(record.to_h, lineage: record.lineage, freeze_sections: freeze_sections)
+            from_normalized_hash(record.to_h, lineage: record.lineage)
           end
         end
+        private_class_method :new
 
+        DEFAULT_ERROR_BACKTRACE_LINES = Core::MAX_BACKTRACE_LINES
         LINEAGE_IDENTITY_KEYS = %i[type id depth root parent].freeze
-        private_constant :LINEAGE_IDENTITY_KEYS
-
-        BuildOptions = Data.define(:fields_owned, :input_owned, :freeze_sections, :error_backtrace_lines) do
-          class << self
-            def defensive(freeze_sections:, error_backtrace_lines:)
-              return default_defensive.fetch(freeze_sections) if default_backtrace_lines?(error_backtrace_lines)
-
-              new(false, false, freeze_sections, error_backtrace_lines)
-            end
-
-            def pipeline_owned(input_owned:, freeze_sections:, error_backtrace_lines:)
-              if default_backtrace_lines?(error_backtrace_lines)
-                return default_pipeline.fetch(input_owned).fetch(freeze_sections)
-              end
-
-              new(true, input_owned, freeze_sections, error_backtrace_lines)
-            end
-
-            private
-
-            def default_backtrace_lines?(value)
-              value == Core::MAX_BACKTRACE_LINES
-            end
-
-            def default_defensive
-              # Hot-path defaults are reused by every emitted record.
-              @default_defensive ||= {
-                false => new(false, false, false, Core::MAX_BACKTRACE_LINES),
-                true => new(false, false, true, Core::MAX_BACKTRACE_LINES)
-              }.freeze
-            end
-
-            def default_pipeline
-              @default_pipeline ||= {
-                false => {
-                  false => new(true, false, false, Core::MAX_BACKTRACE_LINES),
-                  true => new(true, false, true, Core::MAX_BACKTRACE_LINES)
-                }.freeze,
-                true => {
-                  false => new(true, true, false, Core::MAX_BACKTRACE_LINES),
-                  true => new(true, true, true, Core::MAX_BACKTRACE_LINES)
-                }.freeze
-              }.freeze
-            end
-          end
-        end
-        private_constant :BuildOptions
+        private_constant :DEFAULT_ERROR_BACKTRACE_LINES, :LINEAGE_IDENTITY_KEYS
 
-        def initialize(data, lineage: nil, freeze_sections: true)
+        def initialize(data, lineage:)
           @data = data
-          @freeze_sections = freeze_sections
-          @lineage = lineage || Execution::Lineage.from_execution_hash(@data[:execution])
-          validate!
+          @lineage = lineage
         end
 
         def [](key) = @data[key]
 
         def []=(key, value)
-          @lineage = nil if key == :execution
-          ensure_mutable_data!
           @data[key] = value
-          @to_record = nil
+          @lineage = nil if key == :execution
         end
 
         def fetch(...) = @data.fetch(...)
@@ -182,17 +128,19 @@ module Julewire
 
         def each_key(&) = @data.each_key(&)
 
-        def to_h = Fields::FieldSet.deep_dup(@data)
+        def to_h = Fields::FieldSet.deep_dup_owned(@data)
 
         def transform_field!(key)
-          key = Fields::Internal.normalize_key(key)
-          replace_transformed_field!(key, yield(@data[key]))
+          ensure_unfinalized!
+          validate_transform_key!(key, Record::REQUIRED_KEYS, kind: :field)
+          replace_transformed_field!(key, yield(self[key]))
           self
         end
 
         def transform_section!(key)
-          key = Fields::Internal.normalize_key(key)
-          section = @data[key]
+          ensure_unfinalized!
+          validate_transform_key!(key, Record::HASH_SECTIONS, kind: :section)
+          section = self[key]
           replacement = yield(section)
           raise TypeError, "record #{key} must be a Hash" unless replacement.is_a?(Hash)
 
@@ -201,12 +149,12 @@ module Julewire
         end
 
         def transform_record!
+          ensure_unfinalized!
           previous_lineage = @lineage
-          previous_identity = execution_lineage_identity(@data[:execution])
+          previous_identity = execution_lineage_identity(fetch(:execution))
           replacement = yield(@data)
           @lineage = replacement_lineage_for(previous_lineage, previous_identity, replacement)
-          @data = replacement
-          @to_record = nil
+          @data = replacement.dup
           self
         end
 
@@ -219,123 +167,86 @@ module Julewire
           self
         end
 
-        def lineage = (@lineage ||= Execution::Lineage.from_execution_hash(@data[:execution]))
+        def lineage = (@lineage ||= Execution::Lineage.from_execution_hash(fetch(:execution)))
 
         def to_record
-          @to_record ||= Record.from_owned_hash(@data, lineage: @lineage, trust_frozen: @freeze_sections)
+          return @to_record if @to_record
+
+          record = Record.from_owned_hash(@data, lineage: @lineage)
+          @lineage = record.lineage
+          @to_record = record
+          freeze
+          record
         end
 
         private
 
+        def validate_transform_key!(key, allowed, kind:)
+          raise TypeError, "record transform #{kind} must be a Symbol" unless key.instance_of?(Symbol)
+          return if allowed.include?(key)
+
+          raise ArgumentError, "unknown record #{kind}: #{key}"
+        end
+
         def replace_transformed_field!(key, value)
-          preserve_lineage = transformed_field_lineage(key, value)
-          ensure_mutable_data!
-          @data[key] = value
-          @lineage = preserve_lineage if key == :execution
-          @to_record = nil
+          if key == :execution
+            replace_transformed_execution!(value)
+          else
+            self[key] = value
+          end
         end
 
-        def ensure_mutable_data!
-          @data = Fields::FieldSet.deep_dup(@data) if @data.frozen?
+        def replace_transformed_execution!(value)
+          preserve_lineage = transformed_execution_lineage(value)
+          self[:execution] = value
+          @lineage = preserve_lineage
         end
 
-        def transformed_field_lineage(key, value)
-          return @lineage unless key == :execution
+        def ensure_unfinalized!
+          raise FrozenError, "can't transform a finalized record draft" if frozen?
+        end
 
+        def transformed_execution_lineage(value)
           replacement_lineage_for(
             @lineage,
-            execution_lineage_identity(@data[:execution]),
+            execution_lineage_identity(fetch(:execution)),
             @data.merge(execution: value)
           )
         end
 
         def replacement_lineage_for(lineage, previous, data)
-          return unless lineage
-
-          current = data.is_a?(Hash) ? execution_lineage_identity(data[:execution]) : nil
+          current = execution_lineage_identity(data[:execution]) if data.is_a?(Hash)
           lineage if previous == current
         end
 
         def execution_lineage_identity(execution)
           return unless execution.is_a?(Hash)
 
-          normalized = Fields::FieldSet.deep_symbolize_keys(execution)
           LINEAGE_IDENTITY_KEYS.each_with_object({}) do |key, identity|
-            identity[key] = normalized[key] if normalized.key?(key)
-          end
-        end
-
-        class BuildInput
-          # Normalizes raw emit input into draft top-level fields plus payload.
-          RECORD_INPUT_KEYS = Record::REQUIRED_KEYS.freeze
-          RECORD_INPUT_KEY_SET = RECORD_INPUT_KEYS.to_h { [it, true] }.freeze
-          private_constant :RECORD_INPUT_KEYS
-          private_constant :RECORD_INPUT_KEY_SET
-
-          class << self
-            def call(input, owned:)
-              return {} if input.nil?
-              return input if owned && input.is_a?(Hash)
-              return shallow_symbolize(input) if RawInput.hash_input?(input)
-
-              { message: input.to_s }
-            end
-
-            private
-
-            def shallow_symbolize(input)
-              normalized = {}
-              payload_fields = {}
-              input.each do |key, raw_value|
-                normalized_key = Fields::Internal.normalize_key(key)
-                value = raw_value.equal?(input) ? CIRCULAR_REFERENCE : raw_value
-                if RECORD_INPUT_KEY_SET.key?(normalized_key)
-                  normalized[normalized_key] = value
-                else
-                  payload_fields[normalized_key] = value
-                end
-              end
-              merge_unknown_payload!(normalized, payload_fields)
-              normalized
-            end
-
-            def merge_unknown_payload!(normalized, payload_fields)
-              return if payload_fields.empty?
-
-              normalized[:payload] = if normalized.key?(:payload)
-                                       merge_payload_input(normalized[:payload], payload_fields)
-                                     else
-                                       payload_fields
-                                     end
-            end
-
-            def merge_payload_input(explicit_payload, unknown_payload)
-              if explicit_payload.is_a?(Hash)
-                Fields::FieldSet.merge(unknown_payload, explicit_payload)
-              else
-                Fields::FieldSet.merge(unknown_payload, Fields::FieldSet::VALUE_KEY => explicit_payload)
-              end
-            end
+            identity[key] = execution.fetch(key) if execution.key?(key)
           end
         end
-        private_constant :BuildInput
 
         class Builder
           EMPTY_HASH = {}.freeze
           private_constant :EMPTY_HASH
 
-          def initialize(input = {}, context:, neutral:, attributes:, carry:, static_labels:, scope:, # rubocop:disable Metrics/ParameterLists
-                         invalid_severity_reporter:, options:)
-            @input_owned = options.input_owned
-            @input = BuildInput.call(input, owned: @input_owned)
+          def initialize(input, context:, neutral:, attributes:, carry:, static_labels:, scope:, # rubocop:disable Metrics/ParameterLists
+                         invalid_severity_reporter:, fields_owned:, input_owned:,
+                         error_backtrace_lines:)
+            @input_owned = input_owned
+            @input = if @input_owned
+                       BuildInput.validate_owned(input)
+                     else
+                       BuildInput.normalize_public(input)
+                     end
             @context = context || {}
             @neutral = neutral || {}
             @attributes = attributes || {}
             @carry = carry || {}
             @static_labels = static_labels || {}
-            @fields_owned = options.fields_owned
-            @freeze_sections = options.freeze_sections
-            @error_backtrace_lines = options.error_backtrace_lines
+            @fields_owned = fields_owned
+            @error_backtrace_lines = error_backtrace_lines
             @invalid_severity_reporter = invalid_severity_reporter
             @scope = scope
           end
@@ -356,7 +267,7 @@ module Julewire
           def base_record(source, event)
             {
               timestamp: timestamp_value,
-              severity: severity_for(source, event),
+              severity: severity_value,
               kind: kind_for(value(:kind)),
               event: event,
               message: normalized_value(:message),
@@ -384,23 +295,22 @@ module Julewire
             Serialization::ValueCopy.call(raw_value.nil? ? Time.now.utc : raw_value, freeze_values: true)
           end
 
-          def severity_for(source, event)
-            return normalize_record_severity(value(:severity), source: source, event: event) if present?(:severity)
+          def severity_value
+            return normalize_record_severity(value(:severity)) if present?(:severity)
 
             :info
           end
 
-          def normalize_record_severity(raw_value, source:, event:)
-            Records::Severity.normalize(raw_value)
+          def normalize_record_severity(raw_value)
+            Severity.normalize(raw_value)
           rescue ArgumentError
             # Below-threshold raw inputs warn before draft construction.
-            @invalid_severity_reporter.call(raw_value, source: source, event: event)
+            @invalid_severity_reporter.call(raw_value)
             :info
           end
 
           def kind_for(kind)
             return :point if kind.nil?
-            return kind if Record::KINDS.value?(kind)
 
             Record::KINDS.fetch(kind.to_s) do
               raise ArgumentError, "unsupported record kind: #{kind.inspect}"
@@ -414,13 +324,11 @@ module Julewire
           end
 
           def base_execution_hash
-            return scope_frozen_execution_hash if owned_frozen_scope_execution?
-
-            normalized_hash(scope_execution_hash)
+            normalized_hash(scope_execution_hash, owned: true)
           end
 
           def input_execution_hash
-            present?(:execution) ? hash_value(:execution) : scope_execution_hash
+            hash_value(:execution)
           end
 
           def context_hash
@@ -440,73 +348,34 @@ module Julewire
           end
 
           def labels_hash
-            section_hash(labels_base, :labels)
+            section_hash(@static_labels.merge(scope_labels_hash || EMPTY_HASH), :labels)
           end
 
           def merge_section(base, key)
-            return merge_owned_section(base, key) if @input_owned
-
-            value = hash_value(key)
-            value = Execution::Lineage.clean_execution_hash(value) if key == :execution
-            return normalized_hash(value) if base.empty?
-
-            base = Fields::FieldSet.deep_dup(base)
-            merged = if key == :attributes
-                       Fields::Internal.deep_merge!(base, value)
-                     else
-                       Fields::FieldSet.merge!(base, value)
-                     end
-            normalized_hash(merged)
-          end
-
-          def merge_owned_section(base, key)
             value = hash_value(key)
             value = clean_owned_execution_hash(value) if key == :execution
-            return normalized_hash(value) if base.empty?
 
-            base = Fields::FieldSet.deep_dup(base)
-            merged = if key == :attributes
-                       Fields::Internal.deep_merge_owned!(base, value)
-                     else
-                       Fields::Internal.merge_owned!(base, value)
-                     end
-            normalized_hash(merged)
+            target = normalized_hash(base, owned: @fields_owned)
+            if key == :attributes
+              Fields::Internal.deep_merge_owned!(target, value)
+            else
+              Fields::Internal.merge_owned!(target, value)
+            end
           end
 
           def clean_owned_execution_hash(value)
-            return Execution::Lineage.clean_execution_hash(value) if @freeze_sections
-
             Execution::Lineage.clean_owned_execution_hash(value)
           end
 
-          def section_hash(base, key)
-            return base if owned_frozen_section?(base) && !present?(key)
-            return normalized_hash(base) unless present?(key)
-
-            merge_section(base, key)
-          end
-
-          def owned_frozen_section?(base)
-            @fields_owned && @freeze_sections && base.is_a?(Hash) && base.frozen?
-          end
-
-          def owned_frozen_scope_execution?
-            @scope && @fields_owned && @freeze_sections
-          end
-
-          def labels_base
-            return scope_labels_hash if @static_labels.empty?
-
-            Fields::FieldSet.merge!(Fields::FieldSet.deep_dup(@static_labels), scope_labels_hash)
-          end
+          def section_hash(base, key) = merge_section(base, key)
 
           def hash_value(key)
-            return empty_hash unless present?(key)
+            return {} unless present?(key)
 
             raw_value = value(key)
-            return normalized_hash(raw_value) if raw_value.is_a?(Hash)
+            return normalized_input_hash(raw_value) if raw_value.is_a?(Hash)
 
-            normalized_hash(Fields::FieldSet::VALUE_KEY => raw_value)
+            normalized_input_hash(Fields::FieldSet::VALUE_KEY => raw_value)
           end
 
           def value(key)
@@ -519,11 +388,8 @@ module Julewire
 
           def immutable_scalar_value(value)
             return value unless value.is_a?(String)
-            return value if value.frozen?
-            return value.dup unless @freeze_sections
-            return value.freeze if @input_owned
 
-            value.dup.freeze
+            value.dup
           end
 
           def present?(key)
@@ -535,39 +401,42 @@ module Julewire
             when nil
               nil
             when Exception
-              normalized_hash(Serialization::ExceptionShape.call(error, max_backtrace_lines: @error_backtrace_lines))
+              Serialization::ExceptionShape.call(error, max_backtrace_lines: @error_backtrace_lines)
             when Hash
-              normalized_hash(normalize_error_hash(error))
+              normalize_error_hash(error)
             else
-              normalized_hash(message: error.to_s)
+              { message: immutable_scalar_value(error.to_s) }
             end
           end
 
           def normalize_error_hash(error)
             Serialization::BacktraceLimiter.call(
-              Fields::FieldSet.deep_symbolize_keys(error),
+              mutable_input_hash(error),
               max_backtrace_lines: @error_backtrace_lines
             )
           end
 
-          def normalized_hash(value)
-            return empty_hash if value.is_a?(Hash) && value.empty?
+          def normalized_input_hash(value)
+            normalized_hash(value, owned: @input_owned)
+          end
 
-            return value if @input_owned && !@freeze_sections && value.is_a?(Hash)
-            return Fields::Internal.frozen_deep_symbolize_keys(value) if @freeze_sections
+          def normalized_hash(value, owned:)
+            return Fields::FieldSet.deep_dup_owned(value) if owned
 
             Fields::FieldSet.deep_symbolize_keys(value)
           end
 
-          def empty_hash
-            @freeze_sections ? EMPTY_HASH : {}
+          def mutable_input_hash(value)
+            if @input_owned
+              Fields::FieldSet.deep_dup_owned(value)
+            else
+              Fields::FieldSet.deep_symbolize_keys(value)
+            end
           end
 
           def scope_execution_hash = @scope ? @scope.frozen_execution_hash : EMPTY_HASH
 
-          def scope_frozen_execution_hash = @scope.frozen_execution_hash
-
-          def scope_labels_hash = @scope ? @scope.frozen_labels_hash : EMPTY_HASH
+          def scope_labels_hash = @scope&.frozen_labels_hash
         end
         private_constant :Builder
       end

data/lib/julewire/core/records/lazy_emit_input.rb

@@ -24,7 +24,7 @@ module Julewire
           end
 
           def each
-            return enum_for(:each) unless block_given?
+            return enum_for unless block_given?
 
             input_hash.each do |key, value|
               yield key, value unless severity_key?(key)
@@ -32,12 +32,6 @@ module Julewire
             yield :severity, @severity
           end
 
-          def to_h
-            each_with_object({}) do |(key, value), hash|
-              hash[key] = value
-            end
-          end
-
           private
 
           def input_hash
@@ -66,9 +60,7 @@ module Julewire
             SeverityInput.new(severity, input)
           end
 
-          def input?(value)
-            value.is_a?(SeverityInput)
-          end
+          def input?(value) = value.instance_of?(SeverityInput)
 
           private
 
@@ -88,8 +80,6 @@ module Julewire
           end
 
           def without_severity(input)
-            return input unless input.is_a?(Hash)
-
             RawInput.without_severity_keys(input)
           end
         end

data/lib/julewire/core/records/metadata.rb

@@ -6,15 +6,16 @@ module Julewire
       module Metadata
         class << self
           def call(record)
-            return {} unless record.respond_to?(:key?) && record.respond_to?(:[])
-
+            labels = record[:labels]
             {
               event: record[:event],
-              labels: record[:labels].is_a?(Hash) ? Fields::FieldSet.deep_dup(record[:labels]) : {},
+              labels: labels.is_a?(Hash) ? Fields::FieldSet.deep_dup(labels) : {},
               logger: record[:logger],
               severity: record[:severity],
               source: record[:source]
             }.compact
+          rescue StandardError
+            {}
           end
         end
       end