joblin 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c16a1c4a23f6ad9d6f254c0d0ee5aea54fa3e4501222c2e93ccf2bdf8f94b6
-  data.tar.gz: 22785e30a3229741a3daa125c89f93ba17ab285f614d1e9546eeb491a5296ac3
+  metadata.gz: 02c41b7e3748391c7d5c36103ead3ffb33e7909177a33c60152d09aca5dda958
+  data.tar.gz: bb14374eea4fb7a4b23d66a6753af68a962af0708f9f061ea4042edc010bef51
 SHA512:
-  metadata.gz: aa29ff4cb1af77eb546f1d5b0963c4b7b22145d067b991a82912bd8d071cbd8829e64b748d75c031d8c67d849ea7c36047a85b5fcd3d1e5454239b0593926f2d
-  data.tar.gz: c08af787c49c3ecfba70c675534c26174de20e97c742952652696428aae5290b79fcbb6b63391504d02acc2ad413909e7d9aa721f05242cf571eb0f52cf93162
+  metadata.gz: 132d951a8a4c8be1fa526566f65c651883c45e621acb38034fdb581034ade56f9292b80c710196be0b6ca87cd535f07c0e065d7f17398c2772c9a380bd51ca36
+  data.tar.gz: 74fad3df093c9b1bcc3c547f821d727d6873827e77fa01c5578994e9b8cd390fbdb2759bc48476682806900577cf1503606cda83094471730fdcdfef0e1e01a8

data/lib/joblin/batching/batch.rb

@@ -257,6 +257,15 @@ module Joblin::Batching
         current&.context || {}
       end
 
+      def apply_apm_tags!
+        if defined?(Sentry)
+          scope = Sentry.get_current_scope
+          scope.set_tags({
+            "joblin.batch_id" => current.bid,
+          })
+        end
+      end
+
       # Perform a success/failure/complete/etc transaction against Redis, checking
       #   if any callbacks should be triggered
       def with_callback_check(bid, except: [], only: Callback::VALID_CALLBACKS, &blk)

data/lib/joblin/batching/callback.rb

@@ -3,6 +3,8 @@ module Joblin::Batching
     module Callback
       mattr_accessor :worker_class
 
+      CLEANUP_STAGNATED_BATCHES = false
+
       VALID_CALLBACKS = %i[success complete death stagnated].freeze
 
       module CallbackWorkerCommon
@@ -56,18 +58,20 @@ module Joblin::Batching
             r.srem("BID-#{bid}-pending_callbacks", "#{event}-finalize")
           end
 
-          if event == :success
+          # This is a callback for a callback. In this case we need to check if we should cleanup the original bid.
+          if event == :success || (CLEANUP_STAGNATED_BATCHES && event == :stagnated)
             if opts['origin'].present?
-              # This is a callback for a callback. In this case we need to check if we should cleanup the original bid.
               origin_bid = opts['origin']['for_bid']
-              _, pending, success_ran = Batch.redis do |r|
+              _, pending, success_ran, stagnated_ran = Batch.redis do |r|
                 r.multi do |r|
                   r.srem("BID-#{origin_bid}-pending_callbacks", opts['origin']['event'])
                   r.scard("BID-#{origin_bid}-pending_callbacks")
                   r.hget("BID-#{origin_bid}", "success")
+                  r.hget("BID-#{origin_bid}", "stagnated")
                 end
               end
-              Batch.cleanup_redis(origin_bid) if pending == 0 && success_ran == 'true'
+
+              Batch.cleanup_redis(origin_bid) if pending == 0 && (success_ran == 'true' || (stagnated_ran == 'true' && CLEANUP_STAGNATED_BATCHES))
             end
 
             if (Batch.redis {|r| r.scard("BID-#{bid}-pending_callbacks") }) == 0

data/lib/joblin/batching/compat/active_job.rb

@@ -25,6 +25,10 @@ module Joblin::Batching
             end
           end
 
+          before_perform do
+            Batch.apply_apm_tags!
+          end
+
           around_enqueue do |job, block|
             if (batch = Thread.current[CURRENT_BATCH_THREAD_KEY])
               @bid = batch.bid

data/lib/joblin/batching/compat/sidekiq.rb

@@ -64,6 +64,7 @@ module Joblin::Batching
             prev_batch = Thread.current[CURRENT_BATCH_THREAD_KEY]
             begin
               Thread.current[CURRENT_BATCH_THREAD_KEY] = Batch.new(bid)
+              Batch.apply_apm_tags!
               yield
               Thread.current[CURRENT_BATCH_THREAD_KEY].save_context_changes
               Batch.process_successful_job(bid, msg['jid'])
@@ -74,6 +75,7 @@ module Joblin::Batching
               Thread.current[CURRENT_BATCH_THREAD_KEY] = prev_batch
             end
           else
+            Batch.apply_apm_tags!
             yield
           end
         end

data/lib/joblin/batching/context_hash.rb

@@ -49,6 +49,12 @@ module Joblin::Batching
       local[key] = value
     end
 
+    def delete(key)
+      @flattened = nil
+      @dirty = true
+      local.delete(key)
+    end
+
     def [](key)
       bid = @bid_stack[-1]
       while bid.present?

data/lib/joblin/batching/jobs/managed_batch_job.rb

@@ -2,7 +2,7 @@ require_relative './base_job'
 
 module Joblin::Batching
   class ManagedBatchJob < BaseJob
-    def self.make_batch(sub_jobs, ordered: true, concurrency: nil, context: nil, preflight_check: nil, desc_prefix: nil, &blk)
+    def self.make_batch(sub_jobs, ordered: true, concurrency: nil, context: nil, preflight_check: nil, description: nil, desc_prefix: nil, &blk)
       desc_prefix ||= ''
 
       if concurrency == 0 || concurrency == nil || concurrency == true
@@ -46,6 +46,7 @@ module Joblin::Batching
       end
 
       root_batch.context = context
+      root_batch.description = description if description.present?
 
       blk.call(ManagedBatchProxy.new(root_batch)) if blk.present?
 

data/lib/joblin/version.rb

@@ -1,3 +1,3 @@
 module Joblin
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.8".freeze
 end