datadog-lambda 1.10.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19e8514981117ae88bdaa4d17f7a3a5db19595d39336100ac581e0cf330be1d
-  data.tar.gz: 5d2c0ef21fb1fb0d33759f0b3430daebe88100e4f626b20f6dd9512739c6b62c
+  metadata.gz: f0299ef3a855a65e1b2bd066dca1bc81421d6173118775a8be556f497762a7e5
+  data.tar.gz: 8193383951539a3db0043f10141b228ba4dd51ee9f806d2f5e1570e4c58a2306
 SHA512:
-  metadata.gz: 6cab42dc833290ea7742def1dda6e4bb4a89ebb7f90240e053cdbcd8f8a338fbaaa98069dc48fdc6d823fb087a90c946c097bd012014e31b84629995f296fe0a
-  data.tar.gz: 4092f19c6b544307e2a82492fd13ce2241d2e0820df2b81da53a6adbd4ec3da0aa9b6d04a56c528b822f93df36e8122985d1a5c0584773d867c3f787feb46eba
+  metadata.gz: 22e350877b7fb4fc6ace6523c67d4e6283f4acc2b5af6db6393f86a3168b66c8a471b3365eb9c07ca8e995972afc29ea4c6c6eb1e95114cc7887601d221efbb9
+  data.tar.gz: 19650c82c373aa12c399b5196d0b6f6d5713451b68e26fe502bbde8cd6395972e38c37a79c90e3cfe41d2866d56de297806e4a674c70b72fe2d0a5b9f3e4c8c4

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

@@ -56,17 +56,19 @@ module Datadog
       private
 
       def get_option_tags(request_context:, cold_start:)
-        function_arn = request_context.invoked_function_arn.downcase
+        function_arn = request_context.invoked_function_arn.to_s.downcase
         tk = function_arn.split(':')
         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,
             request_id: request_context.aws_request_id,
-            resource_names: request_context.function_name
+            functionname: function_name.nil? || function_name.empty? ? nil : function_name.downcase,
+            resource_names: function_name
           }
         }
         options

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

@@ -30,7 +30,6 @@ module Datadog
     # NetExtensions contains patches which add tracing context to http calls
     module NetExtensions
       def request(req, body = nil, &block)
-        logger = Datadog::Utils.logger
         begin
           context = Datadog::Trace.current_trace_context(
             Datadog::Trace.trace_context
@@ -39,7 +38,7 @@ module Datadog
           req = add_ctx_to_req(req, context)
         rescue StandardError => e
           trace = e.backtrace.join("\n ")
-          logger.debug(
+          Datadog::Utils.logger.debug(
             "couldn't add tracing context #{context} to request #{e}:\n#{trace}"
           )
         end
@@ -53,7 +52,7 @@ module Datadog
           context[:sample_mode]
         req[Datadog::Trace::DD_PARENT_ID_HEADER.to_sym] = context[:parent_id]
         req[Datadog::Trace::DD_TRACE_ID_HEADER.to_sym] = context[:trace_id]
-        logger.debug("added context #{context} to request")
+        Datadog::Utils.logger.debug("added context #{context} to request")
         req
       end
     end

data/lib/datadog/lambda/version.rb

@@ -12,7 +12,7 @@ module Datadog
   module Lambda
     module VERSION
       MAJOR = 1
-      MINOR = 10
+      MINOR = 14
       PATCH = 0
       PRE = nil
 

data/lib/datadog/lambda.rb

@@ -14,6 +14,7 @@ require 'datadog/lambda/utils/logger'
 require 'datadog/lambda/trace/patch_http'
 require 'json'
 require 'time'
+require 'datadog/lambda/version'
 
 module Datadog
   # Instruments AWS Lambda functions with Datadog distributed tracing and
@@ -101,7 +102,7 @@ module Datadog
     # @return [hash] a hash of the enhanced metrics tags
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def self.gen_enhanced_tags(context)
-      arn_parts = context.invoked_function_arn.split(':')
+      arn_parts = context.invoked_function_arn.to_s.split(':')
       # Check if we have an alias or version
       function_alias = arn_parts[7].nil? ? nil : arn_parts[7]
 
@@ -112,8 +113,14 @@ module Datadog
         memorysize: context.memory_limit_in_mb,
         cold_start: @is_cold_start,
         runtime: "Ruby #{RUBY_VERSION}",
-        resource: context.function_name
+        resource: context.function_name,
+        datadog_lambda: Datadog::Lambda::VERSION::STRING.to_sym
       }
+      begin
+        tags[:dd_trace] = Gem.loaded_specs['ddtrace'].version
+      rescue StandardError
+        Datadog::Utils.logger.debug 'dd-trace unavailable'
+      end
       # If we have an alias...
       unless function_alias.nil?
         # If the alis version is $Latest, drop the $ for ddog tag convention.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -118,7 +118,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Instruments your Ruby AWS Lambda functions with Datadog
 test_files: []