aws-xray-sdk 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3ef8621b715e92340eb2dfe27f470fd8e4c92d45d0b21f20d814d3a0b298d323
-  data.tar.gz: dc4471eebd695a0e4c7fd31cd7b84709ba166a395f6c31785a482272c0a162b6
+SHA1:
+  metadata.gz: 12bf7fe4479fe58271466a730e04d20a38d125aa
+  data.tar.gz: bd3f3df33fd65ea9f82aa5579316dd8d526d75e2
 SHA512:
-  metadata.gz: 656c7425f811713ea11d7e4fb8515d597513c8412f1f77b6a2445c0695b7ff91772815efc349695c49688cb3a1ee07408c4e863811ad40dcde58e8585942dff5
-  data.tar.gz: fbab0222d5abc0048c0fd32a443b1974ad72072386779e858ef88aa541b2bc2797f44ac9ae3a1ae21c066e44973fa30f0c5d78c7e2523a1d32f26d8b1c417f6f
+  metadata.gz: f515f1e1016a02f04ad8fee38848fd95ed432dad394befc512781cd66d7c26b6bd0191c0a7895f1bc98cd5c864722fe01ed93b536d56557e167c94a81233ff80
+  data.tar.gz: 9527449a4c4aaccb8496bc6ff5d764609a287d986144538f3821576c44989bee3b8982387f1d9afab8d0663c09618c2f0e202c2abbb0343563c918fb2beba690

data/lib/aws-xray-sdk/configuration.rb

@@ -42,7 +42,7 @@ module XRay
     # setting daemon address for components communicate with X-Ray daemon.
     def daemon_address=(v)
       v = ENV[DaemonConfig::DAEMON_ADDRESS_KEY] || v
-      config = DaemonConfig.new(v)
+      config = DaemonConfig.new(addr: v)
       emitter.daemon_config = config
       sampler.daemon_config = config if sampler.respond_to?(:daemon_config=)
     end

data/lib/aws-xray-sdk/context/default_context.rb

@@ -12,7 +12,7 @@ module XRay
 
     LOCAL_KEY = '_aws_xray_entity'.freeze
     CONTEXT_MISSING_KEY = 'AWS_XRAY_CONTEXT_MISSING'.freeze
-    SUPPORTED_STRATEGY = %w[RUNTIME_ERROR LOG_ERROR].freeze
+    SUPPORTED_STRATEGY = %w[RUNTIME_ERROR LOG_ERROR IGNORE_ERROR].freeze
     DEFAULT_STRATEGY = SUPPORTED_STRATEGY[0]
 
     attr_reader :context_missing

data/lib/aws-xray-sdk/facets/helper.rb

@@ -42,12 +42,7 @@ module XRay
 
       # Prepares a X-Ray header string based on the provided Segment/Subsegment.
       def prep_header_str(entity:)
-        return '' if entity.nil?
-        root = entity.segment.trace_id
-        parent_id = entity.id
-        sampled = entity.sampled ? 1 : 0
-        header = TraceHeader.new root: root, parent_id: parent_id, sampled: sampled
-        header.header_string
+        TraceHeader.from_entity(entity: entity).header_string
       end
     end
   end

data/lib/aws-xray-sdk/facets/rack.rb

@@ -49,6 +49,8 @@ module XRay
             resp_meta[:content_length] = len
           end
           segment.merge_http_response response: resp_meta
+          trace_header = {TRACE_HEADER => TraceHeader.from_entity(entity: segment).root_string}
+          headers.merge!(trace_header)
           [status, headers, body]
         rescue Exception => e
           segment.apply_status_code status: 500

data/lib/aws-xray-sdk/facets/resources/aws_params_whitelist.rb

@@ -329,6 +329,15 @@ module XRay
               ]
             }
           }
+        },
+        SNS: {
+          operations: {
+            publish: {
+              request_parameters: %I[
+                topic_arn
+              ]
+            }
+          }
         }
       }
     }

data/lib/aws-xray-sdk/facets/resources/aws_services_whitelist.rb

@@ -57,7 +57,7 @@ module XRay
       ElasticLoadBalancingV2
       ElasticTranscoder
       ElasticsearchService
-      Firehost
+      Firehose
       GameLift
       Glacier
       Glue

data/lib/aws-xray-sdk/model/entity.rb

@@ -143,7 +143,9 @@ module XRay
       else
         h[:in_progress] = true
       end
-      h[:subsegments] = subsegments unless subsegments.empty?
+
+      h[:subsegments] = subsegments.map(&:to_h) unless subsegments.empty?
+
       h[:aws] = aws if aws
       if http_request || http_response
         h[:http] = {}

data/lib/aws-xray-sdk/model/metadata.rb

@@ -17,7 +17,11 @@ module XRay
     end
 
     def to_h
-      @data
+      @data.keys.each_with_object({}) do |key, h|
+        h[key] = @data[key].to_h
+        h
+      end
+
     end
   end
 

data/lib/aws-xray-sdk/model/trace_header.rb

@@ -18,6 +18,14 @@ module XRay
       @sampled = sampled.to_i if sampled
     end
 
+    def self.from_entity(entity:)
+      return empty_header if entity.nil?
+      root = entity.segment.trace_id
+      parent_id = entity.id
+      sampled = entity.sampled ? 1 : 0
+      new root: root, parent_id: parent_id, sampled: sampled
+    end
+
     def self.from_header_string(header_str:)
       empty_header if header_str.to_s.empty?
       header = header_str.delete(' ').downcase
@@ -35,15 +43,20 @@ module XRay
       end
     end
 
+    # @return [String] The header string of the root object
+    def root_string
+	%(Root=#{root})
+    end
+
     # @return [String] The heading string constructed based on this header object.
     def header_string
       return '' unless root
       if !parent_id
-        %(Root=#{root};Sampled=#{sampled})
+        %(#{root_string};Sampled=#{sampled})
       elsif !sampled
-        %(Root=#{root};Parent=#{parent_id})
+        %(#{root_string};Parent=#{parent_id})
       else
-        %(Root=#{root};Parent=#{parent_id};Sampled=#{sampled})
+        %(#{root_string};Parent=#{parent_id};Sampled=#{sampled})
       end
     end
 

data/lib/aws-xray-sdk/sampling/local/sampler.rb

@@ -58,7 +58,7 @@ module XRay
       return sample if sampling_req.nil? || sampling_req.empty?
       @custom_rules ||= []
       @custom_rules.each do |c|
-        return should_sample?(c) if c.applies?(sampling_req: sampling_req)
+        return should_sample?(c) if c.applies?(sampling_req)
       end
       # use previously made decision based on default rule
       # if no path-based rule has been matched

data/lib/aws-xray-sdk/version.rb

@@ -1,3 +1,3 @@
 module XRay
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray-sdk
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-xray
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: AWS X-Ray SDK for Ruby