auctify 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14832525cab9835407bccb94056500037fe39da17a9ea311f7053ce4adf48255
-  data.tar.gz: 522647a33fa236dd02c2980ecde719508bd83f21db2c0ffa38d1d77ce104d002
+  metadata.gz: bff579c105985a8f250d586936aa3ff93dbf1d0fe3b378c69b1ca91cd54e8dbe
+  data.tar.gz: 40a062694ac56b79ff884ec3cb233c4647881d365f76fee944da6ba0c88ceee4
 SHA512:
-  metadata.gz: 803112a2c554cb95f1eb818911ea4a92d4377306ba936ac5190101f8463a5378d225a5c260a50e01e8cc0f379ddd87b1d57902d186a8469c7baa34dee991f23a
-  data.tar.gz: ee8f293dbba3adc69a730d208b4973ebf7d9609d326bca03eda616ca668edfb792b2d4d9b09bef211a5c08db221da2befcd507d9d3f0844c5d8de1e774db46d8
+  metadata.gz: aab916ea0865c95cb54199b7ad1d807f3508dd87c6e94cebb8eed533b5e7f79e9f5d58132f65cebc14a3a8fc096073794e5df443e883d17a57c37eacb849e9d6
+  data.tar.gz: 814db09ba82b44e8c59981f0f439d7e39d2fe8df85c13c057ae167c0488989de7b5512ddb0473529398a2d10ff5108afc2151e261d83ae6699c0f0b0f7571a31

data/README.md

@@ -221,7 +221,19 @@ end
 
       To protect accidential deletions, many associations are binded with `dependent: restrict_with_error`. Correct order ofdeletion is `bids` => `sales` => `sales_packs`.
 
-
+## Monitor it
+Auctify should add some metrics for Prometheus (using Yabeda gem). Exposing them on `/metrics` path.
+```
+group :auctify do
+  counter :bids_count, comment: "A counter of applied bids"
+  gauge :diff_in_closing_time_seconds,
+        comment: "Difference between auction.currently_ends_at and actual sale end time by job"
+   gauge :time_between_bids, comment: "Time period between last two bids", tags: [:auction_slug]
+end
+```
+See `lib/yabeda_config.rb` for current setup.
+Note: `diff_in_closing_time_seconds` is fill in `auction.close_bidding!`. At normal setup this is done in background job, so value is maintained in BJ process not rails app.
+      Eg. if You use sidekiq for backgoud jobs, You will need `yabeda-sidekiq` gem and then value vwill be displayed at port 9394 (`your.app:9394/metrics`).
 
 ## Contributing
 Contribution directions go here.

data/app/jobs/auctify/application_job.rb

@@ -2,5 +2,9 @@
 
 module Auctify
   class ApplicationJob < ActiveJob::Base
+    private
+      def auction_label(auction)
+        "[#{auction.try(:slug)}##{auction.id}; currently_ends_at: #{auction.currently_ends_at}]"
+      end
   end
 end

data/app/jobs/auctify/bidding_closer_job.rb

@@ -12,11 +12,14 @@ module Auctify
         return
       end
 
-      return if Time.current < auction.currently_ends_at
-
-      Auctify::Sale::Auction.with_advisory_lock("closing_auction_#{auction_id}") do
-        # can wait unitl other BCJob release lock and than continue!
-        auction.close_bidding! if auction.reload.in_sale?
+      if Time.current < auction.currently_ends_at
+        Rails.logger.info("Too soon for closing of auction #{auction_label(auction)}.")
+      else
+        Rails.logger.info("Closing auction #{auction_label(auction)} NOW!")
+        Auctify::Sale::Auction.with_advisory_lock("closing_auction_#{auction_id}") do
+          # can wait unitl other BCJob release lock and than continue!
+          auction.close_bidding! if auction.reload.in_sale?
+        end
       end
     end
   end

data/app/jobs/auctify/ensure_auctions_closing_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Auctify
-  class EnsureAuctionsClosingJob < ApplicationJob
+  class EnsureAuctionsClosingJob < Auctify::ApplicationJob
     queue_as :critical
 
     def perform
@@ -9,8 +9,10 @@ module Auctify
                                       .where("currently_ends_at <= ?", Time.current + checking_period_to_future)
       auctions.each do |auction|
         if auction.currently_ends_at <= Time.current
+          Rails.logger.info("Queueing auction #{auction_label(auction)} for immediate close.")
           Auctify::BiddingCloserJob.perform_later(auction_id: auction.id)
         else
+          Rails.logger.info("Delaying close of auction #{auction_label(auction)}.")
           Auctify::BiddingCloserJob.set(wait_until: auction.currently_ends_at).perform_later(auction_id: auction.id)
         end
       end

data/app/models/auctify/sale/auction.rb

@@ -69,7 +69,9 @@ module Auctify
 
           after do
             self.winner = current_winner
+
             now = Time.current
+            Yabeda.auctify.diff_in_closing_time_seconds.set({}, (now - self.currently_ends_at))
             self.currently_ends_at = now if now < currently_ends_at
 
             after_close_bidding
@@ -161,7 +163,16 @@ module Auctify
 
           bap = Auctify::BidsAppender.call(auction: self, bid: bid)
 
-          bap.success? ? after_bid_appended(bap) : after_bid_not_appended(bap)
+          if bap.success?
+            after_bid_appended(bap)
+
+            Yabeda.auctify.bids_count.increment({}, by: 1)
+            times = ordered_applied_bids.limit(2).pluck(:created_at)
+            Yabeda.auctify.time_between_bids.set({ auction_slug: slug }, (times.size == 1 ? 0 : times.first - times.second))
+          else
+            after_bid_not_appended(bap)
+          end
+
           bap.success?
         end
       end

data/lib/auctify/railtie.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "yabeda/prometheus"
+
+module Auctify
+  class Railtie < Rails::Railtie
+    initializer "my_railtie.configure_rails_initialization" do |app|
+      app.middleware.use ::Yabeda::Prometheus::Exporter
+    end
+  end
+end

data/lib/auctify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Auctify
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/lib/auctify.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if defined?(Rails::Railtie)
+  require "auctify/railtie"
+  require "yabeda_config.rb"
+end
+
 require "auctify/engine"
 require "auctify/configuration"
 

data/lib/yabeda_config.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "yabeda/prometheus"
+
+Yabeda.configure do
+  group :auctify do
+   counter :bids_count, comment: "A counter of applied bids"
+   gauge :diff_in_closing_time_seconds,
+          comment: "Difference between auction.currently_ends_at and actual sale end time by job"
+   gauge :time_between_bids, comment: "Time period between last two bids", tags: [:auction_slug]
+ end
+
+  collect do # when /metrics is displayed
+    # main_app.t_gauge.set({}, rand(10))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auctify
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - foton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yabeda-prometheus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -428,8 +442,10 @@ files:
 - lib/auctify.rb
 - lib/auctify/configuration.rb
 - lib/auctify/engine.rb
+- lib/auctify/railtie.rb
 - lib/auctify/version.rb
 - lib/tasks/auctify_tasks.rake
+- lib/yabeda_config.rb
 homepage: https://github.com/sinfin/auctify
 licenses:
 - MIT