aws-xray 0.17.2 → 0.18.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3deda3f256b5d2af42eb41c05b185a251778d92b
-  data.tar.gz: faa78fd4d89cb7395d1c522ce9ed783aef81a1b8
+  metadata.gz: 9f6fc4b5ed63083e7023dea1ee6922e7af1bc9a4
+  data.tar.gz: cc4fb9f2dc6577c02b500592a951fa728a7307c2
 SHA512:
-  metadata.gz: 17165b0eca79f5cdd7ad3bf905190a0890b9b8e43373e8a000bb98fec27c83624d38bfa7c2f046f28f5f92742f47de11d808db508f370d14c36c1c92a787d459
-  data.tar.gz: bf10745ef15b498e5f4f0e771c6b67304445586867224ef4ce151561b1eef5e1fb46baaf16863db666e1822670282ac61bf9a4eff537e754612517893124f901
+  metadata.gz: 37c71b2c1c758525fc7ad708b7453a3ce78f8f508bfd7c2201530d0e55fd9ce09e2734ab180a63dd704499fc06ef817f77c976dd35e043abb4b5cd1bee794c16
+  data.tar.gz: c77cb5dc31a323e2e735b4e0632bd31fad70049e6e2babce0d728d24a6bfb41fb502b34d1ff9bc3dcd0aa8d55128e92f4eac5a12f101b803dd758aa84d811d43

data/lib/aws/xray.rb

@@ -1,10 +1,16 @@
 require 'aws/xray/version'
 require 'aws/xray/errors'
-require 'aws/xray/rack'
-require 'aws/xray/faraday'
+require 'aws/xray/trace'
+require 'aws/xray/client'
+require 'aws/xray/context'
+require 'aws/xray/worker'
+
 require 'aws/xray/configuration'
 require 'aws/xray/sockets'
 
+require 'aws/xray/rack'
+require 'aws/xray/faraday'
+
 module Aws
   module Xray
     TRACE_HEADER = 'X-Amzn-Trace-Id'.freeze

data/lib/aws/xray/client.rb

@@ -19,6 +19,25 @@ module Aws
       # @param [Aws::Xray::Segment] segment
       def send_segment(segment)
         payload = %!{"format": "json", "version": 1}\n#{segment.to_json}\n!
+
+        begin
+          if @sock # test env or not aws-xray is not enabled
+            send_payload(payload)
+          else # production env
+            Worker.post(payload, self.copy)
+          end
+        rescue QueueIsFullError => e
+          begin
+            Aws::Xray.config.segment_sending_error_handler.call(e, payload, host: @host, port: @port)
+          rescue Exception => e
+            $stderr.puts("Error handler `#{Aws::Xray.config.segment_sending_error_handler}` raised an error: #{e}\n#{e.backtrace.join("\n")}")
+          end
+        end
+      end
+
+      # Will be called in other threads.
+      # @param [String] payload
+      def send_payload(payload)
         sock = @sock || UDPSocket.new
 
         begin

data/lib/aws/xray/configuration.rb

@@ -77,6 +77,19 @@ module Aws
       end
       # @param [Proc] segment_sending_error_handler Callable object
       attr_writer :segment_sending_error_handler
+
+      # @return [Aws::Xray::Worker::Configuration]
+      def worker
+        @worker ||= Aws::Xray::Worker::Configuration.new
+      end
+      # Set given configuration and reset workers according to the given
+      # configuration.
+      # @param [Aws::Xray::Worker::Configuration] conf
+      def worker=(conf)
+        @worker = conf
+        Aws::Xray::Worker.reset(conf)
+        conf
+      end
     end
   end
 end

data/lib/aws/xray/errors.rb

@@ -26,5 +26,14 @@ module Aws
         super("Can not send all bytes: expected #{payload_len} but #{sent_len} sent")
       end
     end
+
+    class QueueIsFullError < BaseError
+      attr_reader :error
+
+      def initialize(error)
+        @error = error
+        super('The queue exceeds max size')
+      end
+    end
   end
 end

data/lib/aws/xray/rack.rb

@@ -1,7 +1,3 @@
-require 'aws/xray/trace'
-require 'aws/xray/client'
-require 'aws/xray/context'
-
 module Aws
   module Xray
     class Rack

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.17.2'
+    VERSION = '0.18.0.beta1'
   end
 end

data/lib/aws/xray/worker.rb

@@ -0,0 +1,56 @@
+module Aws
+  module Xray
+    class Worker
+      class Configuration
+        attr_reader :num, :max_queue_size
+
+        def initialize(num: 10, max_queue_size: 1000)
+          @num = num
+          @max_queue_size = max_queue_size
+        end
+      end
+
+      class Item < Struct.new(:payload, :client)
+      end
+
+      class << self
+        # @param [String] payload to send
+        # @param [Aws::Xray::Client] client
+        def post(payload, client)
+          @queue.push(Item.new(payload, client.copy))
+        rescue ThreadError => e
+          raise QueueIsFullError.new(e)
+        end
+
+        # @param [Aws::Xray::Worker::Configuration] config
+        def reset(config)
+          @queue = Thread::SizedQueue.new(config.max_queue_size)
+          @workers.each(&:kill) if defined?(@workers) && !@workers.empty?
+          @workers = Array.new(config.num) { new(@queue).run }
+        end
+        # Call `.reset` after class definetion section.
+      end
+
+      def initialize(queue)
+        @queue = queue
+      end
+
+      def run
+        th = Thread.new(@queue) do |queue|
+          loop do
+            item = queue.pop
+            if item.is_a?(Item)
+              item.client.send_payload(item.payload)
+            else
+              # TODO
+            end
+          end
+        end
+        th.abort_on_exception = true
+        th
+      end
+
+      reset(Aws::Xray::Worker::Configuration.new)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0.beta1
 platform: ruby
 authors:
 - Taiki Ono
@@ -186,6 +186,7 @@ files:
 - lib/aws/xray/trace.rb
 - lib/aws/xray/version.rb
 - lib/aws/xray/version_detector.rb
+- lib/aws/xray/worker.rb
 - prepare_release.rb
 homepage: https://github.com/taiki45/aws-xray
 licenses:
@@ -202,9 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2