traceable 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc242330593a2f4843ca98a6565faa9ab90af60f
-  data.tar.gz: a1a83721a83fdeedfee1ca0fc79894e6f10ecca6
+  metadata.gz: 2d9013920b6dba8371010fa2adc9907f2534f899
+  data.tar.gz: 0d7c6191c0a9a3e65487730386638d05ce6fcaee
 SHA512:
-  metadata.gz: 7033d3e946a773d26a3925bc42b85742916d6cf9d5513dab28891e6e789c212eae87b06bc3225db4f4d7889c8e69f4a126b4e9ac4b11ce30ed710daed0699484
-  data.tar.gz: caf12dda736fad2e7b5a112a4c70d49bf1d0615812ad617925fca158e0af8b100f2ea12e1537a5b9f6c80d7b38d47418374dba0929411364a29c952e5556ee4f
+  metadata.gz: 7d65e2b1746c66f4ecf41781b6fd1b0ccc4cd65345193691e83ca94c88daf3070e31b1a5a3d8e05858e849fd750118e2c5a1e510c21903b0f652a1c02ff2dbb6
+  data.tar.gz: 7514b665636b9cfedc34d3091168a154218289b17ac86cd63e15cbc025c5bb015e7e3e18fbeb5d24dc99e559ba230b81699f1df6b3cae8fc68fd5734b0c29533

data/lib/traceable/tracer.rb

@@ -5,30 +5,24 @@ module Traceable
   # generate log entries. Each log entry consists of a key/value
   # map ("tags"). Tags will be inherited from a parent instance,
   # if provided.
+
+  # rubocop:disable Metrics/ClassLength
   class Tracer
-    attr_reader :logger
-    attr_reader :id
+    attr_accessor :logger
     attr_reader :parent
     attr_reader :tags
 
-    def initialize(parent_tracer, tags: nil)
-      @logger = Traceable.config.logger
-
-      @parent = case parent_tracer
-                when nil
-                  nil
-                when Tracer
-                  parent_tracer
-                when Traceable
-                  parent_tracer.local_tracer
-                else
-                  raise(ArgumentError, "#{parent_tracer} (#{parent_tracer.class})")
-                end
-
+    def initialize(parent_tracer, tags: nil, logger: nil)
+      @parent = which_parent(parent_tracer)
+      @logger = logger || (@parent ? @parent.logger : Tracer.default_logger)
       @tags = @parent ? @parent.tags.dup : Tracer.default_tags
       @tags.merge!(tags) if tags
     end
 
+    def self.default_logger
+      Traceable.config.logger
+    end
+
     def self.default_tags
       tags = Traceable.config.default_tags.merge(
         trace: SecureRandom.uuid
@@ -126,6 +120,21 @@ module Traceable
       Thread.current[:tracer_stack] ||= []
     end
 
+    private
+
+    def which_parent(parent_tracer)
+      case parent_tracer
+      when nil
+        nil
+      when Tracer
+        parent_tracer
+      when Traceable
+        parent_tracer.local_tracer
+      else
+        raise(ArgumentError, "#{parent_tracer} (#{parent_tracer.class})")
+      end
+    end
+
     def push
       Tracer.tracer_stack.push self
     end
@@ -134,4 +143,5 @@ module Traceable
       Tracer.tracer_stack.pop
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/traceable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Traceable
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/traceable_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Traceable do
   let(:logs) { fake_logger.logs }
 
   before do
-    allow_any_instance_of(Traceable::Tracer).to receive(:logger) { fake_logger }
+    allow_any_instance_of(Traceable::Config).to receive(:logger) { fake_logger }
   end
 
   let(:subject_class) do
@@ -322,6 +322,19 @@ RSpec.describe Traceable do
           t.info(message: 'just a test')
         end
       end
+
+      context 'with a custom logger' do
+        let(:logger2) { FakeLogger.new }
+        let(:logger3) { FakeLogger.new }
+
+        it 'sends logs to it' do
+          t = Traceable::Tracer.new(nil, logger: logger2)
+          expect { t.info(message: 'hello') }.to change { logger2.logs.size }.by 1
+
+          t.logger = logger3
+          expect { t.info(message: 'hi again') }.to change { logger3.logs.size }.by 1
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traceable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Slade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler