lightstep 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e17230ecc78ae73de113ba2db6b086fc007171d
-  data.tar.gz: 01f13faeac326e6031884098fa445f16a19650d5
+  metadata.gz: d77e4a3fbc58434184011abfd31e4c323af79615
+  data.tar.gz: 4cd3e0df3b6f019633e6c2f581a42122cdba81cb
 SHA512:
-  metadata.gz: bf53ed6852d161ad21d6b29d5f4ac28f22a83b7419a3dda1f461008e1af89604b6314ad83f66f37c353c6903eecbf704f732acae57f7ba59faf6662b28e160f6
-  data.tar.gz: f239a8dc089f5b2a944ebf9134da3e17a91feee8c1b27e683e5907938883f178820d2c3a85e14c01e41cf63bff680ed082724e78f0d1d7d6ec344d5fe4cf125b
+  metadata.gz: da86124b4d723ee69d538cae3139c4ddf3d3dbe08918122d52638e75000eb98e56b125383c555db2033d64cb9dd2daa39f2ec80b45dc43f00703294488cee1b7
+  data.tar.gz: 2bc31803d7967cf329764aace93653f851a53b88fd4801a3852f71dafdc5a114d71b3d1a1d28f250aa67aee24a96dc277a3e05e5895737e264afe84296e38423

data/benchmark/threading/thread_test.rb

@@ -51,3 +51,4 @@ mutex.unlock
 watchThread.join
 
 puts 'Done!'
+LightStep.flush

data/example.rb

@@ -29,6 +29,6 @@ thread2 = Thread.new do
 end
 [thread1, thread2].each(&:join)
 span.finish
-
+LightStep.flush
 puts 'Done!'
 puts "https://app.lightstep.com/#{access_token}/trace?span_guid=#{span.guid}&at_micros=#{span.start_micros}"

data/examples/fork_children/main.rb

@@ -19,6 +19,7 @@ puts 'Starting...'
       sleep(0.0025 * rand(k))
       span.finish
     end
+    LightStep.flush
   end
 
   10.times do
@@ -47,3 +48,5 @@ puts 'Starting...'
 end
 
 puts 'Done!'
+
+LightStep.flush

data/lib/lightstep/reporter.rb

@@ -1,9 +1,9 @@
-require 'concurrent/channel'
-
 module LightStep
   # Reporter builds up reports of spans and flushes them to a transport
   class Reporter
+    DEFAULT_PERIOD_SECONDS = 3.0
     attr_accessor :max_span_records
+    attr_accessor :period
 
     def initialize(max_span_records:, transport:, guid:, component_name:)
       @max_span_records = max_span_records
@@ -11,6 +11,7 @@ module LightStep
       @dropped_spans = Concurrent::AtomicFixnum.new
       @dropped_span_logs = Concurrent::AtomicFixnum.new
       @transport = transport
+      @period = DEFAULT_PERIOD_SECONDS
 
       start_time = LightStep.micros(Time.now)
       @report_start_time = start_time
@@ -27,11 +28,6 @@ module LightStep
       }.freeze
 
       reset_on_fork
-
-      at_exit do
-        @quit_signal << true
-        @thread.join
-      end
     end
 
     def add_span(span)
@@ -43,11 +39,11 @@ module LightStep
         @dropped_spans.increment
         @dropped_span_logs.increment(dropped[:log_records].size + dropped[:dropped_logs])
       end
-
-      @span_signal << true
     end
 
     def clear
+      reset_on_fork
+
       span_records = @span_records.slice!(0, @span_records.length)
       @dropped_spans.increment(span_records.size)
       @dropped_span_logs.increment(
@@ -58,32 +54,8 @@ module LightStep
     end
 
     def flush
-      @flush_signal << true
-      ~@flush_response_signal
-    end
-
-    private
-    MIN_PERIOD_SECS = 1.5
-    MAX_PERIOD_SECS = 30.0
-
-    # When the process forks, reset the child. All data that was copied will be handled
-    # by the parent. Also, restart the thread since forking killed it
-    def reset_on_fork
-      if @pid != $$
-        @pid = $$
-        @span_signal = Concurrent::Channel.new(buffer: :dropping, capacity: 1)
-        @quit_signal = Concurrent::Channel.new(buffer: :dropping, capacity: 1)
-        @flush_signal = Concurrent::Channel.new
-        @flush_response_signal = Concurrent::Channel.new
-        @span_records.clear
-        @dropped_spans.value = 0
-        @dropped_span_logs.value = 0
-        report_spans
-      end
-    end
-
-    def perform_flush
       reset_on_fork
+
       return if @span_records.empty?
 
       now = LightStep.micros(Time.now)
@@ -123,38 +95,27 @@ module LightStep
       end
     end
 
+    private
+
+    # When the process forks, reset the child. All data that was copied will be handled
+    # by the parent. Also, restart the thread since forking killed it
+    def reset_on_fork
+      if @pid != $$
+        @pid = $$
+        @span_records.clear
+        @dropped_spans.value = 0
+        @dropped_span_logs.value = 0
+        report_spans
+      end
+    end
+
     def report_spans
-      @thread = Thread.new do
+      return if @period <= 0
+      Thread.new do
         begin
           loop do
-            min_reached = false
-            max_reached = false
-            min_timer = Concurrent::Channel.timer(MIN_PERIOD_SECS)
-            max_timer = Concurrent::Channel.timer(MAX_PERIOD_SECS)
-            loop do
-              Concurrent::Channel.select do |s|
-                s.take(@span_signal) do
-                  # we'll check span count below
-                end
-                s.take(min_timer) do
-                  min_reached = true
-                end
-                s.take(max_timer) do
-                  max_reached = true
-                end
-                s.take(@quit_signal) do
-                  perform_flush
-                  Thread.exit
-                end
-                s.take(@flush_signal) do
-                  perform_flush
-                  @flush_response_signal << true
-                end
-              end
-              if max_reached || (min_reached && @span_records.size >= max_span_records / 2)
-                perform_flush
-              end
-            end
+            sleep(@period)
+            flush
           end
         rescue => ex
           # TODO: internally log the exception

data/lib/lightstep/tracer.rb

@@ -45,6 +45,12 @@ module LightStep
       @reporter.max_span_records = @max_span_records
     end
 
+    # Set the report flushing period. If set to 0, no flushing will be done, you
+    # must manually call flush.
+    def report_period_seconds=(seconds)
+      @reporter.period = seconds
+    end
+
     # TODO(ngauthier@gmail.com) inherit SpanContext from references
 
     # Starts a new span.

data/lib/lightstep/version.rb

@@ -1,3 +1,3 @@
 module LightStep
-  VERSION = '0.9.8'.freeze
+  VERSION = '0.9.9'.freeze
 end

data/lightstep.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightstep
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - bcronin
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby-edge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement