logstruct 0.1.2 → 0.1.3

data/lib/log_struct/log/good_job/schedule.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class GoodJob
       class Schedule < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, T.nilable(String), default: nil
         const :job_class, T.nilable(String), default: nil
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
 
@@ -46,90 +41,24 @@ module LogStruct
         const :priority, T.nilable(Integer), default: nil
         const :cron_key, T.nilable(String), default: nil
 
-        # Additional data
-        include LogStruct::Log::Interfaces::AdditionalDataField
-        const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
-        include LogStruct::Log::Shared::MergeAdditionalDataFields
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil)
-          h = {}
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
           h[LogField::JobId] = job_id unless job_id.nil?
           h[LogField::JobClass] = job_class unless job_class.nil?
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
-          h
-        end
-
-        sig {
-          params(duration_ms: T.untyped,
-            scheduled_at: T.untyped,
-            job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            priority: T.untyped,
-            cron_key: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(duration_ms:,
-          scheduled_at:,
-          job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          priority: nil,
-          cron_key: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions)
           h[LogField::DurationMs] = duration_ms
           h[LogField::ScheduledAt] = scheduled_at
           h[LogField::Priority] = priority unless priority.nil?
           h[LogField::CronKey] = cron_key unless cron_key.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            duration_ms: duration_ms,
-            scheduled_at: scheduled_at,
-            priority: priority,
-            cron_key: cron_key,
-            additional_data: additional_data,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/good_job/start.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class GoodJob
       class Start < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -36,7 +31,7 @@ module LogStruct
 
         const :job_id, T.nilable(String), default: nil
         const :job_class, T.nilable(String), default: nil
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
 
@@ -46,90 +41,24 @@ module LogStruct
         const :wait_ms, T.nilable(Float), default: nil
         const :scheduled_at, T.nilable(Time), default: nil
 
-        # Additional data
-        include LogStruct::Log::Interfaces::AdditionalDataField
-        const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
-        include LogStruct::Log::Shared::MergeAdditionalDataFields
-
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
-        sig {
-          params(job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.base_hash(job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil)
-          h = {}
+        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
           h[LogField::JobId] = job_id unless job_id.nil?
           h[LogField::JobClass] = job_class unless job_class.nil?
           h[LogField::QueueName] = queue_name unless queue_name.nil?
           h[LogField::Arguments] = arguments unless arguments.nil?
           h[LogField::Executions] = executions unless executions.nil?
-          h
-        end
-
-        sig {
-          params(process_id: T.untyped,
-            thread_id: T.untyped,
-            job_id: T.untyped,
-            job_class: T.untyped,
-            queue_name: T.untyped,
-            arguments: T.untyped,
-            executions: T.untyped,
-            wait_ms: T.untyped,
-            scheduled_at: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(process_id:,
-          thread_id:,
-          job_id: nil,
-          job_class: nil,
-          queue_name: nil,
-          arguments: nil,
-          executions: nil,
-          wait_ms: nil,
-          scheduled_at: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash(job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions)
           h[LogField::ProcessId] = process_id
           h[LogField::ThreadId] = thread_id
           h[LogField::WaitMs] = wait_ms unless wait_ms.nil?
           h[LogField::ScheduledAt] = scheduled_at unless scheduled_at.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            job_id: job_id,
-            job_class: job_class,
-            queue_name: queue_name,
-            arguments: arguments,
-            executions: executions,
-            process_id: process_id,
-            thread_id: thread_id,
-            wait_ms: wait_ms,
-            scheduled_at: scheduled_at,
-            additional_data: additional_data,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/good_job.rb

@@ -20,7 +20,7 @@ module LogStruct
         extend T::Sig
         const :job_id, T.nilable(String), default: nil
         const :job_class, T.nilable(String), default: nil
-        const :queue_name, T.nilable(String), default: nil
+        const :queue_name, T.nilable(Symbol), default: nil
         const :arguments, T.nilable(T::Array[T.untyped]), default: nil
         const :executions, T.nilable(Integer), default: nil
 
@@ -28,7 +28,7 @@ module LogStruct
           {
             job_id: T.nilable(String),
             job_class: T.nilable(String),
-            queue_name: T.nilable(String),
+            queue_name: T.nilable(Symbol),
             arguments: T.nilable(T::Array[T.untyped]),
             executions: T.nilable(Integer)
           }

data/lib/log_struct/log/plain.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../enums/source"
 require_relative "../enums/event"
 require_relative "../enums/level"
@@ -20,11 +20,6 @@ require_relative "../enums/log_field"
 module LogStruct
   module Log
     class Plain < T::Struct
-      # typed: strict
-      # frozen_string_literal: true
-
-      extend T::Sig
-
       extend T::Sig
 
       # Shared/common fields
@@ -41,38 +36,16 @@ module LogStruct
       const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
       include LogStruct::Log::Shared::MergeAdditionalDataFields
 
-      # Request fields (optional)
-
       # Serialize shared fields
       include LogStruct::Log::Interfaces::CommonFields
       include LogStruct::Log::Shared::SerializeCommon
 
       sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-      def self.base_hash
-        {}
-      end
-
-      sig {
-        params(message: T.untyped,
-          additional_data: T.untyped,
-          timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-      }
-      def self.build(message:,
-        additional_data: nil,
-        timestamp: Time.now)
-        h = base_hash
+      def to_h
+        h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
         h[LogField::Message] = message
         h
       end
-
-      sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-      def to_h
-        self.class.build(
-          message: message,
-          additional_data: additional_data,
-          timestamp: timestamp
-        )
-      end
     end
   end
 end

data/lib/log_struct/log/puma/shutdown.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class Puma
       class Shutdown < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -42,38 +37,16 @@ module LogStruct
         const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
         include LogStruct::Log::Shared::MergeAdditionalDataFields
 
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
         sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def self.base_hash
-          {}
-        end
-
-        sig {
-          params(process_id: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(process_id: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
           h[LogField::ProcessId] = process_id unless process_id.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            process_id: process_id,
-            additional_data: additional_data,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/puma/start.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../../enums/source"
 require_relative "../../enums/event"
 require_relative "../../enums/level"
@@ -21,11 +21,6 @@ module LogStruct
   module Log
     class Puma
       class Start < T::Struct
-        # typed: strict
-        # frozen_string_literal: true
-
-        extend T::Sig
-
         extend T::Sig
 
         # Shared/common fields
@@ -50,42 +45,13 @@ module LogStruct
         const :additional_data, T.nilable(T::Hash[T.any(String, Symbol), T.untyped]), default: nil
         include LogStruct::Log::Shared::MergeAdditionalDataFields
 
-        # Request fields (optional)
-
         # Serialize shared fields
         include LogStruct::Log::Interfaces::CommonFields
         include LogStruct::Log::Shared::SerializeCommon
 
         sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def self.base_hash
-          {}
-        end
-
-        sig {
-          params(mode: T.untyped,
-            puma_version: T.untyped,
-            puma_codename: T.untyped,
-            ruby_version: T.untyped,
-            min_threads: T.untyped,
-            max_threads: T.untyped,
-            environment: T.untyped,
-            process_id: T.untyped,
-            listening_addresses: T.untyped,
-            additional_data: T.untyped,
-            timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-        }
-        def self.build(mode: nil,
-          puma_version: nil,
-          puma_codename: nil,
-          ruby_version: nil,
-          min_threads: nil,
-          max_threads: nil,
-          environment: nil,
-          process_id: nil,
-          listening_addresses: nil,
-          additional_data: nil,
-          timestamp: Time.now)
-          h = base_hash
+        def to_h
+          h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
           h[LogField::Mode] = mode unless mode.nil?
           h[LogField::PumaVersion] = puma_version unless puma_version.nil?
           h[LogField::PumaCodename] = puma_codename unless puma_codename.nil?
@@ -97,23 +63,6 @@ module LogStruct
           h[LogField::ListeningAddresses] = listening_addresses unless listening_addresses.nil?
           h
         end
-
-        sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-        def to_h
-          self.class.build(
-            mode: mode,
-            puma_version: puma_version,
-            puma_codename: puma_codename,
-            ruby_version: ruby_version,
-            min_threads: min_threads,
-            max_threads: max_threads,
-            environment: environment,
-            process_id: process_id,
-            listening_addresses: listening_addresses,
-            additional_data: additional_data,
-            timestamp: timestamp
-          )
-        end
       end
     end
   end

data/lib/log_struct/log/request.rb

@@ -9,9 +9,9 @@
 require "log_struct/shared/interfaces/common_fields"
 require "log_struct/shared/interfaces/additional_data_field"
 require "log_struct/shared/interfaces/request_fields"
-require "log_struct/shared/shared/serialize_common"
-require "log_struct/shared/shared/merge_additional_data_fields"
-require "log_struct/shared/shared/add_request_fields"
+require "log_struct/shared/serialize_common"
+require "log_struct/shared/merge_additional_data_fields"
+require "log_struct/shared/add_request_fields"
 require_relative "../enums/source"
 require_relative "../enums/event"
 require_relative "../enums/level"
@@ -20,11 +20,6 @@ require_relative "../enums/log_field"
 module LogStruct
   module Log
     class Request < T::Struct
-      # typed: strict
-      # frozen_string_literal: true
-
-      extend T::Sig
-
       extend T::Sig
 
       # Shared/common fields
@@ -41,7 +36,7 @@ module LogStruct
       const :request_id, T.nilable(String), default: nil
 
       # Event-specific fields
-      const :format, T.nilable(String), default: nil
+      const :format, T.nilable(Symbol), default: nil
       const :controller, T.nilable(String), default: nil
       const :action, T.nilable(String), default: nil
       const :status, T.nilable(Integer), default: nil
@@ -50,8 +45,6 @@ module LogStruct
       const :database, T.nilable(Float), default: nil
       const :params, T.nilable(T::Hash[Symbol, T.untyped]), default: nil
 
-      # Additional data
-
       # Request fields (optional)
       include LogStruct::Log::Interfaces::RequestFields
 
@@ -60,70 +53,15 @@ module LogStruct
       include LogStruct::Log::Shared::SerializeCommon
       include LogStruct::Log::Shared::AddRequestFields
 
-      sig {
-        params(path: T.untyped,
-          http_method: T.untyped,
-          source_ip: T.untyped,
-          user_agent: T.untyped,
-          referer: T.untyped,
-          request_id: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-      }
-      def self.base_hash(path: nil,
-        http_method: nil,
-        source_ip: nil,
-        user_agent: nil,
-        referer: nil,
-        request_id: nil)
-        h = {}
+      sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
+      def to_h
+        h = T.let({}, T::Hash[LogStruct::LogField, T.untyped])
         h[LogField::Path] = path unless path.nil?
         h[LogField::HttpMethod] = http_method unless http_method.nil?
         h[LogField::SourceIp] = source_ip unless source_ip.nil?
         h[LogField::UserAgent] = user_agent unless user_agent.nil?
         h[LogField::Referer] = referer unless referer.nil?
         h[LogField::RequestId] = request_id unless request_id.nil?
-        h
-      end
-
-      sig {
-        params(path: T.untyped,
-          http_method: T.untyped,
-          source_ip: T.untyped,
-          user_agent: T.untyped,
-          referer: T.untyped,
-          request_id: T.untyped,
-          format: T.untyped,
-          controller: T.untyped,
-          action: T.untyped,
-          status: T.untyped,
-          duration_ms: T.untyped,
-          view: T.untyped,
-          database: T.untyped,
-          params: T.untyped,
-          additional_data: T.untyped,
-          timestamp: T.untyped).returns(T::Hash[LogStruct::LogField, T.untyped])
-      }
-      def self.build(path: nil,
-        http_method: nil,
-        source_ip: nil,
-        user_agent: nil,
-        referer: nil,
-        request_id: nil,
-        format: nil,
-        controller: nil,
-        action: nil,
-        status: nil,
-        duration_ms: nil,
-        view: nil,
-        database: nil,
-        params: nil,
-        additional_data: nil,
-        timestamp: Time.now)
-        h = base_hash(path: path,
-          http_method: http_method,
-          source_ip: source_ip,
-          user_agent: user_agent,
-          referer: referer,
-          request_id: request_id)
         h[LogField::Format] = format unless format.nil?
         h[LogField::Controller] = controller unless controller.nil?
         h[LogField::Action] = action unless action.nil?
@@ -134,27 +72,6 @@ module LogStruct
         h[LogField::Params] = params unless params.nil?
         h
       end
-
-      sig { returns(T::Hash[LogStruct::LogField, T.untyped]) }
-      def to_h
-        self.class.build(
-          path: path,
-          http_method: http_method,
-          source_ip: source_ip,
-          user_agent: user_agent,
-          referer: referer,
-          request_id: request_id,
-          format: format,
-          controller: controller,
-          action: action,
-          status: status,
-          duration_ms: duration_ms,
-          view: view,
-          database: database,
-          params: params,
-          timestamp: timestamp
-        )
-      end
     end
   end
 end