sidekiq-instrumentation 1.2.1 → 1.2.2.ejacobs1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a4684ee4a4994dc8a76c0e7d0905dd498a06a58f619066ceb0ff089d3df379
-  data.tar.gz: 1fee9c0892325630863049961ce5f4e0f1c00a934d6f23e0ccdf34cc5cd16b4d
+  metadata.gz: 332c892cee99ef96c6d9d1cb8022b1492b37907ec3f494c033460061fab39dd2
+  data.tar.gz: 8e6172fec42f502ff1ad80ebfd1a13a06ea040ea73190456dfa172520aa656b5
 SHA512:
-  metadata.gz: 7d68879b7e44765920ec54f006d6aa2bc8222f2de00080dacbace7306f33f32ccc15326b1a6813973109ce5db81b46128471fb5879aeac0011a5a3b2b8c3df21
-  data.tar.gz: 6036c4aac84429b921a2003c61d0076eb5775efbb67bd07fb1c7d0a048e8aa78e63529d38e92aa82aca1a77dd9d5655ec3609f54c0719c8285fd4aef171f872f
+  metadata.gz: 4c40967f6cb33f99e827c43fd39fc5bd1c488cb62eee62f939f8e99d9d63673d2d2df7e39da13ddf8de0a51bffb113065a264d7da5c2bb6406361ae26033eb68
+  data.tar.gz: 6e6ad4257a86594557c290b0d46a9631dfae0229a5052241da779dd580fb583bb0ad6615fe5ecfe33f20307eeccbc57669a7ec517b5c9a38b4fef6638d67cf7e

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 Changelog
 =========
+
+## 1.2.2.ejacobs1 09/08/2020
+  * Add optional after_trace hook to ClientMiddleware
+
 ## 1.2.1 07/09/2020
   * Ensure child spans are nested under the root Sidekiq span in the trace
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq-instrumentation (1.2.1)
+    sidekiq-instrumentation (1.2.2.ejacobs1)
       opentracing (>= 0.3.1)
 
 GEM

data/lib/sidekiq/tracer.rb

@@ -11,9 +11,9 @@ require "sidekiq/tracer/server_middleware"
 module Sidekiq
   module Tracer
     class << self
-      def instrument(tracer: OpenTracing.global_tracer, active_span: nil)
+      def instrument(tracer: OpenTracing.global_tracer, active_span: nil, after_trace: nil)
         instrument_client(tracer: tracer, active_span: active_span)
-        instrument_server(tracer: tracer, active_span: active_span)
+        instrument_server(tracer: tracer, active_span: active_span, after_trace: after_trace)
       end
 
       def instrument_client(tracer: OpenTracing.global_tracer, active_span: nil)
@@ -22,23 +22,23 @@ module Sidekiq
         end
       end
 
-      def instrument_server(tracer: OpenTracing.global_tracer, active_span: nil)
+      def instrument_server(tracer: OpenTracing.global_tracer, active_span: nil, after_trace: nil)
         Sidekiq.configure_server do |config|
           config.client_middleware { |chain| add_client_middleware(chain, tracer, active_span) }
-          config.server_middleware { |chain| add_server_middleware(chain, tracer, active_span) }
+          config.server_middleware { |chain| add_server_middleware(chain, tracer, active_span, after_trace) }
         end
 
         return unless defined?(Sidekiq::Testing)
 
-        Sidekiq::Testing.server_middleware { |chain| add_server_middleware(chain, tracer, active_span) }
+        Sidekiq::Testing.server_middleware { |chain| add_server_middleware(chain, tracer, active_span, after_trace) }
       end
 
       def add_client_middleware(chain, tracer, active_span)
         chain.add Sidekiq::Tracer::ClientMiddleware, tracer: tracer, active_span: active_span
       end
 
-      def add_server_middleware(chain, tracer, active_span)
-        chain.add Sidekiq::Tracer::ServerMiddleware, tracer: tracer, active_span: active_span
+      def add_server_middleware(chain, tracer, active_span, after_trace)
+        chain.add Sidekiq::Tracer::ServerMiddleware, tracer: tracer, active_span: active_span, after_trace: after_trace
       end
     end
   end

data/lib/sidekiq/tracer/server_middleware.rb

@@ -5,11 +5,12 @@ module Sidekiq
     class ServerMiddleware
       include Commons
 
-      attr_reader :tracer, :active_span
+      attr_reader :tracer, :active_span, :after_trace
 
-      def initialize(tracer:, active_span:)
+      def initialize(tracer:, active_span:, after_trace:)
         @tracer = tracer
         @active_span = active_span
+        @after_trace = after_trace
       end
 
       # rubocop:disable Metrics/MethodLength
@@ -27,6 +28,8 @@ module Sidekiq
           rescue StandardError => e
             tag_errors(scope.span, e) if scope.span
             raise
+          ensure
+            after_trace&.call(scope.span) if scope.span
           end
         end
       end

data/lib/sidekiq/tracer/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Tracer
-    VERSION = "1.2.1"
+    VERSION = "1.2.2.ejacobs1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrumentation
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2.ejacobs1
 platform: ruby
 authors:
 - iaintshine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
@@ -204,9 +204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: