activejob-traceable 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1e8505d754e1c97ab23442354f976b42df0a191d12a74c1acf1aad90e35535
-  data.tar.gz: c83de6f7b2ce7e79b6495bc84f572d3dd7a64eda882991f165cd7010ee878218
+  metadata.gz: 3cb378813a2f5765ca4f61d2ddd47f20eb51d12a459999e9097ad48dee946b3f
+  data.tar.gz: '0290962714ba0b3da20c57dff9d494b91e11158b7da115f5a258cac7d89e2949'
 SHA512:
-  metadata.gz: bb48de5a1f48ff16d8af9bdf648838eb201c6386fe3104545280ac40e34b499ebb75e3cb5e1853cf1c237390573f9e34beee26ae85fd3d229ac6d53bf645fae6
-  data.tar.gz: b2fbb9d54f9c1a79694893d4701adad57269f3b713ec3ccd37b8bbc314829fdd9189d7c698d8e3877c8b579b17d430dc8d115cdffe33645b3b7de7260ad28d12
+  metadata.gz: d436c1d712b26ca84ad773d2d1c5b9514a368c59a35a8dfa521821544d73470792602226bc9c8c9f2e5ec2cbfff7da2bc0d6dbdc87d7e617525890755cfe5557
+  data.tar.gz: acba39bed024643d06b5d15e87f09d6b991a48b8c3379068e570ac5b3b0f72b044ce4b724bb105e1fa98821a31e2d4f869209c8897f8ccc636190c273fda6866

data/lib/activejob/traceable.rb

@@ -14,15 +14,26 @@ module ActiveJob
     module_function
 
     def tracing_info_getter=(lambda)
-      raise 'Tracing info getter should be callable' unless lambda.respond_to?(:call)
+      if lambda
+        raise 'Tracing info getter should be callable' unless lambda.respond_to?(:call)
+        raise 'Tracing info getter should contain a hash' unless lambda.call.is_a?(Hash)
 
-      @tracing_info_getter = lambda
+        @tracing_info_getter = lambda
+      else
+        # Resets the value
+        @tracing_info_getter = nil
+      end
     end
 
     def tracing_info_setter=(lambda)
-      raise 'Tracing info setter should be callable' unless lambda.respond_to?(:call)
+      if lambda
+        raise 'Tracing info setter should be callable' unless lambda.respond_to?(:call)
 
-      @tracing_info_setter = lambda
+        @tracing_info_setter = lambda
+      else
+        # Resets the value
+        @tracing_info_setter = nil
+      end
     end
   end
 end

data/lib/activejob/traceable/logging_patch.rb

@@ -9,9 +9,8 @@ module ActiveJob
         private
 
         def tag_logger(*tags)
-          if ActiveJob::Traceable.tracing_info_getter.respond_to?(:call)
-            tags << ActiveJob::Traceable.tracing_info_getter.call
-          end
+          tags << ActiveJob::Traceable.tracing_info_getter.call.values.compact
+          tags.flatten!
 
           if logger.respond_to?(:tagged)
             tags.unshift 'ActiveJob' unless logger_tagged_by_active_job?

data/lib/activejob/traceable/traceable.rb

@@ -10,7 +10,7 @@ module ActiveJob
       def initialize(*arguments)
         super(*arguments)
 
-        @tracing_info = Traceable.tracing_info_getter.call if Traceable.tracing_info_getter.respond_to?(:call)
+        @tracing_info = Traceable.tracing_info_getter.call
       end
 
       def serialize
@@ -20,14 +20,22 @@ module ActiveJob
       def deserialize(job_data)
         super(job_data)
 
-        self.tracing_info = job_data['tracing_info']
+        if job_data['tracing_info'].is_a?(Hash)
+          self.tracing_info = job_data['tracing_info']
+        end
 
-        Traceable.tracing_info_setter.call(tracing_info) if Traceable.tracing_info_setter.respond_to?(:call)
+        Traceable.tracing_info_setter.call(tracing_info)
       end
     end
 
     class << self
-      attr_accessor :tracing_info_getter, :tracing_info_setter
+      def tracing_info_getter
+        @tracing_info_getter || -> { {} }
+      end
+
+      def tracing_info_setter
+        @tracing_info_setter || -> {}
+      end
     end
   end
 end

data/lib/activejob/traceable/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Traceable
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-traceable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Qonto team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob