aws-xray-sdk 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ed0048518918a1d9894a88939b87fde9fdb313
-  data.tar.gz: c998bf9b23dc468147c7846b6b50438c1da13b89
+  metadata.gz: 9c1ab8a4e8310389271dc8ea0fd7494f067f709d
+  data.tar.gz: ac7ef8e89a9123cb9d7e9f77ba63d663c55d56d6
 SHA512:
-  metadata.gz: 942a1296ab40b2e3f5727edf7a685fb40e0254766f3c8b388de1a08cd0e67de361237d788245aff246139c6ce8d3eb8f83b584546dc3a180a9f945a181660f47
-  data.tar.gz: 8f3a2c933526caf555116dbb2ea6d9b3f6056a22e42ab82ed2f5add6df82eab3e0b501f4bec02d97353d5e092e9c797dcd8a69b544202d6ea8c35d44dc994377
+  metadata.gz: a05a1d2a8c8a18df8503ac1943ff713c6e65a5991cba6790e66273e63b70748d726f8173ac2427d00808fdeb2519e63aa60ce8a13c22111652fa7b504d100c5c
+  data.tar.gz: 2e3f7eb44a7330d971dbbe562a6786d2aedb9a7319982c71c8cd7143c3ebe2d35c30a4dcdd5489e689ae7b26fe1dc6230a0dc82d8e727e9c5699f03378e73d39

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

@@ -30,9 +30,15 @@ module XRay
         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)
-        # Do not trace requests to xray or aws lambda runtime
-        if xray_sampling_request?(req) || lambda_runtime_request?
+        # 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/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 %(can not 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 %(can not 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/version.rb

@@ -1,3 +1,3 @@
 module XRay
-  VERSION = '0.11.4'
+  VERSION = '0.11.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray-sdk
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-xray