datadog-lambda 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c867a4e0858e0ba773829993e4c60b2d84b26f8afe4e69a766ac75f6ef454c5
-  data.tar.gz: feaa85e2d5d998b32602b74958792a656f692eab4950fdc7da0cccb7d12542bd
+  metadata.gz: 1ff16978e295234189602cab59d2c4f2adbff91edc9bcb9a52bbde91fb744369
+  data.tar.gz: 4e89c094a7c0fb2e6161f7179266831df23dd4f665ccaafcc9b1d233fcce0860
 SHA512:
-  metadata.gz: cd5062d00ae5f88a8c5021f6c76c3b87fa9236d035508e04dbd33113cf51a5b7bec006060ab6dc12ea27da46feaf78ae3eb98d9bd4c907b5a972c7176ca40ee7
-  data.tar.gz: 823cc2efc44cfefd3e0829ca038e966f6b999fd5c2648131a91a2b8b805dbd8ae5aeb5cdba1c14d3c8579aafffb719679b8e1bdd60306f37c80c3bc176f154d2
+  metadata.gz: 3738d873ac92162f632b6457ad1d188397eec4a3a59d9a523fcdf9b2f53eadd559f92f388f8d5d4a96da6cc38024124efb828b714c0cd44ed050a347eb246150
+  data.tar.gz: 37cfd0a36ae52012ebdc14cab31b1d22b20e968413ef136010fa21f0ee6be2b965257b2066d5d93ed7c3eabdf9989a2a40c84e5341f48aa1bb1ae0e0cffb29d9

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/listener.rb

@@ -42,8 +42,13 @@ 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: 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
 

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement