spree_vpago 2.1.9 → 2.2.0.pre.addpaymentlogger

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa144ac2f71930d7c834534d8b10723530af727d3fcf64df7c7a826f3c3788b
-  data.tar.gz: 9269d7fd90b13f9a1eb4f145a3f5d09c5f5f84e4164a2e5e4e6ba1e9ba5ad1ee
+  metadata.gz: 5a95a94461d263e091ae13318a66e83076486a6e6a0e51e0de47f491afa0ce47
+  data.tar.gz: 36a1f1b281927c5b86495436434d9b6da2c09c33f5f97ce167365f941121f762
 SHA512:
-  metadata.gz: 303b90200618be3000955230dd678f7caa83bdef3637d03fce5922b84dcc3085fe3e5da2101e3531432a3e6ec6b768bb14f969cc7d988f2aa3c458375c465d39
-  data.tar.gz: dd28ef26a08a7d6138bf20bcf58a44e569bc3ad1a1eac7229611a97091a01e7aa455c1655ad98eb37d40d34562ab5b94e724f2cbf444ddfcd038384e41a56474
+  metadata.gz: 4879b458c00839752fe57237d8baf3847ce3f31df77b3f1a6efe482882f4bb2470916f8d347801baa8bb8000a9f4489d2a5b9e4925eb23c626d5a076626b0566
+  data.tar.gz: ebe9ba8f2e11dc363beadd8a5a996ce1a3ab327138b594d445b58476f04118aacc87b7514a58591b8b46217dbc8a7d132c776609957e22ec16fe9b46a316ea67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.1.9)
+    spree_vpago (2.2.0.pre.addpaymentlogger)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -188,7 +188,7 @@ GEM
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    faraday-retry (2.3.2)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)

data/app/controllers/spree/vpago_payments_controller.rb

@@ -44,14 +44,15 @@ module Spree
       return render_not_found unless @payment.present?
 
       unless @payment.order.paid?
-        Vpago::PaymentProcessorJob.perform_later(
-          payment_number: @payment.number
-        )
+        enqueued_at = Time.now.to_f
+        log_enqueue_start(@payment, enqueued_at, return_params)
+
+        Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number, enqueued_at: enqueued_at)
       end
 
       render json: { status: :ok }, status: :ok
     rescue StandardError => e
-      Rails.logger.error("Failed to enqueued payment processor job: #{params} #{e.message}")
+      log_enqueue_error(e)
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 
@@ -62,14 +63,21 @@ module Spree
       @payment = Spree::Payment.find_by(number: params.dig(:data, :external_ref_id))
       return render_not_found unless @payment
 
-      Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number) unless @payment.order.paid?
+      unless @payment.order.paid?
+        enqueued_at = Time.now.to_f
+        log_enqueue_start(@payment, enqueued_at)
+
+        Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number, enqueued_at: enqueued_at)
+      end
 
       render json: { status: { code: '000001', message: 'success' }, data: nil }, status: :ok
     rescue StandardError => e
-      Rails.logger.error("Payment error: #{e.message}")
+      log_enqueue_error(e)
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 
+    private
+
     def sanitize_return_params
       sanitized_params = params.permit!.to_h
 
@@ -92,5 +100,41 @@ module Spree
         format.json { render json: { status: :unauthorized }, status: :unauthorized }
       end
     end
+
+    def log_enqueue_start(payment, enqueued_at, return_params = {})
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.enqueue',
+        data: {
+          payment_number: payment.number,
+          order_number: payment.order&.number,
+          request_id: request.request_id,
+          payment_method_type: payment.payment_method&.type,
+          payment_method_name: payment.payment_method&.name,
+          gateway: detect_payway_gateway_version(payment.payment_method),
+          tran_id: (return_params[:tran_id] || return_params['tran_id']),
+          enqueued_at: enqueued_at
+        }
+      )
+    end
+
+    def log_enqueue_error(error)
+      VpagoLogger.error(
+        event: 'vpago.payment_processor_job.enqueue.error',
+        data: {
+          request_id: request.request_id,
+          payment_number: @payment&.number,
+          error_class: error.class.name,
+          error_message: error.message
+        }
+      )
+    end
+
+    def detect_payway_gateway_version(payment_method)
+      return nil unless payment_method
+      return 'payway_v2' if payment_method.type_payway_v2?
+      return 'payway_v1' if payment_method.type_payway?
+
+      nil
+    end
   end
 end

data/app/controllers/spree/webhook/payways_controller.rb

@@ -4,7 +4,7 @@ module Spree
       skip_before_action :verify_authenticity_token, only: %i[return v2_return continue v2_continue]
 
       # match via: [:get, :post]
-      # {"response"=>"{\"tran_id\":\"PE13LXT1\",\"status\":0"}"}
+      # {"response"=>"{\"tran_id\":\"PE13LXT1\",\"status\":0}"}
       def v2_return
         handler_service = v2_request_updater_service
 
@@ -48,7 +48,7 @@ module Spree
         request_updater.call
 
         order = payment.order
-        order = order.reload
+        order.reload
 
         if order.paid? || payment.pending?
           render plain: :success

data/app/jobs/vpago/payment_processor_job.rb

@@ -1,11 +1,71 @@
 # Put :payment_processing at a higher priority in your project: config/sidekiq.yml
+require 'vpago/timing_helper'
+
 module Vpago
   class PaymentProcessorJob < ::ApplicationUniqueJob
     queue_as :payment_processing
 
     def perform(options)
+      started_at = Vpago::TimingHelper.current_time
+      enqueued_at = options[:enqueued_at]
+      queue_wait_ms = calculate_queue_wait_ms(enqueued_at)
+
+      log_job_start(options[:payment_number], queue_wait_ms)
+
       payment = Spree::Payment.find_by!(number: options[:payment_number])
       Vpago::PaymentProcessor.new(payment: payment).call
+
+      log_job_finish(options[:payment_number], queue_wait_ms, started_at)
+    rescue StandardError => e
+      log_job_error(options[:payment_number], queue_wait_ms, started_at, e)
+      raise
+    end
+
+    private
+
+    def calculate_queue_wait_ms(enqueued_at)
+      return nil unless enqueued_at
+
+      ((Time.now.to_f - enqueued_at.to_f) * 1000.0).round(1)
+    end
+
+    def log_job_start(payment_number, queue_wait_ms)
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.start',
+        data: {
+          payment_number: payment_number,
+          queue: self.class.queue_name,
+          queue_wait_ms: queue_wait_ms
+        }
+      )
+    end
+
+    def log_job_finish(payment_number, queue_wait_ms, started_at)
+      runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
+      VpagoLogger.log(
+        event: 'vpago.payment_processor_job.finish',
+        data: {
+          payment_number: payment_number,
+          queue: self.class.queue_name,
+          queue_wait_ms: queue_wait_ms,
+          runtime_ms: runtime_ms
+        }
+      )
+    end
+
+    def log_job_error(payment_number, queue_wait_ms, started_at, error)
+      runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
+      VpagoLogger.error(
+        event: 'vpago.payment_processor_job.error',
+        data: {
+          payment_number: payment_number,
+          queue: self.class.queue_name,
+          queue_wait_ms: queue_wait_ms,
+          runtime_ms: runtime_ms,
+          error_class: error.class.name,
+          error_message: error.message
+        }
+      )
     end
   end
 end

data/app/lib/vpago/timing_helper.rb

@@ -0,0 +1,28 @@
+module Vpago
+  module TimingHelper
+    # Gets the current monotonic timestamp.
+    #
+    # @return [Float] current timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    def self.current_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
+    # Measures elapsed time in milliseconds from a given start timestamp.
+    #
+    # @param started_at [Float] timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    # @return [Float] elapsed time in milliseconds, rounded to 1 decimal place
+    def self.elapsed_ms(started_at)
+      ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at) * 1000.0).round(1)
+    end
+
+    # Yields to a block and measures its execution time in milliseconds.
+    #
+    # @yield the block to measure
+    # @return [Float] elapsed time in milliseconds, rounded to 1 decimal place
+    def self.measure_ms
+      started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      yield
+      elapsed_ms(started_at)
+    end
+  end
+end

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.1.9'.freeze
+  VERSION = '2.2.0-addpaymentlogger'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/transaction_status.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'vpago/timing_helper'
 
 module Vpago
   module PaywayV2
@@ -35,6 +36,8 @@ module Vpago
       end
 
       def check_remote_status
+        started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
         conn = Faraday::Connection.new do |faraday|
           faraday.request :url_encoded
         end
@@ -46,7 +49,33 @@ module Vpago
           hash: checker_hmac
         }
 
-        conn.post(check_transaction_url, data)
+        response = conn.post(check_transaction_url, data)
+
+        runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
+        Rails.logger.info(
+          {
+            event: 'vpago.payway.check_transaction',
+            version: 'v2',
+            payment_number: transaction_id,
+            http_status: response.status,
+            runtime_ms: runtime_ms
+          }
+        )
+
+        response
+      rescue StandardError => e
+        runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
+        Rails.logger.error(
+          {
+            event: 'vpago.payway.check_transaction.error',
+            version: 'v2',
+            payment_number: transaction_id,
+            runtime_ms: runtime_ms,
+            error_class: e.class.name,
+            error_message: e.message
+          }
+        )
+        raise
       end
 
       def payout_total

data/lib/vpago_logger.rb

@@ -0,0 +1,15 @@
+module VpagoLogger
+  def self.log(event:, data: nil)
+    message = { event: event }
+    message.merge!(data) if data
+
+    Rails.logger.info(message.to_json)
+  end
+
+  def self.error(event:, data: nil)
+    message = { event: event }
+    message.merge!(data) if data
+
+    Rails.logger.error(message.to_json)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0.pre.addpaymentlogger
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-31 00:00:00.000000000 Z
+date: 2026-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -188,6 +188,7 @@ files:
 - app/jobs/vpago/payment_capturer_job.rb
 - app/jobs/vpago/payment_processor_job.rb
 - app/jobs/vpago/payment_voider_job.rb
+- app/lib/vpago/timing_helper.rb
 - app/models/.gitkeep
 - app/models/concerns/vpago/payoutable.rb
 - app/models/spree/gateway/acleda.rb
@@ -418,6 +419,7 @@ files:
 - lib/vpago/wing_sdk/payment_retriever.rb
 - lib/vpago/wing_sdk/transaction_status_checker.rb
 - lib/vpago/wing_sdk/transaction_status_response.rb
+- lib/vpago_logger.rb
 - node_modules/.yarn-integrity
 - package-lock.json
 - package.json
@@ -439,9 +441,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1