aws-xray 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362df5eec453be15bad6af5cc1a2a05af277df70
-  data.tar.gz: 2280694a354290e4234ba9bbe5928e0f4408e548
+  metadata.gz: b0822b0de7d76c5d15689f32c232f7254709e49d
+  data.tar.gz: 9c160d3b42b5cf1728ec57249efb665a912a6d8a
 SHA512:
-  metadata.gz: e3a379f1e26dbb83a339c2bba8cf4831933bbd13a0884c80a49a709d1606317d0f69755fc9dad5a191bfe6bb01e5f4cb51b243b57242ba254d26fc797525f015
-  data.tar.gz: e8d77430640aafae31301975d193f1cf22853856376cb3999efe44d3844c9fbc96a4ca3abe73756f35d30bcd3c488705752a7c63907f22e9c60468bc325b9e5e
+  metadata.gz: 246afdb37279ae40709afa661964e78767c2b07f867c0239f62b33aa581c4367930158cb66c29c859efb2fcb7c8d19903119ec591822c7736cb7331b3a1d2858
+  data.tar.gz: 3e48fd8540c793da5e9f00a0895ab7f283f7e98129509593c974c007e0fcf47860f4e6fec1ee5edfc1eac99a5e84a1cf39cf37b2294eb5946c6d1fa73aeff1b2

data/README.md

@@ -98,6 +98,9 @@ end
 
 ## Configurations
 ### X-Ray agent location
+aws-xray does not send any trace data 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.
 For that case, pass `AWS_XRAY_LOCATION` environment variable to container to specify host and port of xray agent.
 

data/lib/aws/xray.rb

@@ -2,7 +2,7 @@ require 'aws/xray/version'
 require 'aws/xray/rack'
 require 'aws/xray/faraday'
 require 'aws/xray/configuration'
-require 'aws/xray/test_socket'
+require 'aws/xray/sockets'
 
 module Aws
   module Xray

data/lib/aws/xray/configuration.rb

@@ -6,8 +6,8 @@ module Aws
     # thread-unsafe, suppose to be used only in initialization phase.
     class Configuration
       option = ENV['AWS_XRAY_LOCATION']
-      DEFAULT_HOST = option ? option.split(':').first : 'localhost'
-      DEFAULT_PORT = option ? Integer(option.split(':').last) : 2000
+      DEFAULT_HOST = option ? option.split(':').first : nil
+      DEFAULT_PORT = option ? Integer(option.split(':').last) : nil
 
       name_option = ENV['AWS_XRAY_NAME']
       DEFAULT_NAME = name_option ? name_option : nil
@@ -24,9 +24,13 @@ module Aws
       # @return [Hash] client_options For xray-agent client.
       #   - host: e.g. '127.0.0.1'
       #   - port: e.g. 2000
-      #   - sock: test purpose.
       def client_options
-        @client_options ||= { host: DEFAULT_HOST, port: DEFAULT_PORT }
+        @client_options ||=
+          if DEFAULT_HOST && DEFAULT_PORT
+            { host: DEFAULT_HOST, port: DEFAULT_PORT }
+          else
+            { sock: NullSocket.new }
+          end
       end
       attr_writer :client_options
 

data/lib/aws/xray/{test_socket.rb → sockets.rb}

@@ -13,6 +13,28 @@ module Aws
       def send(body, *)
         write(body)
       end
+
+      def close; end
+    end
+
+    class IoSocket
+      def initialize(io)
+        @io = io
+      end
+
+      def send(body, *)
+        @io.write(body)
+      end
+
+      def close; end
+    end
+
+    class NullSocket
+      def send(body, *)
+        body.size
+      end
+
+      def close; end
     end
   end
 end

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.7.2'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Taiki Ono
@@ -135,8 +135,8 @@ files:
 - lib/aws/xray/request.rb
 - lib/aws/xray/response.rb
 - lib/aws/xray/segment.rb
+- lib/aws/xray/sockets.rb
 - lib/aws/xray/sub_segment.rb
-- lib/aws/xray/test_socket.rb
 - lib/aws/xray/trace.rb
 - lib/aws/xray/version.rb
 - lib/aws/xray/version_detector.rb