aws-xray 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3ff7a0a063b0f2d11f2764e6350e4679e69bbd
-  data.tar.gz: 731f70968ec41d406703f3194c89fba607a793ab
+  metadata.gz: e1f4338978e5b5f21c1c98380b076d3e4a22e7d6
+  data.tar.gz: 510b3414f6eca43c15be7c8d4f606251afb8e950
 SHA512:
-  metadata.gz: 9e753bb18782981bd36f04e6ea531306cb65a5f79c4d9c094dec85f9e7bcf41470dc9e27886185c014065ad79753bab755367c69ffd789eb139ed09f0a1394b0
-  data.tar.gz: 6a96d9460974106dbbc9a5b05240ddb0030f98c714f16a1e57dfb0fea2fc500a52fe731401af1918ef0183fef554f396bd12c06a30b754f80b424ebde30aa031
+  metadata.gz: f2c7f88c0eed8afbea49ff32739b3e58720c297c929635f3bc517792a3283146b13f94f4dcbd8b046057bcc6b7318b1c5c8be9d4b5d95a3a7ec91ba27c2285b3
+  data.tar.gz: dc3ab34565c1eb7847357c428b0f9e56ac7ed8d44a2895e86d395a51244082fe8c050fdc5d5aa56c073cbef53585060ab12ed6797acf27e453de303f80e2afc9

data/README.md

@@ -29,15 +29,7 @@ And then execute:
 
 ## Usage
 ### Rails app
-Insert Rack middleware by yourself:
-
-```
-# config/initializers/aws_xray.rb
-Aws::Xray.config.name = 'my-app'
-Rails.application.config.middleware.use Aws::Xray::Rack
-```
-
-Or just require `aws/xray/rails`. It uses your application name by default.
+Just require `aws/xray/rails`. It uses your application name by default.
 e.g. `Legacy::MyBlog` -> `legacy-my-blog`.
 
 ```ruby
@@ -90,7 +82,7 @@ end
 Aws::Xray.trace(name: 'my-app-batch') do |seg|
   client.get('/foo')
 
-  Aws::Xray::Context.current.child_trace do |sub|
+  Aws::Xray::Context.current.child_trace(name: 'fetch-user', remote: true) do |sub|
     # DB access or something to trace.
   end
 end
@@ -98,13 +90,13 @@ 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`
+aws-xray does not send any trace data dby efault. 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.
 
-```
+```bash
 docker run --link xray:xray --env AWS_XRAY_LOCATION=xray:2000 my-application
 ```
 
@@ -134,13 +126,13 @@ Aws::Xray.config.default_annotation = Aws::Xray.config.default_annotation.merge(
 
 Keys must be alphanumeric characters with underscore and values must be one of String or Integer or Boolean values.
 
-For meta data:
+For metadata:
 
 ```ruby
 Aws::Xray.config.default_metadata = Aws::Xray.config.default_metadata.merge(key: ['some', 'meaningful', 'value'])
 ```
 
-Note: See official document to know what annotation and metadata are in AWS X-Ray.
+Note: See official document about annotation and metadata in AWS X-Ray.
 
 ## Development
 

data/bin/console

@@ -1,14 +1,10 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "aws/xray"
+require 'bundler/setup'
+require 'aws/xray'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+require 'pry'
+Pry.start

data/bin/setup

@@ -4,5 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/lib/aws/xray/rack.rb

@@ -7,6 +7,7 @@ module Aws
   module Xray
     class Rack
       TRACE_ENV = 'HTTP_X_AMZN_TRACE_ID'.freeze
+      ORIGINAL_TRACE_ENV = 'HTTP_X_AMZN_TRACE_ID_ORIGINAL'.freeze
 
       # @param  [Hash] client_options For xray-agent client.
       #   - host: e.g. '127.0.0.1'
@@ -37,6 +38,8 @@ module Aws
                        else
                          Trace.generate
                        end
+        env[ORIGINAL_TRACE_ENV] = env[TRACE_ENV] # just for the record
+        env[TRACE_ENV] = trace.to_header_value
 
         Context.with_new_context(@name, @client, trace) do
           Context.current.base_trace do |seg|

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.9.3'
+    VERSION = '0.9.4'
   end
 end

metadata

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