lightstep 0.10.8 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5c525e6e010a41c04b1d6eb448384b1b514d47
-  data.tar.gz: 9bd52f884ea30db79b7b9cd5e21f7d6083be5fb3
+  metadata.gz: c95a5745b43ca1428f8ff9f7ea8c7b70c42c7401
+  data.tar.gz: 6b4b663ae87b92acd2221f13528aa60e68ee81f2
 SHA512:
-  metadata.gz: bf297bdc0b04728703ef4bccd803d94676ac1678081307070f74ea1418318b7765b616e9359256dd5ab647fb80b18ca9487c71442c47797c54b2bcc207621e44
-  data.tar.gz: 50d4d038884a70d12adb667e32f461a25653d260f3bfedefd7a7230a0fc8b776567f6f4d5f843a15eade14c27b769f1ebc21b6cd5e7801f427c4426737b32b0a
+  metadata.gz: a57a5ebb53299e9d1576d53d9674e5bb2bf9a958185ea3175467a5d44ac1f43d0edf873e65847ac917b8702bc397ebd1284f5dc9bacd056e4688f50d85ab4a33
+  data.tar.gz: 34d6ff31de150cb543449ec7b4440e4c989742a170fe3d195168df4ab1b0eb2dd69dc4b2e53ff2fbc9ff3ff9e0ccd791306252fa96cbd2306b2e219f3a79c6b5

data/examples/fork_children/main.rb

@@ -13,38 +13,40 @@ puts 'Starting...'
 (1..20).each do |k|
   puts "Explicit reset iteration #{k}..."
 
-  pid = Process.fork do
-    10.times do
-      span = LightStep.start_span("my_forked_span-#{Process.pid}")
-      sleep(0.0025 * rand(k))
-      span.finish
-    end
-    LightStep.flush
-  end
-
-  10.times do
+  # pid = Process.fork do
+  #   10.times do
+  #     span = LightStep.start_span("my_forked_span-#{Process.pid}")
+  #     sleep(0.0025 * rand(k))
+  #     span.finish
+  #   end
+  #   LightStep.flush
+  # end
+
+  3.times do
     span = LightStep.start_span("my_process_span-#{Process.pid}")
     sleep(0.0025 * rand(k))
+    span.set_tag(:empty, "")
+    span.set_tag(:full, "full")
     span.finish
   end
 
-  # Make sure redundant enable calls don't cause problems
-  # NOTE: disabling discards the buffer by default, so all spans
-  # get cleared here except the final toggle span
-  10.times do
-    LightStep.disable
-    LightStep.enable
-    LightStep.disable
-    LightStep.disable
-    LightStep.enable
-    LightStep.enable
-    span = LightStep.start_span("my_toggle_span-#{Process.pid}")
-    sleep(0.0025 * rand(k))
-    span.finish
-  end
-
-  puts "Parent, pid #{Process.pid}, waiting on child pid #{pid}"
-  Process.wait(pid)
+  # # Make sure redundant enable calls don't cause problems
+  # # NOTE: disabling discards the buffer by default, so all spans
+  # # get cleared here except the final toggle span
+  # 10.times do
+  #   LightStep.disable
+  #   LightStep.enable
+  #   LightStep.disable
+  #   LightStep.disable
+  #   LightStep.enable
+  #   LightStep.enable
+  #   span = LightStep.start_span("my_toggle_span-#{Process.pid}")
+  #   sleep(0.0025 * rand(k))
+  #   span.finish
+  # end
+
+  # puts "Parent, pid #{Process.pid}, waiting on child pid #{pid}"
+  # Process.wait(pid)
 end
 
 puts 'Done!'

data/lib/lightstep/tracer.rb

@@ -183,15 +183,19 @@ module LightStep
     CARRIER_TRACER_STATE_PREFIX = 'ot-tracer-'.freeze
     CARRIER_BAGGAGE_PREFIX = 'ot-baggage-'.freeze
 
+    CARRIER_SPAN_ID = (CARRIER_TRACER_STATE_PREFIX + 'spanid').freeze
+    CARRIER_TRACE_ID = (CARRIER_TRACER_STATE_PREFIX + 'traceid').freeze
+    CARRIER_SAMPLED = (CARRIER_TRACER_STATE_PREFIX + 'sampled').freeze
+
     DEFAULT_MAX_LOG_RECORDS = 1000
     MIN_MAX_LOG_RECORDS = 1
     DEFAULT_MAX_SPAN_RECORDS = 1000
     MIN_MAX_SPAN_RECORDS = 1
 
     def inject_to_text_map(span, carrier)
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'spanid'] = span.span_context.id
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'traceid'] = span.span_context.trace_id unless span.span_context.trace_id.nil?
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'sampled'] = 'true'
+      carrier[CARRIER_SPAN_ID] = span.span_context.id
+      carrier[CARRIER_TRACE_ID] = span.span_context.trace_id unless span.span_context.trace_id.nil?
+      carrier[CARRIER_SAMPLED] = 'true'
 
       span.span_context.baggage.each do |key, value|
         carrier[CARRIER_BAGGAGE_PREFIX + key] = value
@@ -199,12 +203,18 @@ module LightStep
     end
 
     def extract_from_text_map(operation_name, carrier)
+      # If the carrier does not have both the span_id and trace_id key
+      # skip the processing and just return a normal span
+      if !carrier.has_key?(CARRIER_SPAN_ID) || !carrier.has_key?(CARRIER_TRACE_ID)
+        return start_span(operation_name)
+      end
+
       span = Span.new(
         tracer: self,
         operation_name: operation_name,
         start_micros: LightStep.micros(Time.now),
-        child_of_id: carrier[CARRIER_TRACER_STATE_PREFIX + 'spanid'],
-        trace_id: carrier[CARRIER_TRACER_STATE_PREFIX + 'traceid'],
+        child_of_id: carrier[CARRIER_SPAN_ID],
+        trace_id: carrier[CARRIER_TRACE_ID],
         max_log_records: max_log_records
       )
 
@@ -222,9 +232,9 @@ module LightStep
     end
 
     def inject_to_rack(span, carrier)
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'spanid'] = span.span_context.id
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'traceid'] = span.span_context.trace_id unless span.span_context.trace_id.nil?
-      carrier[CARRIER_TRACER_STATE_PREFIX + 'sampled'] = 'true'
+      carrier[CARRIER_SPAN_ID] = span.span_context.id
+      carrier[CARRIER_TRACE_ID] = span.span_context.trace_id unless span.span_context.trace_id.nil?
+      carrier[CARRIER_SAMPLED] = 'true'
 
       span.span_context.baggage.each do |key, value|
         if key =~ /[^A-Za-z0-9\-_]/

data/lib/lightstep/version.rb

@@ -1,3 +1,3 @@
 module LightStep
-  VERSION = '0.10.8'.freeze
+  VERSION = '0.10.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightstep
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors:
 - bcronin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby