aws-xray 0.19.0.beta1 → 0.19.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0218d89ab6e56b753057c38781e756412ca766
-  data.tar.gz: 232fb91a69d318c535249803a4c1f292158b4331
+  metadata.gz: 04bfc0455b6d3432e76d99375ae6f13a4a025d2d
+  data.tar.gz: 62f8cd7d1a8987845e7ac16830c2ef2d8ae1aeac
 SHA512:
-  metadata.gz: da3574d466ec8181955f4d3919c95240da461339c2ef101c33c8d34dd652b995b75ee5d00319302ee7f5e7513e3d3484e4d9d43d2cc08fbc2f043ffee37d08df
-  data.tar.gz: 277dedd93475c26178400807dfb2aaa7b8cf0c27e9cc032c815a52271fcc0848db66ec4dce0903a6b902f83257fed4469061c0428a4b9da8a180db60e8ea687a
+  metadata.gz: f0fff3ec264805f7308d72d0ec04482b68b389a180e07bc5d2e18d2ac5a32659808499f6a67504b3839220d03b59bcad3f24a137c979dd54129553f1ee1ccafb
+  data.tar.gz: 72b263ce13cec59bceaeac920c9218109a5b58f4a2b8e5bfa74e4345fc565793ec71c868486a6fabbfad5ab8ad1f1a6c91cf5f506c58523013a159f778096fc2

data/README.md

@@ -133,7 +133,7 @@ end
 
 ## Configurations
 ### X-Ray agent location
-aws-xray does not send any trace data dby efault. Set `AWS_XRAY_LOCATION` environment variable like `AWS_XRAY_LOCATION=localhost:2000`
+aws-xray does not send any trace data by default. Set `AWS_XRAY_LOCATION` environment variable like `AWS_XRAY_LOCATION=localhost:2000`
 or set proper aws-agent location with configuration interface like `Aws::Xray.config.client_options = { host: "localhost", port: 2000 }`.
 
 In container environments, we often run xray agent container beside application container.

data/lib/aws/xray.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 require 'aws/xray/version'
 require 'aws/xray/errors'
 require 'aws/xray/trace'
@@ -19,6 +21,7 @@ module Aws
     class << self
       attr_reader :config
     end
+    Worker.reset(Worker::Configuration.new)
 
     # @param [String] name a logical name of this tracing context.
     def self.trace(name: nil)

data/lib/aws/xray/client.rb

@@ -18,13 +18,16 @@ module Aws
       # When UDPSocket#send can not send all bytes, just give up it.
       # @param [Aws::Xray::Segment] segment
       def send_segment(segment)
+        Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_segment started")
         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)
+            Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_segment called #send_payload in the same thread")
           else # production env
             Worker.post(payload, self.copy)
+            Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_segment posted a job to worker")
           end
         rescue QueueIsFullError => e
           begin
@@ -38,11 +41,13 @@ module Aws
       # Will be called in other threads.
       # @param [String] payload
       def send_payload(payload)
+        Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_payload")
         sock = @sock || UDPSocket.new
 
         begin
           len = sock.send(payload, Socket::MSG_DONTWAIT, @host, @port)
           raise CanNotSendAllByteError.new(payload.size, len) if payload.size != len
+          Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_payload successfully sent payload, len=#{len}")
           len
         rescue SystemCallError, SocketError, CanNotSendAllByteError => e
           begin

data/lib/aws/xray/configuration.rb

@@ -7,6 +7,10 @@ module Aws
   module Xray
     # thread-unsafe, suppose to be used only in initialization phase.
     class Configuration
+      def initialize
+        @logger = ::Logger.new($stdout).tap {|l| l.level = Logger::INFO }
+      end
+
       # @return [String] name Logical service name for this application.
       def name
         @name ||= ENV['AWS_XRAY_NAME']
@@ -98,6 +102,10 @@ module Aws
       end
       # @param [Float] sampling_rate
       attr_writer :sampling_rate
+
+      # @param [Logger] logger
+      # @return [Logger]
+      attr_accessor :logger
     end
   end
 end

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.19.0.beta1'
+    VERSION = '0.19.0.beta2'
   end
 end

data/lib/aws/xray/worker.rb

@@ -17,7 +17,9 @@ module Aws
         # @param [String] payload to send
         # @param [Aws::Xray::Client] client
         def post(payload, client)
+          Aws::Xray.config.logger.debug("#{Thread.current}: Worker.post received a job")
           @queue.push(Item.new(payload, client.copy))
+          Aws::Xray.config.logger.debug("#{Thread.current}: Worker.post pushed a job")
         rescue ThreadError => e
           raise QueueIsFullError.new(e)
         end
@@ -38,19 +40,20 @@ module Aws
       def run
         th = Thread.new(@queue) do |queue|
           loop do
+            Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run waits a job")
             item = queue.pop
+            Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run received a job")
             if item.is_a?(Item)
               item.client.send_payload(item.payload)
+              Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run sent a payload")
             else
-              # TODO
+              Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run received invalid item, ignored it")
             end
           end
         end
         th.abort_on_exception = true
         th
       end
-
-      reset(Aws::Xray::Worker::Configuration.new)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta1
+  version: 0.19.0.beta2
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday