aws-xray-sdk 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78007efa0d29f0f16fa12ee0437cb6214a64c7d43d6cd1bde7ca9286d44d110b
-  data.tar.gz: e9fe587611d3f346b98e632ab88772769246d351b06ce46cc42f015fb15899e2
+  metadata.gz: 8e7a6c26d4cd8e8669849e6b298d9b07727f4126641e6c4fa3856745f895af08
+  data.tar.gz: d0c45a96450d4fab1ad858f0e99f5ab6bf24dd4990750e552df52a6ac4d3d655
 SHA512:
-  metadata.gz: bb2ed43b514b1b50278c370c32b159f8f58bed0cd3e105b91f9ff0afb74a6ba66f184f515a294c2520cca7ad9b102506534f58fd4f3a778daeec02688900b437
-  data.tar.gz: 5ce0c0474f40d316dfa1ec0eddc13d156886c93b211bebd7963ae795c7b1eeca72fbc696d3a0bb948d3ad8ad106eab60d1b0774602217a794c2f92f42bac2938
+  metadata.gz: d0fbd0d535f48af1039cc4a256d280721623cf64de498537d074d7ec44ded18d33bd4f1154cebff344ef562a811dfbab683668a9c3bd93036b4d243cd5df2851
+  data.tar.gz: b2ef531abf13ac1e72bf0339dd45a55d90a8458018ab5b8993175b2a7c936d0a2fc1cff11abb7373034ee0f55b8b53f2c0a96a1bc523327447ec77994e5e6131

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

@@ -18,6 +18,10 @@ module XRay
 
       def call(context)
         recorder = Aws.config[:xray_recorder]
+        if recorder.current_entity.nil?
+          super
+        end
+
         operation = context.operation_name
         service_name = context.client.class.api.metadata['serviceAbbreviation'] ||
                        context.client.class.to_s.split('::')[1]

data/lib/aws-xray-sdk/facets/rails/active_record.rb

@@ -20,6 +20,8 @@ module XRay
           db_config = pool.spec.config
           name, sql = build_name_sql_meta config: db_config, conn: conn
           subsegment = XRay.recorder.begin_subsegment name, namespace: 'remote'
+          # subsegment is nil in case of context missing
+          return if subsegment.nil?
           subsegment.start_time = transaction.time.to_f
           subsegment.sql = sql
           XRay.recorder.end_subsegment end_time: transaction.end.to_f

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

@@ -57,7 +57,8 @@ module XRay
     # Begin a new subsegment and add it to be the child of the current active
     # subsegment or segment. Also tie the new created subsegment to the current context.
     # Its sampling decision will follow its parent.
-    # @return [Subsegment] the newly created subsegment.
+    # @return [Subsegment] the newly created subsegment. It could be `nil` if no active entity
+    #   can be found and `context_missing` is set to `LOG_ERROR`.
     def begin_subsegment(name, namespace: nil, segment: nil)
       entity = segment || current_entity
       return unless entity
@@ -104,8 +105,16 @@ module XRay
     end
 
     # Record the passed block as a subsegment.
+    # If `context_missing` is set to `LOG_ERROR` and no active entity can be found,
+    # the passed block will be executed as normal but it will not be recorded.
     def capture(name, namespace: nil, segment: nil)
       subsegment = begin_subsegment name, namespace: namespace, segment: segment
+      # prevent passed block from failing in case of context missing with log error
+      if subsegment.nil?
+        segment = DummySegment.new name: name
+        subsegment = DummySubsegment.new name: name, segment: segment
+      end
+
       begin
         yield subsegment
       rescue Exception => e

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

@@ -1,3 +1,3 @@
 module XRay
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray-sdk
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="