zipkin-tracer 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e54f012c081598681f2f5da8a961f29cb8656b8a21fa1877358724c2fa20b8
-  data.tar.gz: c22b07513bdca3173bdedbf1948d00f09907f669142f4d186c5f66808bb4d959
+  metadata.gz: 2d468909c2b28497b50dba2901e92f651ec45b555cca6fc1453258140e996f0d
+  data.tar.gz: 79508ca6c29d18906610ddf0950e33951e05f5db185e169af895a3982df3c40d
 SHA512:
-  metadata.gz: f5b58005b5f1fe570f50cb36b66b7f72d6e27a620fee2453b3bc7b74e46202ddebb16b5b6d1e71d3a698f236ffebe7cd1ad60de128103f7a40929f12180eca82
-  data.tar.gz: dc910caca3ce2234aa5e12bc2c8363a98a711f717e84e05943a6246f0c462fd614486617cf9a9211721da92abb3d01bee18e1e6a0c66e7220c340395f56f79fd
+  metadata.gz: e3f979dfa0f2be704ab85940dd4e6d6738fd9c587750b04929304eb72b55b122375a7e1c3e8ac2b8fac238aa8c154d24a8dae86e07bdf36f1d0e974a604cdbf5
+  data.tar.gz: 8bc0b4f4b2ee75570563d0a4aaba3823a8f6b6a8ccb1c99c0063e38726e9cedf749ab9722be3eb3837db0947e8f43b2ee44c47df6a8e6f378815adf7a6ceca58

data/.travis.yml

@@ -25,7 +25,7 @@ deploy:
   on:
     tags: true
     repo: openzipkin/zipkin-ruby
-    condition: "$TRAVIS_RUBY_VERSION == 2.7"
+    condition: $TRAVIS_RUBY_VERSION == 2.7 && $BUNDLE_GEMFILE == $TRAVIS_BUILD_DIR/gemfiles/faraday_1.x.gemfile
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.45.0
+* Add a `trace_context` option to the TraceWrapper utility class to retrieve trace data.
+
 # 0.44.0
 * Allow Faraday 1.x.
 

data/README.md

@@ -242,6 +242,18 @@ TraceWrapper.wrap_in_custom_span(config, "custom span") do |span|
 end
 ```
 
+The `trace_context:` keyword argument can be used to retrieve trace data:
+```ruby
+trace_context = {
+  trace_id: '234555b04cf7e099',
+  span_id: '234555b04cf7e099',
+  sampled: 'true'
+}
+
+TraceWrapper.wrap_in_custom_span(config, "custom span", trace_context: trace_context) do |span|
+  :
+end
+```
 
 ## Development
 

data/lib/zipkin-tracer/trace.rb

@@ -115,21 +115,21 @@ module Trace
     end
 
     def next_id
-      TraceId.new(@trace_id, @span_id, ZipkinTracer::TraceGenerator.new.generate_id, @sampled, @flags)
+      TraceId.new(trace_id, span_id, ZipkinTracer::TraceGenerator.new.generate_id, sampled, flags)
     end
 
     # the debug flag is used to ensure the trace passes ALL samplers
     def debug?
-      @flags & Flags::DEBUG == Flags::DEBUG
+      flags & Flags::DEBUG == Flags::DEBUG
     end
 
     def sampled?
-      debug? || ['1', 'true'].include?(@sampled)
+      debug? || %w[1 true].include?(sampled)
     end
 
     def to_s
-      "TraceId(trace_id = #{@trace_id.to_s}, parent_id = #{@parent_id.to_s}, span_id = #{@span_id.to_s}," \
-      " sampled = #{@sampled.to_s}, flags = #{@flags.to_s}, shared = #{@shared.to_s})"
+      "TraceId(trace_id = #{trace_id}, parent_id = #{parent_id}, span_id = #{span_id}," \
+      " sampled = #{sampled}, flags = #{flags}, shared = #{shared})"
     end
   end
 

data/lib/zipkin-tracer/trace_wrapper.rb

@@ -1,10 +1,13 @@
 module ZipkinTracer
   class TraceWrapper
-    def self.wrap_in_custom_span(config, span_name, span_kind: Trace::Span::Kind::SERVER, app: nil)
+    REQUIRED_KEYS = %i[trace_id span_id].freeze
+    KEYS = %i[trace_id parent_id span_id sampled].freeze
+
+    def self.wrap_in_custom_span(config, span_name, span_kind: Trace::Span::Kind::SERVER, app: nil, trace_context: nil)
       raise ArgumentError, "you must provide a block" unless block_given?
 
       initialize_tracer(app, config)
-      trace_id = ZipkinTracer::TraceGenerator.new.next_trace_id
+      trace_id = next_trace_id(trace_context)
 
       ZipkinTracer::TraceContainer.with_trace_id(trace_id) do
         if trace_id.sampled?
@@ -24,5 +27,13 @@ module ZipkinTracer
       zipkin_config = ZipkinTracer::Config.new(app, config).freeze
       ZipkinTracer::TracerFactory.new.tracer(zipkin_config)
     end
+
+    def self.next_trace_id(trace_context)
+      if trace_context.is_a?(Hash) && REQUIRED_KEYS.all? { |key| trace_context.key?(key) }
+        Trace::TraceId.new(*trace_context.values_at(*KEYS), Trace::Flags::EMPTY).next_id
+      else
+        ZipkinTracer::TraceGenerator.new.next_trace_id
+      end
+    end
   end
 end

data/lib/zipkin-tracer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZipkinTracer
-  VERSION = '0.44.0'
+  VERSION = '0.45.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday