datadog-lambda 2.23.1 → 3.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cddc5701e2fd24ab4ae01089f2eb7a1beee75da183f2540060639a898279637
-  data.tar.gz: 94ba04342ac432d6ab95d40bbfbbbfb44b2e186a84c8571e1e2c93514448b29b
+  metadata.gz: 95cfdc9d348ccc91adda2193dc1c42c6c7533154b2c845a9f7517ca8f35e7d45
+  data.tar.gz: 9770541d230535fd72916d237d647c63447ac5c0b563589dd011e0a9b1199336
 SHA512:
-  metadata.gz: 784af632d4b1a84667eb6ff68a32cea62c92d3861237bc414eee868f6c39c9d257153330d691eb53c6e496ce5dadc366e18f03b4e79550b3ded5718692b49d64
-  data.tar.gz: 720cfbdba885607139157881b78a3ce398368e96828d896b9782d57a5d75b45f8fe27e348f097732db65e36c7f5c250cc6160ae5db4ffebff9e7d6de1d8aa001
+  metadata.gz: 13dec18ab59eb3bea0a73a5a674d58350e008fe6bb9e4fbaae3952da0efc8a8607dc919bc0078ead238cb41844867045c29ba8258f1ebe1a8e5bae8d5390626d
+  data.tar.gz: edeb3616cd4a0d2a43183113069b5ed334930e34ddbb639ad5eead60e2c4593b6ca50289da301a498f933c0f703b2bfd91f9b79be74b7591176f765ef43c1f1a

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# `ddtrace`` is an optional dependency for the ruby package
+# `datadog`` is an optional dependency for the ruby package
 begin
-  require 'ddtrace'
+  require 'datadog'
 rescue LoadError
-  Datadog::Utils.logger.debug 'dd-trace unavailable'
+  Datadog::Utils.logger.debug 'datadog unavailable'
 end
 
 module Datadog

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

@@ -38,10 +38,9 @@ module Datadog
         context = Datadog::Trace.trace_context
         source = context[:source] if context
         options[:tags]['_dd.parent_source'] = source if source && source != 'ddtrace'
-        options[:resource] = @function_name
+        options[:resource] = 'dd-tracer-serverless-span'
         options[:service] = 'aws.lambda'
-        options[:span_type] = 'serverless'
-        Datadog::Trace.apply_datadog_trace_context(Datadog::Trace.trace_context)
+        options[:type] = 'serverless'
 
         trace_digest = Datadog::Utils.send_start_invocation_request(event:)
         # Only continue trace from a new one if it exist, or else,
@@ -49,11 +48,13 @@ module Datadog
         options[:continue_from] = trace_digest if trace_digest
 
         @trace = Datadog::Tracing.trace('aws.lambda', **options)
+
+        Datadog::Trace.apply_datadog_trace_context(Datadog::Trace.trace_context)
       end
       # rubocop:enable Metrics/AbcSize
 
       def on_end(response:)
-        Datadog::Utils.send_end_invocation_request(response:)
+        Datadog::Utils.send_end_invocation_request(response:, span_id: @trace.id)
         @trace&.finish
       end
 

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

@@ -19,6 +19,9 @@ module Datadog
     START_INVOCATION_PATH = '/lambda/start-invocation'
     END_INVOCATION_PATH = '/lambda/end-invocation'
 
+    DD_SPAN_ID_HEADER = 'x-datadog-span-id'
+    DD_PARENT_ID_HEADER = Datadog::Tracing::Distributed::Datadog::PARENT_ID_KEY
+
     START_INVOCATION_URI = URI(EXTENSION_BASE_URL + START_INVOCATION_PATH).freeze
     END_INVOCATION_URI = URI(EXTENSION_BASE_URL + END_INVOCATION_PATH).freeze
 
@@ -49,7 +52,8 @@ module Datadog
       Datadog::Utils.logger.debug "failed on start invocation request to extension: #{e}"
     end
 
-    def self.send_end_invocation_request(response:)
+    # rubocop:disable Metrics/AbcSize
+    def self.send_end_invocation_request(response:, span_id:)
       return unless extension_running?
 
       request = Net::HTTP::Post.new(END_INVOCATION_URI)
@@ -59,12 +63,20 @@ module Datadog
       trace_digest = Datadog::Tracing.active_trace&.to_digest
 
       PROPAGATOR.inject!(trace_digest, request)
+      # Propagator doesn't inject span_id, so we do it manually
+      # It is needed for the extension to take this span id
+      request[DD_SPAN_ID_HEADER] = span_id.to_s
+      # Remove Parent ID if it is the same as the Span ID
+      request.delete(DD_PARENT_ID_HEADER) if request[DD_PARENT_ID_HEADER] == span_id.to_s
+      Datadog::Utils.logger.debug "End invocation request headers: #{request.to_hash}"
+
       Net::HTTP.start(END_INVOCATION_URI.host, END_INVOCATION_URI.port) do |http|
         http.request(request)
       end
     rescue StandardError => e
       Datadog::Utils.logger.debug "failed on end invocation request to extension: #{e}"
     end
+    # rubocop:enable Metrics/AbcSize
 
     def self.request_headers
       {

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

@@ -14,21 +14,19 @@ module Datadog
   # Utils contains utility functions shared between modules
   module Utils
     def self.logger
-      @logger ||= Logger.new($stdout)
-    end
-
-    def self.update_log_level
-      log_level = (ENV['DD_LOG_LEVEL'] || 'error').downcase
-      logger.level = case log_level
-                     when 'debug'
-                       Logger::DEBUG
-                     when 'info'
-                       Logger::INFO
-                     when 'warn'
-                       Logger::WARN
-                     else
-                       Logger::ERROR
-                     end
+      @logger ||= Logger.new($stderr).tap do |logger|
+        log_level = (ENV['DD_LOG_LEVEL'] || 'error').downcase
+        logger.level = case log_level
+                       when 'debug'
+                         Logger::DEBUG
+                       when 'info'
+                         Logger::INFO
+                       when 'warn'
+                         Logger::WARN
+                       else
+                         Logger::ERROR
+                       end
+      end
     end
   end
 end

data/lib/datadog/lambda/version.rb

@@ -11,9 +11,9 @@
 module Datadog
   module Lambda
     module VERSION
-      MAJOR = 2
-      MINOR = 23
-      PATCH = 1
+      MAJOR = 3
+      MINOR = 24
+      PATCH = 0
       PRE = nil
 
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/datadog/lambda.rb

@@ -56,7 +56,6 @@ module Datadog
     # @param context [Object] lambda context
     # @param block [Proc] implementation of the handler function.
     def self.wrap(event, context, &block)
-      Datadog::Utils.update_log_level
       @listener ||= initialize_listener
       record_enhanced('invocations', context)
       begin
@@ -115,9 +114,9 @@ module Datadog
         datadog_lambda: Datadog::Lambda::VERSION::STRING.to_sym
       }
       begin
-        tags[:dd_trace] = Gem.loaded_specs['ddtrace'].version
+        tags[:dd_trace] = Gem.loaded_specs['datadog'].version
       rescue StandardError
-        Datadog::Utils.logger.debug 'dd-trace unavailable'
+        Datadog::Utils.logger.debug 'datadog unavailable'
       end
       # If we have an alias...
       unless function_alias.nil?
@@ -188,7 +187,7 @@ module Datadog
 
       # Only initialize listener if Tracing enabled.
       unless Datadog::Tracing.enabled?
-        Datadog::Utils.logger.debug 'dd-trace unavailable'
+        Datadog::Utils.logger.debug 'datadog unavailable'
         return nil
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 2.23.1
+  version: 3.24.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.16.0
 - !ruby/object:Gem::Dependency
-  name: ddtrace
+  name: datadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.3
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement