aws-xray 0.34.3 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532e479bf5d85136ef07b1797919d8b95f91c69a
-  data.tar.gz: ad77b1e33115dfa9cad71098a396d36521dd11c7
+  metadata.gz: de94539e68d8048e57af8669d4e448c4b19caf1b
+  data.tar.gz: 30d076056f6d338963ff33ed62e3f26a9c0e949a
 SHA512:
-  metadata.gz: 6a0e8a502c42fabb4b8462ab3168e4f35299e8b31a40aadde7e880a7d7e4e5ae0ff244777705f5b22d6bd9a832d3cf92b2e6e960c6f160c70b13fa35b43e443b
-  data.tar.gz: d2e66a08d7c6211730b8138d57010dffa3d6f09fd12673afd70cd77475190153081d836dab7f6431ffe87bdb059edbb720dfaab4e938756da2b8070c4e3bc5ad
+  metadata.gz: 9d3fc5b75c99b1968bcffb8421d5d70da6c78e15ae930a1f876df3a91f1b65af59f32397404e880cc7c6efe51b8376136af803356f2612347872438711c5b355
+  data.tar.gz: 830f48dc665ea1b49e3406317c3a8ac7278a21e5c978a83b7978f514f3431669b5fd53a413c018a5dc087e29a84d88d630c7a738b6c8cc2f08e21800044c64f7

data/lib/aws/xray/client.rb

@@ -8,21 +8,16 @@ module Aws
       class << self
         # @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 Aws::Xray.config.client_options[: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")
+              send_(segment)
             else # production env
-              Worker.post(payload)
-              Aws::Xray.config.logger.debug("#{Thread.current}: Client.send_segment posted a job to worker")
+              Worker.post(segment)
             end
           rescue QueueIsFullError => e
             begin
               host, port = Aws::Xray.config.client_options[:host], Aws::Xray.config.client_options[:port]
-              Aws::Xray.config.segment_sending_error_handler.call(e, payload, host: host, port: port)
+              Aws::Xray.config.segment_sending_error_handler.call(e, '', 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
@@ -30,16 +25,18 @@ module Aws
         end
 
         # Will be called in other threads.
-        # @param [String] payload
-        def send_payload(payload)
-          Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_payload")
+        # @param [Aws::Xray::Segment] segment
+        def send_(segment)
+          Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_")
+          payload = %!{"format": "json", "version": 1}\n#{segment.to_json}\n!
+
           sock = Aws::Xray.config.client_options[:sock] || UDPSocket.new
           host, port = Aws::Xray.config.client_options[:host], Aws::Xray.config.client_options[:port]
 
           begin
             len = sock.send(payload, Socket::MSG_DONTWAIT, host, port)
             raise CanNotSendAllByteError.new(payload.bytesize, len) if payload.bytesize != len
-            Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_payload successfully sent payload, len=#{len}")
+            Aws::Xray.config.logger.debug("#{Thread.current}: Client#send_ successfully sent payload, len=#{len}")
             len
           rescue SystemCallError, SocketError, CanNotSendAllByteError => e
             begin

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.34.3'
+    VERSION = '0.35.0'
   end
 end

data/lib/aws/xray/worker.rb

@@ -13,13 +13,13 @@ module Aws
       @post_lock = ::Mutex.new
       @pid = $$
       class << self
-        # @param [String] payload to send
+        # @param [Aws::Xray::Segment] segment to send
         # @param [Aws::Xray::Client] client
-        def post(payload)
+        def post(segment)
           Aws::Xray.config.logger.debug("#{Thread.current}: Worker.post received a job")
           @post_lock.synchronize do
             refresh_if_forked
-            @queue.push(payload)
+            @queue.push(segment)
           end
           Aws::Xray.config.logger.debug("#{Thread.current}: Worker.post pushed a job")
         rescue ThreadError => e
@@ -51,11 +51,11 @@ module Aws
         th = Thread.new(@queue) do |queue|
           loop do
             Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run waits a job")
-            payload = queue.pop
+            segment = queue.pop
             Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run received a job")
-            if payload
-              Client.send_payload(payload.to_s)
-              Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run sent a payload")
+            if segment
+              Client.send_(segment)
+              Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run sent a segment")
             else
               Aws::Xray.config.logger.debug("#{Thread.current}: Worker#run received invalid item, ignored it")
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.34.3
+  version: 0.35.0
 platform: ruby
 authors:
 - Taiki Ono