datadog-lambda 0.9.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ddc462886c4a35ba66d327ebbc2be17c403b2d47cab973fa06e05d6df3d2d1
-  data.tar.gz: b90918aa8b2372e2149e4b084b5ee97d9a8268ebff7ebb83a0e1a6a3751488c1
+  metadata.gz: ca6cf663eccb791efbd864d07e484ff8af81f167c287031168f5b2c73cf6a2be
+  data.tar.gz: 60ec7b7457d071b32c6f00460b0b0311c01353deb116aafd48410176f6cc2e08
 SHA512:
-  metadata.gz: 71b82b6b3ec47c17fff39fb4f3bfd40c6d2ef7ba477baa82de83a87bc710fc0114fa7aadc84153908db40de6af8437248e9634b8838a6d60af54e44fefbe8e29
-  data.tar.gz: ca9afd36577caa6b5efef5663add0b37e32bfa953b55ee2909bc2f104a139e0a6478fcddcdde67687537672ae88b2d50f81b3d79c4aefa2967c29cae4faf367b
+  metadata.gz: 1eb9090b949bbb8cd2ff4a94ee73d9dfba070268756edc511d471140e6d2f147ea59f462bfdfdc8f29b6b946fe29e8c247f60ee12ffd7f200825447ff78d1395
+  data.tar.gz: d91a50fb6ebe4d3c2cfc3146d25be43589bf06d36ea042f0c7e3d5493b8c5d15c641b8cacde3668d88e62b720a7687c876bee2d271c336f9b941a1326194c1e9

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
@@ -37,6 +38,7 @@ module Datadog
         c.tracer writer: Datadog::SyncWriter.new(
           transport: Datadog::Transport::IO.default
         )
+        c.tags = { "_dd.origin": 'lambda' }
         yield(c) if block_given?
       end
     end
@@ -68,7 +70,6 @@ module Datadog
     # Gets the current tracing context
     def self.trace_context
       context = Hash[Datadog::Trace.trace_context]
-      context.delete(:source)
       context
     end
 
@@ -82,13 +83,18 @@ module Datadog
       raise 'value must be a number' unless value.is_a?(Numeric)
 
       time ||= Time.now
-      tag_list = ['dd_lambda_layer:datadog-ruby25']
+      time_ms = time.to_f.to_i
+
+      tag_list = ["dd_lambda_layer:datadog-ruby#{dd_lambda_layer_tag}"]
       tags.each do |tag|
         tag_list.push("#{tag[0]}:#{tag[1]}")
       end
-      time_ms = time.to_f.to_i
-      metric = { e: time_ms, m: name, t: tag_list, v: value }.to_json
-      puts metric
+      metric = { e: time_ms, m: name, t: tag_list, v: value }
+      puts metric.to_json
+    end
+
+    def self.dd_lambda_layer_tag
+      RUBY_VERSION[0, 3].tr('.', '')
     end
 
     # Generate tags for enhanced metrics
@@ -107,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.

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

@@ -41,8 +41,11 @@ module Datadog
           request_context: request_context,
           cold_start: cold_start
         )
-        options[:resource] = @handler_name
-        options[:service] =  @function_name
+        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[:service] = 'aws.lambda'
         options[:span_type] = 'serverless'
         Datadog::Trace.apply_datadog_trace_context(Datadog::Trace.trace_context)
         Datadog::Trace.wrap_datadog(options) do
@@ -53,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,25 +30,31 @@ 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
           )
 
-          req[Datadog::Trace::DD_SAMPLING_PRIORITY_HEADER.to_sym] =
-            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")
+          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
         super(req, body, &block)
       end
+
+      private
+
+      def add_ctx_to_req(req, context)
+        req[Datadog::Trace::DD_SAMPLING_PRIORITY_HEADER.to_sym] =
+          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]
+        Datadog::Utils.logger.debug("added context #{context} to request")
+        req
+      end
     end
   end
 end

data/lib/datadog/lambda/version.rb

@@ -11,8 +11,8 @@
 module Datadog
   module Lambda
     module VERSION
-      MAJOR = 0
-      MINOR = 9
+      MAJOR = 1
+      MINOR = 13
       PATCH = 0
       PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ files:
 - lib/datadog/lambda/trace/xray.rb
 - lib/datadog/lambda/utils/logger.rb
 - lib/datadog/lambda/version.rb
-homepage: https://github.com/DataDog/datadog-lambda-layer-rb
+homepage: https://github.com/DataDog/datadog-lambda-rb
 licenses:
 - Apache-2.0
 metadata:
@@ -133,7 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Instruments your Ruby AWS Lambda functions with Datadog