lightstep 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5baac354178b4bd23591043b41ad66d8cd21c2d2
-  data.tar.gz: 1ece9648e050abfcc7dc7b8b7639fc1340c1fc07
+SHA256:
+  metadata.gz: 4061236d2e72a5a8af39a92ee36074193a9dfe0bd48032cdecdfcc3d01054557
+  data.tar.gz: ff20651fafa157cfeeecc789c73fb4a0c5dc4abbe910ef048625a39286251f6f
 SHA512:
-  metadata.gz: 1ea01d361841e64157522f2cda2e4de75de0b1c53a4e1a4576a7ddb2d8aee3ec333e6619d6d3ff5d17cad4f5766d091b6ede1ce9efd93ae0683c3ca69fd6bfb3
-  data.tar.gz: 7c193e9ddf4828401cce47e514c01f3a6009c908cceba06b2b2893b90307edb357a0f8cd6f907a7922bbe1a1e9d004e7f00a389dec142b9482cb0fbf2924e047
+  metadata.gz: 0f7b6a24656af8708d935b7afa2e47f5f7ee3fcd768518679450326140b6ead0ef1191718a487f3bed035eec99f8a263edc1d04b1fb18ea9c05b126ad23a0f88
+  data.tar.gz: 23bb222bae518baa0bf4151883b9cc525cc6226d485fff7bce7cc13c12b4d7ea3a41821ba30bec0f7a19438b1a2bed039aabed27a947799613f9cf91e8eaff6b

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
+# Specify your gem's dependencies in lightstep.gemspec
 gemspec

data/Makefile

@@ -14,10 +14,10 @@ benchmark:
 	ruby benchmark/threading/thread_test.rb
 
 bump-version:
-	ruby -e 'require "bump"; Bump::Bump.run("patch")'
-	make build	# rebuild after version increment
+	# ruby -e 'require "bump"; Bump::Bump.run("minor")'
+	# make build	# rebuild after version increment
 	git tag `ruby scripts/version.rb`
-	git push
+	# git push
 	git push --tags
 
 publish: build test benchmark bump-version

data/benchmark/bench.rb

@@ -53,7 +53,7 @@ Benchmark.bm(32) do |x|
     span = tracer.start_span('my_span')
     for i in 0..10_000
       carrier = {}
-      tracer.inject(span.span_context, LightStep::Tracer::FORMAT_TEXT_MAP, carrier)
+      tracer.inject(span.span_context, OpenTracing::FORMAT_TEXT_MAP, carrier)
      end
     span.finish
   end

data/benchmark/threading/thread_test.rb

@@ -16,7 +16,7 @@ watchThread = Thread.new do
     sleep(0.5)
     mutex.lock
     time_per_span = (1e6 * (total_time.to_f / span_count.to_f)).round(2)
-    puts "#{span_count} spans #{percent_done}% done #{total_time.round(2)} seconds (#{time_per_span} us/span)"
+    puts "#{span_count} spans #{percent_done}% done #{total_time.round(2)} seconds (#{time_per_span} µs/span)"
     is_done = done
     mutex.unlock
     Thread.exit if is_done

data/examples/rack/inject_extract.rb

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 require 'lightstep'
+require 'opentracing'
 
 require 'rack'
 require 'rack/server'
@@ -19,7 +20,7 @@ class Router
 
     client = Net::HTTP.new("localhost", "9002")
     req = Net::HTTP::Post.new("/")
-    @tracer.inject(span.span_context, LightStep::Tracer::FORMAT_RACK, req)
+    @tracer.inject(span.span_context, OpenTracing::FORMAT_RACK, req)
     res = client.request(req)
 
     span.log(event: "application_response", response: res.to_s)
@@ -36,7 +37,7 @@ class App
   end
 
   def call(env)
-    wire_ctx = @tracer.extract(LightStep::Tracer::FORMAT_RACK, env)
+    wire_ctx = @tracer.extract(OpenTracing::FORMAT_RACK, env)
     span = @tracer.start_span("app_call", child_of: wire_ctx)
     puts "child  #{span.to_h[:trace_guid]}"
     span.log(event: "application", env: env)

data/lib/lightstep/span.rb

@@ -19,6 +19,10 @@ module LightStep
     # @param operation_name [String] the operation name of this span. If it's
     #        not a String it will be encoded with to_s.
     # @param child_of [SpanContext] the parent SpanContext (per child_of)
+    # @param references [Array<SpanContext>] An array of SpanContexts
+    #   that identify what Spans this Span follows from causally. Presently
+    #   only one reference is supported, and cannot be provided in addition to
+    #   a child_of.
     # @param start_micros [Numeric] start time of the span in microseconds
     # @param tags [Hash] initial key:value tags (per set_tag) for the Span
     # @param max_log_records [Numeric] maximum allowable number of log records
@@ -28,11 +32,11 @@ module LightStep
       tracer:,
       operation_name:,
       child_of: nil,
+      references: [],
       start_micros:,
       tags: nil,
       max_log_records:
     )
-      child_of = child_of.span_context if (Span === child_of)
       @tags = Concurrent::Hash.new
       @tags.update(tags) unless tags.nil?
       @log_records = Concurrent::Array.new
@@ -43,12 +47,16 @@ module LightStep
       self.operation_name = operation_name.to_s
       self.start_micros = start_micros
 
-      trace_id = (SpanContext === child_of ? child_of.trace_id : LightStep.guid)
-      @span_context = SpanContext.new(id: LightStep.guid, trace_id: trace_id)
+      ref = child_of ? child_of : references
+      ref = ref[0] if (Array === ref)
+      ref = ref.span_context if (Span === ref)
 
-      if SpanContext === child_of
-        set_baggage(child_of.baggage)
-        set_tag(:parent_span_guid, child_of.id)
+      if SpanContext === ref
+        @span_context = SpanContext.new(id: LightStep.guid, trace_id: ref.trace_id)
+        set_baggage(ref.baggage)
+        set_tag(:parent_span_guid, ref.id)
+      else
+        @span_context = SpanContext.new(id: LightStep.guid, trace_id: LightStep.guid)
       end
     end
 

data/lib/lightstep/tracer.rb

@@ -1,6 +1,8 @@
 require 'json'
 require 'concurrent'
 
+require 'opentracing'
+
 require 'lightstep/span'
 require 'lightstep/reporter'
 require 'lightstep/transport/http_json'
@@ -9,10 +11,6 @@ require 'lightstep/transport/callback'
 
 module LightStep
   class Tracer
-    FORMAT_TEXT_MAP = 1
-    FORMAT_BINARY = 2
-    FORMAT_RACK = 3
-
     class Error < LightStep::Error; end
     class ConfigurationError < LightStep::Tracer::Error; end
 
@@ -61,14 +59,19 @@ module LightStep
     # @param child_of [SpanContext] SpanContext that acts as a parent to
     #        the newly-started Span. If a Span instance is provided, its
     #        .span_context is automatically substituted.
+    # @param references [Array<SpanContext>] An array of SpanContexts that
+    #         identify any parent SpanContexts of newly-started Span. If Spans
+    #         are provided, their .span_context is automatically substituted.
     # @param start_time [Time] When the Span started, if not now
     # @param tags [Hash] Tags to assign to the Span at start time
     # @return [Span]
-    def start_span(operation_name, child_of: nil, start_time: nil, tags: nil)
+    def start_span(operation_name, child_of: nil, references: [], start_time: nil, tags: nil)
+
       Span.new(
         tracer: self,
         operation_name: operation_name,
         child_of: child_of,
+        references: references,
         start_micros: start_time.nil? ? LightStep.micros(Time.now) : LightStep.micros(start_time),
         tags: tags,
         max_log_records: max_log_records,
@@ -78,16 +81,15 @@ module LightStep
     # Inject a SpanContext into the given carrier
     #
     # @param spancontext [SpanContext]
-    # @param format [LightStep::Tracer::FORMAT_TEXT_MAP, LightStep::Tracer::FORMAT_BINARY]
-    # @param carrier [Hash]
+    # @param format [OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY]
+    # @param carrier [Carrier] A carrier object of the type dictated by the specified `format`
     def inject(span_context, format, carrier)
-      child_of = child_of.span_context if (Span === child_of)
       case format
-      when LightStep::Tracer::FORMAT_TEXT_MAP
+      when OpenTracing::FORMAT_TEXT_MAP
         inject_to_text_map(span_context, carrier)
-      when LightStep::Tracer::FORMAT_BINARY
+      when OpenTracing::FORMAT_BINARY
         warn 'Binary inject format not yet implemented'
-      when LightStep::Tracer::FORMAT_RACK
+      when OpenTracing::FORMAT_RACK
         inject_to_rack(span_context, carrier)
       else
         warn 'Unknown inject format'
@@ -95,17 +97,17 @@ module LightStep
     end
 
     # Extract a SpanContext from a carrier
-    # @param format [LightStep::Tracer::FORMAT_TEXT_MAP, LightStep::Tracer::FORMAT_BINARY]
-    # @param carrier [Hash]
+    # @param format [OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY, OpenTracing::FORMAT_RACK]
+    # @param carrier [Carrier] A carrier object of the type dictated by the specified `format`
     # @return [SpanContext] the extracted SpanContext or nil if none could be found
     def extract(format, carrier)
       case format
-      when LightStep::Tracer::FORMAT_TEXT_MAP
+      when OpenTracing::FORMAT_TEXT_MAP
         extract_from_text_map(carrier)
-      when LightStep::Tracer::FORMAT_BINARY
+      when OpenTracing::FORMAT_BINARY
         warn 'Binary join format not yet implemented'
         nil
-      when LightStep::Tracer::FORMAT_RACK
+      when OpenTracing::FORMAT_RACK
         extract_from_rack(carrier)
       else
         warn 'Unknown join format'
@@ -151,7 +153,10 @@ module LightStep
       raise ConfigurationError, "component_name must be a string" unless String === component_name
       raise ConfigurationError, "component_name cannot be blank"  if component_name.empty?
 
-      transport = Transport::HTTPJSON.new(access_token: access_token) if !access_token.nil?
+      if transport.nil? and !access_token.nil?
+        transport = Transport::HTTPJSON.new(access_token: access_token)
+      end
+
       raise ConfigurationError, "you must provide an access token or a transport" if transport.nil?
       raise ConfigurationError, "#{transport} is not a LightStep transport class" if !(LightStep::Transport::Base === transport)
 

data/lib/lightstep/version.rb

@@ -1,3 +1,3 @@
 module LightStep
-  VERSION = '0.11.2'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/lightstep.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_dependency 'opentracing', '~> 0.2'
+  spec.add_dependency 'opentracing', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 11.3'
   spec.add_development_dependency 'rack', '~> 2.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightstep
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - bcronin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: LightStep OpenTracing Ruby bindings