gouda 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec67da4c5d0dc236c02b65c770e87fe4a0a967eef8df50f0cb4ae452077f3bdb
-  data.tar.gz: 6089a03c99a944fcfedbe623810c72b513c52e2fe9afd698904ccab1f7cc3aa3
+  metadata.gz: 760773cc030761badbc847c89278a501588ba47ff6106c8d4a3a71ae30aebaac
+  data.tar.gz: 5039b969fc5f258a898ab66c1f617d4bfdaa33bc29d69f285fd875e1e60617fe
 SHA512:
-  metadata.gz: bb445a3c45a28d47f29124775f8f2f8c2cc9be8c6fb1069c8c3f1d00eca8269ca53d897c2cb069962bec90ee6b8b9916af133558b0692a3a64d46e3666fbb6f4
-  data.tar.gz: 3e82a95cf5f6107a8f9f7874a93d4bbbc58ac9a6badb2f684edca870cf6fbd3512be37299b192dcbb7a68a4be9fb638ea89af88625ae70459f1334a03b541407
+  metadata.gz: c29cd1f3ea3ccba5b7995c3d32aed5c9a27d10b7609bee622edd7766ba2acee17a875b1a48f35e24d9bec42e7353f38451c35b79ae970994128ca2931a2e7ff1
+  data.tar.gz: 2c70d0d7a0a989c3d6e52ab87df3287831561a50e0ef766d4d18cf21939f06e47f19de48dd480ed2acffc340f727ad046a67e7cc6d6e37dfc3963f181f8742d8

data/CHANGELOG.md

@@ -36,3 +36,7 @@
 ## [0.1.7] - 2023-06-21
 
 - Separate all instrumentation to use ActiveSupport::Notification
+
+## [0.1.8] - 2023-06-21
+
+- Move some missed instrumentations to Gouda.instrument

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|
-      Gouda.instrument(:insert_all, 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.7"
+  VERSION = "0.1.8"
 end

data/lib/gouda/worker.rb

@@ -163,7 +163,7 @@ 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
-        Gouda.instrument(:exception, 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" }
 
-            Gouda.instrument(:workloads_revived_counter, size: 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 = Gouda.instrument(:checkout_and_lock_one, queue_constraint: queue_constraint.to_sql) do |payload|
+    _first_available_workload = ActiveSupport::Notifications.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
@@ -147,7 +147,7 @@ class Gouda::Workload < ActiveRecord::Base
   end
 
   def perform_and_update_state!
-    ActiveSupport::Notifications.instrument("perform_job.gouda", {workload: self}) do |instrument_payload|
+    Gouda.instrument(:perform_job, {workload: self}) do |instrument_payload|
       extras = {}
       if Gouda::JobFuse.exists?(active_job_class_name: active_job_class_name)
         extras[:error] = {class_name: "WorkloadSkippedError", message: "Skipped because of a fuse at #{Time.now.utc}"}

data/lib/gouda.rb

@@ -70,8 +70,8 @@ module Gouda
     Gouda.config.logger
   end
 
-  def self.instrument(channel, **options, &block)
-    ActiveSupport::Notifications.instrument("#{channel}.gouda", **options, &block)
+  def self.instrument(channel, options, &block)
+    ActiveSupport::Notifications.instrument("#{channel}.gouda", options, &block)
   end
 
 

data/test/gouda/gouda_test.rb

@@ -647,7 +647,7 @@ class GoudaTest < ActiveSupport::TestCase
 
   test "instrumentation" do
     payload = subscribed_notification_for("workloads_revived_counter.gouda") do
-      Gouda.instrument(:workloads_revived_counter, size: 1, job_class: "test_class")
+      Gouda.instrument(:workloads_revived_counter, {size: 1, job_class: "test_class"})
     end
 
     assert_equal "test_class", payload[:job_class]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gouda
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Sebastian van Hesteren