gouda 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0be474cea3bc87b9c0a41c9c654a31e4dc865e46876249a1db615bf56e494a40
-  data.tar.gz: '048574e736404c6c76f437fdfded93d7e810a23c83bb4f28ede8dffe9761a215'
+  metadata.gz: ec67da4c5d0dc236c02b65c770e87fe4a0a967eef8df50f0cb4ae452077f3bdb
+  data.tar.gz: 6089a03c99a944fcfedbe623810c72b513c52e2fe9afd698904ccab1f7cc3aa3
 SHA512:
-  metadata.gz: 00e687d2fc384484cf2c07bf6c661e8d5ff1287a96f4e4f0abd98df2933538d7d81946ee51fe8e7abd6f2e5b285b6762aba231d359926ba5ee09d07a8b7e526c
-  data.tar.gz: cbd09ad83be4b9e6b9b35e20b2c80b7c8a5b8de1e20f8adfa6d0701d1aa31be7e5ea8edd2e64fab8f67e69cdc9757d1bcf79908fac9a81e9eccf9497f0a1c073
+  metadata.gz: bb445a3c45a28d47f29124775f8f2f8c2cc9be8c6fb1069c8c3f1d00eca8269ca53d897c2cb069962bec90ee6b8b9916af133558b0692a3a64d46e3666fbb6f4
+  data.tar.gz: 3e82a95cf5f6107a8f9f7874a93d4bbbc58ac9a6badb2f684edca870cf6fbd3512be37299b192dcbb7a68a4be9fb638ea89af88625ae70459f1334a03b541407

data/CHANGELOG.md

@@ -27,3 +27,12 @@
 
 - Update documentation
 - Don't pass on scheduler keys to retries
+
+## [0.1.6] - 2023-06-18
+
+- Fix: don't upsert workloads twice when starting Gouda.
+- Add back in Appsignal calls
+
+## [0.1.7] - 2023-06-21
+
+- Separate all instrumentation to use ActiveSupport::Notification

data/lib/gouda/adapter.rb

@@ -83,7 +83,7 @@ class Gouda::Adapter
     # Use batches of 500 so that we do not exceed the maximum statement size or do not create a transaction for the
     # insert which times out
     inserted_ids_and_positions = bulk_insert_attributes.each_slice(500).flat_map do |chunk|
-      ActiveSupport::Notifications.instrument("insert_all.gouda", {n_rows: chunk.size}) do |payload|
+      Gouda.instrument(:insert_all, n_rows: chunk.size) do |payload|
         rows = Gouda::Workload.insert_all(chunk, returning: [:id, :position_in_bulk])
         payload[:inserted_jobs] = rows.length
         payload[:rejected_jobs] = chunk.size - rows.length

data/lib/gouda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gouda
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/gouda/worker.rb

@@ -163,7 +163,8 @@ module Gouda
         # Find jobs which just hung and clean them up (mark them as "finished" and enqueue replacement workloads if possible)
         Gouda::Workload.reap_zombie_workloads
       rescue => e
-        # Appsignal.add_exception(e)
+        Gouda.instrument(:exception, exception: e)
+
         warn "Uncaught exception during housekeeping (#{e.class} - #{e}"
       end
 

data/lib/gouda/workload.rb

@@ -63,7 +63,7 @@ class Gouda::Workload < ActiveRecord::Base
           workload.with_lock("FOR UPDATE SKIP LOCKED") do
             Gouda.logger.info { "Reviving (re-enqueueing) Gouda workload #{workload.id} after interruption" }
 
-            # Appsignal.increment_counter("gouda_workloads_revived", 1, job_class: workload.active_job_class_name)
+            Gouda.instrument(:workloads_revived_counter, size: 1, job_class: workload.active_job_class_name)
 
             interrupted_at = workload.last_execution_heartbeat_at
             workload.update!(state: "finished", interrupted_at: interrupted_at, last_execution_heartbeat_at: Time.now.utc, execution_finished_at: Time.now.utc)
@@ -110,7 +110,7 @@ class Gouda::Workload < ActiveRecord::Base
       .lock("FOR UPDATE SKIP LOCKED")
       .limit(1)
 
-    _first_available_workload = ActiveSupport::Notifications.instrument("checkout_and_lock_one.gouda", {queue_constraint: queue_constraint.to_sql}) do |payload|
+    _first_available_workload = Gouda.instrument(:checkout_and_lock_one, queue_constraint: queue_constraint.to_sql) do |payload|
       payload[:condition_sql] = jobs.to_sql
       payload[:retried_checkouts_due_to_concurrent_exec] = 0
       uncached do # Necessary because we SELECT with a clock_timestamp() which otherwise gets cached by ActiveRecord query cache

data/lib/gouda.rb

@@ -46,8 +46,6 @@ module Gouda
   end
 
   def self.start
-    Gouda::Scheduler.upsert_workloads_from_entries_list!
-
     queue_constraint = if ENV["GOUDA_QUEUES"]
       Gouda.parse_queue_constraint(ENV["GOUDA_QUEUES"])
     else
@@ -72,6 +70,11 @@ module Gouda
     Gouda.config.logger
   end
 
+  def self.instrument(channel, **options, &block)
+    ActiveSupport::Notifications.instrument("#{channel}.gouda", **options, &block)
+  end
+
+
   def self.create_tables(active_record_schema)
     active_record_schema.create_enum :gouda_workload_state, %w[enqueued executing finished]
     active_record_schema.create_table :gouda_workloads, id: :uuid do |t|

data/test/gouda/gouda_test.rb

@@ -645,6 +645,15 @@ class GoudaTest < ActiveSupport::TestCase
     assert_equal ["did-run"], Thread.current[:gouda_test_side_effects]
   end
 
+  test "instrumentation" do
+    payload = subscribed_notification_for("workloads_revived_counter.gouda") do
+      Gouda.instrument(:workloads_revived_counter, size: 1, job_class: "test_class")
+    end
+
+    assert_equal "test_class", payload[:job_class]
+    assert_equal 1, payload[:size]
+  end
+
   def sample_description(sample)
     values = sample.map(&:to_f).sort
 

data/test/gouda/test_helper.rb

@@ -67,4 +67,17 @@ class ActiveSupport::TestCase
       end
     end
   end
+
+  def subscribed_notification_for(notification)
+    payload = nil
+    subscription = ActiveSupport::Notifications.subscribe notification do |name, start, finish, id, _payload|
+      payload = _payload
+    end
+
+    yield
+
+    ActiveSupport::Notifications.unsubscribe(subscription)
+
+    return payload
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gouda
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Sebastian van Hesteren
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.13
 signing_key:
 specification_version: 4
 summary: Job Scheduler