aws-xray-sdk 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7519a013ac4db9cf9536638f8abc1d77dc71c4a7edbb5dbc2b43bfc6f1ab3296
-  data.tar.gz: 58567280e37b1e041720d7cf1c86f1b55d38e992a2e6f19444950bc491d2ef7a
+  metadata.gz: d66dc2f94d7c560ccfcadf771798ece570a3adb37e14cbb6ee5df2c7c21e4493
+  data.tar.gz: 8a3a1bb4a8a401eaa76d5a5cd5f9147ede245749d4178d5e034e73beddd66a1d
 SHA512:
-  metadata.gz: 38640d9e8aa2bf1f2328b26670878056713e9e916934ade89ca4ef1132b998f3544b89e01ae3fa7ab619582e2db4487719dd132228c9a51273e7bc27e91cca06
-  data.tar.gz: b8d0aa1b3f0bc098cdd32e4f61ab810b4c1beee48aec785481edaf365c74174eda5a136e271b5b37c5aaed8ae6f8a74daeb2191f220d381520fe4ac6352fc03d
+  metadata.gz: ee957cc6062a09d99c3f2d2b009c3336b616efabedfba3f5f4aa61a65f1300d4bcb73a21d73c8d7056499ae72edf2212e9a45fa98afe05a844e6ea7eb6921622
+  data.tar.gz: 649c3ec1ecb12015f6ab6c8f7180d7569d97c21e704ee597c6b6c22297dcaa2517850f20afda61622818f34084eec77e661d70b435bf6cd80aedda976151c897

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

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

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

@@ -345,6 +345,11 @@ module XRay
               request_parameters: %I[
                 topic_arn
               ]
+            },
+            publish_batch: {
+              request_parameters: %I[
+                topic_arn
+              ]
             }
           }
         }

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

@@ -155,7 +155,8 @@ module XRay
       if (a = annotations.to_h) && !a.empty?
         h[:annotations] = a
       end
-      if (m = @metadata) && !m.to_h.empty?
+      # make sure @metadata is defined before evaluating it, to prevent warning `variable @metadata not initialized`
+      if (defined?(@metadata) && m = @metadata) && !m.to_h.empty?
         h[:metadata] = m.to_h
       end
 

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

@@ -3,19 +3,82 @@ require 'aws-xray-sdk/logger'
 
 module XRay
   module Plugins
-    # Due to lack of ECS container metadata service, the only host information
-    # available is the host name.
     module ECS
       include Logging
 
       ORIGIN = 'AWS::ECS::Container'.freeze
 
+      # Only compatible with v4!
+      # The v3 metadata url does not contain cloudwatch informations
+      METADATA_ENV_KEY = 'ECS_CONTAINER_METADATA_URI_V4'
+
       def self.aws
-        @@aws ||= begin
-          { ecs: { container: Socket.gethostname } }
+        metadata = get_metadata()
+
+        begin
+          metadata[:ecs][:container] = Socket.gethostname
         rescue StandardError => e
-          @@aws = {}
           Logging.logger.warn %(cannot get the ecs container hostname due to: #{e.message}.)
+          metadata[:ecs][:container] = nil
+        end
+
+        @@aws = {
+          ecs: metadata[:ecs],
+          cloudwatch_logs: metadata[:cloudwatch_logs]
+        }
+      end
+
+      private
+
+      def self.get_metadata()
+        begin
+          metadata_uri = URI(ENV[METADATA_ENV_KEY])
+          req = Net::HTTP::Get.new(metadata_uri)
+          metadata_json = do_request(req)
+          return parse_metadata(metadata_json)
+        rescue StandardError => e
+          Logging.logger.warn %(cannot get the ecs instance metadata due to: #{e.message}. Make sure you are using Fargate platform version >=1.4.0)
+          { ecs: {}, cloudwatch_logs: {} }
+        end
+      end
+
+      def self.parse_metadata(json_str)
+        data = JSON(json_str)
+
+        metadata = {
+          ecs: {
+            container_arn: data['ContainerARN'],
+          },
+          cloudwatch_logs: {
+            log_group: data["LogOptions"]['awslogs-group'],
+            log_region: data["LogOptions"]['awslogs-region'],
+            arn: data['ContainerARN']
+          }
+        }
+        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 complete the request successfully
+          @retries ||= 0
+          if @retries < 1
+            @retries += 1
+            retry
+          else
+            Logging.logger.warn %(Failed to complete request due to: #{e.message}.)
+            raise e
+          end
         end
       end
     end

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

@@ -1,3 +1,3 @@
 module XRay
-  VERSION = '0.13.0'
+  VERSION = '0.15.0'
 end

metadata

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