aws-xray-sdk 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef8621b715e92340eb2dfe27f470fd8e4c92d45d0b21f20d814d3a0b298d323
-  data.tar.gz: dc4471eebd695a0e4c7fd31cd7b84709ba166a395f6c31785a482272c0a162b6
+  metadata.gz: cd1eb76edb60040386a2f0742b166868cd136cb758937b270d9387ff00b9284c
+  data.tar.gz: 26a8ca7ef0a34cccc9542b83c2454d2577760d171118a79a20567dd765b8955c
 SHA512:
-  metadata.gz: 656c7425f811713ea11d7e4fb8515d597513c8412f1f77b6a2445c0695b7ff91772815efc349695c49688cb3a1ee07408c4e863811ad40dcde58e8585942dff5
-  data.tar.gz: fbab0222d5abc0048c0fd32a443b1974ad72072386779e858ef88aa541b2bc2797f44ac9ae3a1ae21c066e44973fa30f0c5d78c7e2523a1d32f26d8b1c417f6f
+  metadata.gz: f6f3c2945fb499e53d5a6b4b4d3ad9467b6ed541934aae2fa1b02a13dd13a7052644985391c809308edc02715067de2103664b3336f39d1819c77c83e0867629
+  data.tar.gz: a61d068ec3c5536d884f4848712fe48aaa9774b7d89dc2a42475b70fcee5b534b38ac75d532727d98d09c0cc71518f4497449bcd08e71f73c79a876a866b627c

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
@@ -57,7 +57,7 @@ module XRay
       when 'RUNTIME_ERROR'
         raise ContextMissingError
       when 'LOG_ERROR'
-        logger.error %(can not find the current context.)
+        logger.error %(cannot find the current context.)
       end
       nil
     end

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

@@ -10,7 +10,7 @@ module XRay
 
   class ContextMissingError < AwsXRaySdkError
     def initialize
-      super('Can not find any active segment or subsegment.')
+      super('Cannot find any active segment or subsegment.')
     end
   end
 
@@ -28,4 +28,7 @@ module XRay
 
   class UnsupportedPatchingTargetError < AwsXRaySdkError
   end
+
+  class UnsupportedOperationError < AwsXRaySdkError
+  end
 end

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

@@ -2,7 +2,7 @@ require 'aws-xray-sdk/model/trace_header'
 
 module XRay
   module Facets
-    # Hepler functions shared for all external frameworks/libraries
+    # Helper functions shared for all external frameworks/libraries
     # like make sampling decisions from incoming http requests etc.
     module Helper
       TRACE_HEADER = 'X-Amzn-Trace-Id'.freeze
@@ -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/net_http.rb

@@ -20,8 +20,25 @@ module XRay
         super(*options)
       end
 
+      # HTTP requests to AWS Lambda Ruby Runtime will have the address and port
+      # matching the value set in ENV['AWS_LAMBDA_RUNTIME_API']
+      def lambda_runtime_request?
+        ENV['AWS_LAMBDA_RUNTIME_API'] == "#{address}:#{port}"
+      end
+
+      def xray_sampling_request?(req)
+        req.path && (req.path == ('/GetSamplingRules') || req.path == ('/SamplingTargets'))
+      end
+
+      # Instance Metadata Service provides endpoint 169.254.169.254 to
+      # provide EC2 metadata
+      def ec2_metadata_request?(req)
+        req.uri && req.uri.hostname == '169.254.169.254'
+      end
+
       def request(req, body = nil, &block)
-        if req.path && (req.path == ('/GetSamplingRules') || req.path == ('/SamplingTargets'))
+        # Do not trace requests to xray or aws lambda runtime or ec2 metadata endpoint
+        if xray_sampling_request?(req) || lambda_runtime_request? || ec2_metadata_request?(req)
           return super
         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/rails/active_record.rb

@@ -17,7 +17,12 @@ module XRay
           pool, conn = get_pool_n_conn(payload[:connection_id])
 
           return if IGNORE_OPS.include?(payload[:name]) || pool.nil? || conn.nil?
-          db_config = pool.spec.config
+          # The spec notation is Rails < 6.1, later this can be found in the db_config
+          db_config = if pool.respond_to?(:spec)
+                        pool.spec.config
+                      else
+                        pool.db_config.configuration_hash
+                      end
           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
@@ -52,6 +57,7 @@ module XRay
           ::ActiveRecord::Base.connection_handler.connection_pool_list.each do |p|
             conn = p.connections.select { |c| c.object_id == conn_id }
             pool = p unless conn.nil?
+            return [pool, conn] if !conn.nil? && !conn.empty? && !pool.nil?
           end
           [pool, conn]
         end

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

@@ -7,7 +7,7 @@ module XRay
     RAILS_OPTIONS = %I[active_record].freeze
 
     initializer("aws-xray-sdk.rack_middleware") do |app|
-      app.middleware.insert 0, Rack::Middleware
+      app.middleware.insert 0, XRay::Rack::Middleware
       app.middleware.use XRay::Rails::ExceptionMiddleware
     end
 

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

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

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

@@ -3,20 +3,32 @@ module XRay
   module AwsServices
     # exausted list can be tracked at http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Seahorse/Client/Base.html
     @whitelist = %I[
+      AccessAnalyzer
       ACM
-      APIGateway
+      ACMPCA
       AlexaForBusiness
-      AppStream
-      AppSync
+      Amplify
+      APIGateway
+      ApiGatewayManagementApi
+      ApiGatewayV2
+      AppConfig
       ApplicationAutoScaling
       ApplicationDiscoveryService
+      ApplicationInsights
+      AppMesh
+      AppStream
+      AppSync
       Athena
+      AugmentedAIRuntime
       AutoScaling
+      AutoScalingPlans
+      Backup
       Batch
       Budgets
+      Chime
       Cloud9
       CloudDirectory
-      CloudFormatioin
+      CloudFormation
       CloudFront
       CloudHSM
       CloudHSMV2
@@ -29,109 +41,191 @@ module XRay
       CodeBuild
       CodeCommit
       CodeDeploy
+      CodeGuruProfiler
+      CodeGuruReviewer
       CodePipeline
       CodeStar
+      CodeStarconnections
+      CodeStarNotifications
       CognitoIdentity
       CognitoIdentityProvider
       CognitoSync
       Comprehend
+      ComprehendMedical
+      ComputeOptimizer
       ConfigService
-      CostExplore
+      Connect
+      ConnectParticipant
       CostandUsageReportService
-      DAX
-      DataPipeline
+      CostExplore
+      CostExplorer
       DatabaseMigrationService
+      DataExchange
+      DataPipeline
+      DataSync
+      DAX
+      Detective
       DeviceFarm
       DirectConnect
       DirectoryService
+      DLM
+      DocDB
       DynamoDB
       DynamoDBStreams
+      EBS
       EC2
+      EC2InstanceConnect
       ECR
       ECS
       EFS
-      EMR
+      EKS
       ElastiCache
       ElasticBeanstalk
+      ElasticInference
       ElasticLoadBalancing
       ElasticLoadBalancingV2
-      ElasticTranscoder
       ElasticsearchService
-      Firehost
+      ElasticTranscoder
+      EMR
+      EventBridge
+      Firehose
+      FMS
+      ForecastQueryService
+      ForecastService
+      FraudDetector
+      FSx
       GameLift
       Glacier
+      GlobalAccelerator
       Glue
       Greengrass
+      GroundStation
       GuardDuty
       Health
       IAM
+      Imagebuilder
       ImportExport
       Inspector
       IoT
+      IoT1ClickDevicesService
+      IoT1ClickProjects
+      IoTAnalytics
       IoTDataPlane
+      IoTEvents
+      IoTEventsData
       IoTJobsDataPlane
-      KMS
+      IoTSecureTunneling
+      IoTThingsGraph
+      Kafka
+      Kendra
       Kinesis
       KinesisAnalytics
+      KinesisAnalyticsV2
       KinesisVideo
+      KinesisVideoArchivedMedia
       KinesisVideoArchiveMedia
       KinesisVideoMedia
+      KinesisVideoSignalingChannels
+      KMS
+      LakeFormation
       Lambda
       LambdaPreview
       Lex
       LexModelBuildingService
       LexRuntimeService
+      LicenseManager
       Lightsail
-      MQ
-      MTurk
       MachineLearning
+      Macie
+      ManagedBlockchain
+      MarketplaceCatalog
       MarketplaceCommerceAnalytics
       MarketplaceEntitlementService
       MarketplaceMetering
+      MediaConnect
       MediaConvert
       MediaLive
       MediaPackage
+      MediaPackageVod
       MediaStore
       MediaStoreData
+      MediaTailor
       MigrationHub
+      MigrationHubConfig
       Mobile
+      MQ
+      MTurk
+      Neptune
+      NetworkManager
       OpsWorks
       OpsWorksCM
       Organizations
+      Outposts
+      Personalize
+      PersonalizeEvents
+      PersonalizeRuntime
+      PI
       Pinpoint
+      PinpointEmail
+      PinpointSMSVoice
       Polly
       Pricing
+      QLDB
+      QLDBSession
+      QuickSight
+      RAM
       RDS
+      RDSDataService
       Redshift
       Rekognition
       ResourceGroups
       ResourceGroupsTaggingAPI
+      RoboMaker
       Route53
       Route53Domains
+      Route53Resolver
       S3
-      SES
-      SFN
-      SMS
-      SNS
-      SQS
-      SSM
-      STS
-      SWF
+      S3Control
       SageMaker
       SageMakerRuntime
+      SavingsPlans
+      Schemas
+      SecretsManager
+      SecurityHub
       ServerlessApplicationRepository
       ServiceCatalog
       ServiceDiscovery
+      ServiceQuotas
+      SES
+      SESV2
+      SFN
       Shield
+      Signer
       SimpleDB
+      SMS
       Snowball
+      SNS
+      SQS
+      SSM
+      SSO
+      SSOOIDC
       States
       StorageGateway
+      STS
       Support
+      SWF
+      Textract
+      TranscribeService
+      TranscribeStreamingService
+      Transfer
       Translate
       WAF
       WAFRegional
+      WAFV2
       WorkDocs
+      WorkLink
+      WorkMail
+      WorkMailMessageFlow
       WorkSpaces
       XRay
     ]

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

@@ -0,0 +1,35 @@
+# AWS Lambda functions should require this file to configure the XRay.recorder
+# for use within the function.
+
+require_relative 'lambda/lambda_recorder'
+require_relative 'lambda/facade_segment'
+require_relative 'lambda/lambda_context'
+require_relative 'lambda/lambda_streamer'
+
+module XRay
+  @recorder = LambdaRecorder.new
+
+  # provide an instance of LambdaRecorder as the global XRay.recorder
+  def self.recorder
+    @recorder
+  end
+end
+
+
+# Set `XRAY_LAMBDA_PATCH_CONFIG` before requiring `aws-xray-sdk/lambda`
+# to configure which libraries (if any) to instrument.
+#
+# By default, both `net_http` and `aws_sdk` will be instrumented
+unless defined? XRAY_LAMBDA_PATCH_CONFIG
+  XRAY_LAMBDA_PATCH_CONFIG = %I[net_http aws_sdk]
+end
+
+# Configure the XRay.recorder with Lambda specific config.
+#
+# From here, a lambda may create subsegments manually, or via
+# the instrumented libraries setup by XRAY_LAMBDA_PATCH_CONFIG
+XRay.recorder.configure(
+  patch: XRAY_LAMBDA_PATCH_CONFIG,
+  context: XRay::LambdaContext.new,
+  streamer: XRay::LambdaStreamer.new
+)

data/lib/aws-xray-sdk/lambda/facade_segment.rb

@@ -0,0 +1,109 @@
+module XRay
+  class FacadeSegment < XRay::Segment
+
+    class ImmutableEmptyCollection
+      def [](key)
+        nil
+      end
+  
+      def []=(k, v)
+        raise UnsupportedOperationError
+      end
+  
+      def update(h)
+        raise UnsupportedOperationError
+      end
+  
+      def to_h
+        {}
+      end
+    end
+
+
+    def initialize(trace_id: nil, name: nil, parent_id: nil, id: nil, sampled: true)
+      super(trace_id: trace_id, name: name, parent_id: parent_id)
+      @id = id
+      @sampled = sampled
+      @empty_collection = ImmutableEmptyCollection.new
+    end
+
+    def ready_to_send?
+      false #never send this facade. AWS Lambda has already created a Segment with these ids
+    end
+
+    #
+    #Methods from Entity that are not supported
+    #
+    def close(end_time: nil)
+      raise UnsupportedOperationError
+    end
+    def apply_status_code(status:)
+      raise UnsupportedOperationError
+    end
+    def merge_http_request(request:)
+      raise UnsupportedOperationError
+    end
+    def merge_http_response(response:)
+      raise UnsupportedOperationError
+    end
+    def add_exception(exception:, remote: false)
+      raise UnsupportedOperationError
+    end
+
+    #
+    # Mutation accessors from Entity that are not supported
+    #
+    def parent=(value)
+      raise UnsupportedOperationError
+    end
+    def throttle=(value)
+      raise UnsupportedOperationError
+    end
+    def error=(value)
+      raise UnsupportedOperationError
+    end
+    def fault=(value)
+      raise UnsupportedOperationError
+    end
+    def sampled=(value)
+      raise UnsupportedOperationError
+    end
+    def aws=(value)
+      raise UnsupportedOperationError
+    end
+    def start_time=(value)
+      raise UnsupportedOperationError
+    end
+    def end_time=(value)
+      raise UnsupportedOperationError
+    end
+
+    #
+    # Mutation accessors from Segment that are not supported
+    #
+    def origin=(value)
+      raise UnsupportedOperationError
+    end
+    def user=(value)
+      raise UnsupportedOperationError
+    end
+    def service=(value)
+      raise UnsupportedOperationError
+    end
+    
+    #
+    # Annotations are read only
+    #
+    def annotations
+      @empty_collection
+    end
+
+    #
+    # Metadata is read only
+    #
+    def metadata(namespace: :default)
+      @empty_collection
+    end
+
+  end
+end

data/lib/aws-xray-sdk/lambda/lambda_context.rb

@@ -0,0 +1,37 @@
+require_relative '../model/trace_header'
+
+module XRay
+  # LambdaContext extends the default context so that
+  # we can provide an appropriate FacadeSegment as the
+  # root context for each function invocation.
+  class LambdaContext < XRay::DefaultContext
+ 
+    TRACE_ID_ENV_VAR = '_X_AMZN_TRACE_ID'.freeze
+
+    def lambda_trace_id
+      ENV[TRACE_ID_ENV_VAR]
+    end
+
+    # If the environment trace id changes, create a new facade for that
+    # segment and make it the context's current entity
+    def check_context
+      #Create a new FacadeSegment if the _X_AMZN_TRACE_ID changes.
+      return if lambda_trace_id == @current_trace_id
+
+      @current_trace_id = lambda_trace_id
+      trace_header = XRay::TraceHeader.from_header_string(header_str: @current_trace_id)
+      segment = FacadeSegment.new(trace_id: trace_header.root,
+        parent_id: trace_header.parent_id,
+        id: trace_header.parent_id,
+        name: 'lambda_context',
+        sampled: trace_header.sampled == 1
+      )
+      store_entity(entity: segment)
+    end
+
+    def current_entity
+      check_context #ensure the FacadeSegment is current whenever the current_entity is retrieved
+      super
+    end
+  end
+end

data/lib/aws-xray-sdk/lambda/lambda_recorder.rb

@@ -0,0 +1,19 @@
+require 'aws-xray-sdk/recorder'
+
+module XRay
+  class LambdaRecorder < Recorder
+    include Logging
+
+    def begin_segment(name, trace_id: nil, parent_id: nil, sampled: nil)
+      # no-op
+      logger.warn('Cannot create segments inside Lambda function. Returning current segment.')
+      return current_segment
+    end
+    
+    def end_segment(end_time: nil)
+      # no-op
+      logger.warn('Cannot end segment inside Lambda function. Ignored.')
+      nil
+    end
+  end
+end

data/lib/aws-xray-sdk/lambda/lambda_streamer.rb

@@ -0,0 +1,9 @@
+module XRay
+  # LambdaStreamer extends DefaultStreamer so that subsegments 
+  # are sent to the XRay endpoint as they are available.
+  class LambdaStreamer < XRay::DefaultStreamer
+    def initialize
+      @stream_threshold = 1 #Stream every subsegment as it is available
+    end
+  end
+end

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/plugins/ec2.rb

@@ -1,36 +1,91 @@
-require 'open-uri'
+require 'net/http'
+require 'json'
 require 'aws-xray-sdk/logger'
 
 module XRay
   module Plugins
-    # A plugin that gets the EC2 instance-id and AZ if running on an EC2 instance.
+    # A plugin that gets the EC2 instance_id, availabiity_zone, instance_type, and ami_id if running on an EC2 instance.
     module EC2
       include Logging
 
       ORIGIN = 'AWS::EC2::Instance'.freeze
+
       # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html#instancedata-data-retrieval
-      ID_ADDR = 'http://169.254.169.254/latest/meta-data/instance-id'.freeze
-      AZ_ADDR = 'http://169.254.169.254/latest/meta-data/placement/availability-zone'.freeze
+      METADATA_BASE_URL = 'http://169.254.169.254/latest'.freeze
 
       def self.aws
-        @@aws ||= begin
-          instance_id = open(ID_ADDR, open_timeout: 1).read
-          az = open(AZ_ADDR, open_timeout: 1).read
-          {
-            ec2: {
-              instance_id: instance_id,
-              availability_zone: az
-            }
+        @@aws = {}
+        token = get_token
+        ec2_metadata = get_metadata(token)
+        @@aws = {
+          ec2: ec2_metadata
+        }
+      end
+
+
+      private # private methods
+
+      def self.get_token
+        token_uri = URI(METADATA_BASE_URL + '/api/token')
+
+        req = Net::HTTP::Put.new(token_uri)
+        req['X-aws-ec2-metadata-token-ttl-seconds'] = '60'
+        begin
+          return do_request(req)
+        rescue StandardError => e
+          Logging.logger.warn %(cannot get the IMDSv2 token due to: #{e.message}.)
+          ''
+        end
+      end
+
+      def self.get_metadata(token)
+        metadata_uri = URI(METADATA_BASE_URL + '/dynamic/instance-identity/document')
+
+        req = Net::HTTP::Get.new(metadata_uri)
+        if token != ''
+          req['X-aws-ec2-metadata-token'] = token
+        end
+
+        begin
+          metadata_json = do_request(req)
+          return parse_metadata(metadata_json)
+        rescue StandardError => e
+          Logging.logger.warn %(cannot get the ec2 instance metadata due to: #{e.message}.)
+          {}
+        end
+      end
+
+      def self.parse_metadata(json_str)
+        metadata = {}
+        data = JSON(json_str)
+        metadata['instance_id'] = data['instanceId']
+        metadata['availability_zone'] = data['availabilityZone']
+        metadata['instance_type'] = data['instanceType']
+        metadata['ami_id'] = data['imageId']
+
+        metadata
+      end
+
+      def self.do_request(request)
+        begin
+          response = Net::HTTP.start(request.uri.hostname, read_timeout: 1) { |http|
+            http.request(request)
           }
+
+          if response.code == '200'
+            return response.body
+          else
+            raise(StandardError.new('Unsuccessful response::' + response.code + '::' + response.message))
+          end
         rescue StandardError => e
-          # Two attempts in total to get EC2 metadata
+          # Two attempts in total to complete the request successfully
           @retries ||= 0
           if @retries < 1
             @retries += 1
             retry
           else
-            @@aws = {}
-            Logging.logger.warn %(can not get the ec2 instance metadata due to: #{e.message}.)
+            Logging.logger.warn %(Failed to complete request due to: #{e.message}.)
+            raise e
           end
         end
       end

data/lib/aws-xray-sdk/plugins/ecs.rb

@@ -15,7 +15,7 @@ module XRay
           { ecs: { container: Socket.gethostname } }
         rescue StandardError => e
           @@aws = {}
-          Logging.logger.warn %(can not get the ecs container hostname due to: #{e.message}.)
+          Logging.logger.warn %(cannot get the ecs container hostname due to: #{e.message}.)
         end
       end
     end

data/lib/aws-xray-sdk/plugins/elastic_beanstalk.rb

@@ -17,7 +17,7 @@ module XRay
           { elastic_beanstalk: MultiJson.load(file) }
         rescue StandardError => e
           @@aws = {}
-          Logging.logger.warn %(can not get the environment config due to: #{e.message}.)
+          Logging.logger.warn %(cannot get the environment config due to: #{e.message}.)
         end
       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.12.0'
 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.12.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2021-04-09 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
@@ -188,6 +188,11 @@ files:
 - lib/aws-xray-sdk/facets/rails/railtie.rb
 - lib/aws-xray-sdk/facets/resources/aws_params_whitelist.rb
 - lib/aws-xray-sdk/facets/resources/aws_services_whitelist.rb
+- lib/aws-xray-sdk/lambda.rb
+- lib/aws-xray-sdk/lambda/facade_segment.rb
+- lib/aws-xray-sdk/lambda/lambda_context.rb
+- lib/aws-xray-sdk/lambda/lambda_recorder.rb
+- lib/aws-xray-sdk/lambda/lambda_streamer.rb
 - lib/aws-xray-sdk/logger.rb
 - lib/aws-xray-sdk/model/annotations.rb
 - lib/aws-xray-sdk/model/cause.rb
@@ -239,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: AWS X-Ray SDK for Ruby