aws-xray 0.37.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c0c92edb0c36053747d206937c7680085fcca7
-  data.tar.gz: 91debde7d3a0e42b5e41a8cc8acd371b1ec4a57e
+  metadata.gz: af7b77e24f5f52985838b57d93790ac4e070ef16
+  data.tar.gz: 3698224665b0676507b3e6c60e2bd09ab99b5cb5
 SHA512:
-  metadata.gz: c327317839ca9a2a602f32717dd409b652ce0e00b21011a45faca2d56a753d3f32604993b85e54fb6110cb41e561aca0d266faf29fb3a68d1744d96f9d090727
-  data.tar.gz: 07bd95bf600341d8faaed5f7d8da5217e7365a26e1bef35d416b43e7d118b50dad7533971a347773e3f7ca88c4d30b76e1ca7847fd283d208c814519990a79aa
+  metadata.gz: 0e49d7f911912787e94dfba13a260a64ec2bfc31bdbb4f4fd50de666871dec086affdf43936694e774f716437670d42e98fad89fcfb1bf281c10dffd052a844f
+  data.tar.gz: dfd2ae23e980676923521a0049ce7e49e6d78bda17aa1e11cf2dac2d33fbd939bf8eb7c942323e745532afff632d6e1f0a821acb959b8600db216294d784d13e

data/bump

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+level = ARGV.first
+if level.nil?
+  warn "Example: #{__FILE__} (tiny|minor|major)"
+  exit 1
+end
+
+path = 'lib/aws/xray/version.rb'
+regexp = /VERSION = '(.+)'.freeze$/
+version = File.read(path).scan(regexp)[0][0]
+version_strs = version.split('.')
+
+if version_strs.size > 3
+  warn "Current version includes a prelease suffix, drop it: #{version}"
+  version_strs = version_strs[0..2]
+end
+
+case level
+when 'tiny'
+  version_strs[2] = version_strs[2].to_i + 1
+when 'minor'
+  version_strs[1] = version_strs[1].to_i + 1
+  version_strs[2] = 0
+when 'major'
+  version_strs[0] = version_strs[0].to_i + 1
+  version_strs[1] = 0
+  version_strs[2] = 0
+else
+  warn "Example: #{__FILE__} (tiny|minor|major)"
+  exit 1
+end
+
+next_version = version_strs.join('.')
+File.write(path, File.read(path).gsub(regexp, "VERSION = '#{next_version}'.freeze"))
+system('git', 'add', path)
+system('git', 'commit', '-m', "v#{next_version}")

data/lib/aws/xray/context.rb

@@ -80,7 +80,6 @@ module Aws
           yield base_segment
         rescue Exception => e
           base_segment.set_error(fault: true, e: e)
-          record_traced! if @trace.sampled?
           raise e
         ensure
           base_segment.finish unless base_segment.finished?
@@ -102,7 +101,6 @@ module Aws
           yield sub
         rescue Exception => e
           sub.set_error(fault: true, e: e)
-          record_traced! if @trace.sampled?
           raise e
         ensure
           sub.finish unless sub.finished?
@@ -152,13 +150,6 @@ module Aws
         @subsegment_name = nil
         name
       end
-
-      def record_traced!
-        ::Raven.tags_context(traced: '1') if defined?(::Raven)
-      rescue => e
-        Aws::Xray.config.logger.error("#{e.message}\n#{e.backtrace.join("\n")}")
-        # Ignore the error
-      end
     end
   end
 end

data/lib/aws/xray/rack.rb

@@ -25,6 +25,7 @@ module Aws
         trace = build_trace(env[TRACE_ENV])
         env[ORIGINAL_TRACE_ENV] = env[TRACE_ENV] if env[TRACE_ENV] # just for the record
         env[TRACE_ENV] = trace.to_header_value
+        record_context!(trace)
 
         Aws::Xray.trace(name: @name, trace: trace) do |seg|
           seg.set_http_request(Request.build_from_rack_env(env))
@@ -47,6 +48,13 @@ module Aws
       def excluded_path?(path)
         !!@excluded_paths.find {|p| p === path }
       end
+
+      def record_context!(trace)
+        ::Raven.tags_context(xray_sampled: trace.sampled? ? '1' : '0') if defined?(::Raven)
+      rescue => e
+        Aws::Xray.config.logger.error("#{e.message}\n#{e.backtrace.join("\n")}")
+        # Ignore the error
+      end
     end
   end
 end

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.37.0'
+    VERSION = '0.37.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -254,6 +254,7 @@ files:
 - aws-xray.gemspec
 - bin/console
 - bin/setup
+- bump
 - example/Gemfile
 - example/Procfile
 - example/README.md
@@ -291,7 +292,6 @@ files:
 - 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:
 - MIT
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: The unofficial X-Ray Tracing SDK for Ruby.

data/prepare_release.rb

@@ -1,11 +0,0 @@
-after = ARGV.first
-if after.nil?
-  $stderr.puts "Example: ruby #{__FILE__} v0.6.0"
-  exit 1
-end
-
-path = 'lib/aws/xray/version.rb'
-version_str = after.gsub('v', '')
-File.write(path, File.read(path).gsub(/VERSION = '.+'$/, "VERSION = '#{version_str}'"))
-system('git', 'add', path)
-system('git', 'commit', '-m', after)