datadog-lambda 2.21.0 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c867a4e0858e0ba773829993e4c60b2d84b26f8afe4e69a766ac75f6ef454c5
-  data.tar.gz: feaa85e2d5d998b32602b74958792a656f692eab4950fdc7da0cccb7d12542bd
+  metadata.gz: d7d5f92e39c4579b9ac265f60f354a128a2f02c348e98127142081b3593ea28c
+  data.tar.gz: 19821c8a70157f6738a9a47dd4ccf3d69ef853322e261e15596af68041eb8959
 SHA512:
-  metadata.gz: cd5062d00ae5f88a8c5021f6c76c3b87fa9236d035508e04dbd33113cf51a5b7bec006060ab6dc12ea27da46feaf78ae3eb98d9bd4c907b5a972c7176ca40ee7
-  data.tar.gz: 823cc2efc44cfefd3e0829ca038e966f6b999fd5c2648131a91a2b8b805dbd8ae5aeb5cdba1c14d3c8579aafffb719679b8e1bdd60306f37c80c3bc176f154d2
+  metadata.gz: 48c653819b1eb3f353a183820310381e7ee5e67691d79988572bb9482054e74c71e683f359ce051d28c1239a0b8edd07c530e986f1f734b435b3d413a1d2f786
+  data.tar.gz: 3ce2f6c46406aaa8557f3a7ea01eeb3b62516edc0d4ee1d518141a444932dcdda6a0ad358a0c1a2c861be14a1d852602548074064552b9d89b902f141c3fd62a

data/lib/datadog/lambda/trace/constants.rb

@@ -17,6 +17,7 @@ module Datadog
     DD_TRACE_ID_HEADER = 'x-datadog-trace-id'
     DD_PARENT_ID_HEADER = 'x-datadog-parent-id'
     DD_SAMPLING_PRIORITY_HEADER = 'x-datadog-sampling-priority'
+    DD_ORIGIN = 'x-datadog-origin'
     DD_XRAY_SUBSEGMENT_NAME = 'datadog-metadata'
     DD_XRAY_SUBSEGMENT_KEY = 'trace'
     DD_XRAY_SUBSEGMENT_NAMESPACE = 'datadog'

data/lib/datadog/lambda/trace/ddtrace.rb

@@ -10,15 +10,15 @@ end
 module Datadog
   # TraceListener tracks tracing context information
   module Trace
-    class <<self
+    class << self
       def apply_datadog_trace_context(context)
         unless context.nil?
           trace_id = context[:trace_id].to_i
           span_id = context[:parent_id].to_i
           sampling_priority = context[:sample_mode]
           trace_digest = Datadog::Tracing::TraceDigest.new(
-            span_id: span_id,
-            trace_id: trace_id,
+            span_id:,
+            trace_id:,
             trace_sampling_priority: sampling_priority
           )
           Datadog::Tracing.continue_trace!(trace_digest)

data/lib/datadog/lambda/trace/listener.rb

@@ -32,8 +32,8 @@ module Datadog
         Datadog::Trace.trace_context = trace_context
         Datadog::Utils.logger.debug "extracted trace context #{trace_context}"
         options = get_option_tags(
-          request_context: request_context,
-          cold_start: cold_start
+          request_context:,
+          cold_start:
         )
         context = Datadog::Trace.trace_context
         source = context[:source] if context
@@ -42,13 +42,18 @@ module Datadog
         options[:service] = 'aws.lambda'
         options[:span_type] = 'serverless'
         Datadog::Trace.apply_datadog_trace_context(Datadog::Trace.trace_context)
+
+        trace_digest = Datadog::Utils.send_start_invocation_request(event:)
+        # Only continue trace from a new one if it exist, or else,
+        # it will create a new trace, which is not ideal here.
+        options[:continue_from] = trace_digest if trace_digest
+
         @trace = Datadog::Tracing.trace('aws.lambda', **options)
-        Datadog::Utils.send_start_invocation_request(event: event)
       end
       # rubocop:enable Metrics/AbcSize
 
       def on_end(response:)
-        Datadog::Utils.send_end_invocation_request(response: response)
+        Datadog::Utils.send_end_invocation_request(response:)
         @trace&.finish
       end
 
@@ -60,17 +65,16 @@ module Datadog
         function_arn = tk.length > 7 ? tk[0, 7].join(':') : function_arn
         function_version = tk.length > 7 ? tk[7] : '$LATEST'
         function_name = request_context.function_name
-        options = {
+        {
           tags: {
-            cold_start: cold_start,
-            function_arn: function_arn,
-            function_version: function_version,
+            cold_start:,
+            function_arn:,
+            function_version:,
             request_id: request_context.aws_request_id,
             functionname: function_name.nil? || function_name.empty? ? nil : function_name.downcase,
             resource_names: function_name
           }
         }
-        options
       end
     end
   end

data/lib/datadog/lambda/trace/xray.rb

@@ -30,9 +30,9 @@ module Datadog
           return nil
         end
         {
-          trace_id: trace_id,
-          parent_id: parent_id,
-          sample_mode: sample_mode,
+          trace_id:,
+          parent_id:,
+          sample_mode:,
           source: SOURCE_XRAY
         }
       end
@@ -95,7 +95,7 @@ module Datadog
         trace_id, parent_id, sampled = header.split(';')
                                              .map { |v| parse_assignment(v) }
 
-        return nil if trace_id.nil? || parent_id.nil? || sampled. nil?
+        return nil if trace_id.nil? || parent_id.nil? || sampled.nil?
 
         {
           xray_trace_id: trace_id,

data/lib/datadog/lambda/utils/extension.rb

@@ -8,6 +8,7 @@
 # Copyright 2023 Datadog, Inc.
 #
 require 'net/http'
+require 'datadog/tracing/contrib/http/distributed/fetcher'
 
 module Datadog
   # Utils contains utility functions shared between modules
@@ -21,6 +22,11 @@ module Datadog
     START_INVOCATION_URI = URI(EXTENSION_BASE_URL + START_INVOCATION_PATH).freeze
     END_INVOCATION_URI = URI(EXTENSION_BASE_URL + END_INVOCATION_PATH).freeze
 
+    # Internal communications use Datadog tracing headers
+    PROPAGATOR = Tracing::Distributed::Datadog.new(
+      fetcher: Tracing::Contrib::HTTP::Distributed::Fetcher
+    )
+
     def self.extension_running?
       return @is_extension_running unless @is_extension_running.nil?
 
@@ -35,11 +41,10 @@ module Datadog
       return unless extension_running?
 
       response = Net::HTTP.post(START_INVOCATION_URI, event.to_json, request_headers)
+      # Add origin, since tracer expects it for extraction
+      response[Datadog::Trace::DD_ORIGIN] = 'lambda'
 
-      trace_digest = Tracing::Propagation::HTTP.extract(response)
-      # Only continue trace from a new one if it exist, or else,
-      # it will create a new trace, which is not ideal here.
-      Tracing.continue_trace!(trace_digest) if trace_digest
+      PROPAGATOR.extract(response)
     rescue StandardError => e
       Datadog::Utils.logger.debug "failed on start invocation request to extension: #{e}"
     end
@@ -51,8 +56,9 @@ module Datadog
       request.body = response.to_json
       request[Datadog::Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST] = 1
 
-      trace = Datadog::Tracing.active_trace
-      Tracing::Propagation::HTTP.inject!(trace, request)
+      trace_digest = Datadog::Tracing.active_trace&.to_digest
+
+      PROPAGATOR.inject!(trace_digest, request)
       Net::HTTP.start(END_INVOCATION_URI.host, END_INVOCATION_URI.port) do |http|
         http.request(request)
       end

data/lib/datadog/lambda/utils/logger.rb

@@ -14,7 +14,7 @@ module Datadog
   # Utils contains utility functions shared between modules
   module Utils
     def self.logger
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new($stdout)
     end
 
     def self.update_log_level

data/lib/datadog/lambda/version.rb

@@ -12,7 +12,7 @@ module Datadog
   module Lambda
     module VERSION
       MAJOR = 2
-      MINOR = 21
+      MINOR = 23
       PATCH = 0
       PRE = nil
 

data/lib/datadog/lambda.rb

@@ -61,7 +61,7 @@ module Datadog
       record_enhanced('invocations', context)
       begin
         cold = @is_cold_start
-        @listener&.on_start(event: event, request_context: context, cold_start: cold)
+        @listener&.on_start(event:, request_context: context, cold_start: cold)
         @response = block.call
       rescue StandardError => e
         record_enhanced('errors', context)
@@ -88,7 +88,7 @@ module Datadog
       raise 'name must be a string' unless name.is_a?(String)
       raise 'value must be a number' unless value.is_a?(Numeric)
 
-      @metrics_client.distribution(name, value, time: time, **tags)
+      @metrics_client.distribution(name, value, time:, **tags)
     end
 
     def self.dd_lambda_layer_tag
@@ -129,7 +129,7 @@ module Datadog
           tags[:executedversion] = context.function_version
         end
         # Append the alias to the resource tag
-        tags[:resource] = context.function_name + ':' + function_alias
+        tags[:resource] = "#{context.function_name}:#{function_alias}"
       end
 
       tags
@@ -196,7 +196,7 @@ module Datadog
         handler_name: handler,
         function_name: function,
         patch_http: @patch_http,
-        merge_xray_traces: merge_xray_traces
+        merge_xray_traces:
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.6
 - !ruby/object:Gem::Dependency
   name: ddtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.23.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.23.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +162,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,15 +170,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.18
+signing_key:
 specification_version: 4
 summary: Instruments your Ruby AWS Lambda functions with Datadog
 test_files: []