datadog-lambda 0.6.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ccd6671ef8a47079a6553b3149d3cb7ddc352dcd31314c76705d1c4222999a7
-  data.tar.gz: 0ab7bbfa7db1c8f016ba5b5c4b61948baff762f1e385be6f745d25df6da86492
+  metadata.gz: a8e991dcdf4df850e5a9a56fe9f402f94fd1a1c4d9e5558cf9d1eff868331472
+  data.tar.gz: 7e5d7ea704e3ee327496b9568e10ec620e77e48ad56eddf4059b59b16b7fcbd3
 SHA512:
-  metadata.gz: '0059d491bfd95fb3512e97b241490866758ad8cdfae5b26cee5e0927c58a6be48736054279c2aed5eaef621a65206ed3370f12a3f13f55ba416594efad6a571d'
-  data.tar.gz: 1dd458bace795179011bebdc1c57be77a0641b71ad25bae995bccfbefd87853bceab9ab1f659744aabe17fd966c8c48cede35921f80cf051ebf0cc116f042dac
+  metadata.gz: '081dccfc9c8e566e63d9a29f8cc28d8db0f66f8b5bdd0137bcadf618e277be28408225c5d874400db1cd20173e5623f95619c82bea703ea7c9f2adb6cef2f0a5'
+  data.tar.gz: 60ea065a6e8237182ff24872904c7ebb97262604763cbeea8977f7648e375f6304aab816bc1f2ad25ea7d298ee5dcfd280e5abfef8af09e6c1634c1055e12609

data/lib/datadog/lambda.rb

@@ -7,12 +7,14 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2019 Datadog, Inc.
 #
+# rubocop:disable Metrics/ModuleLength
 
 require 'datadog/lambda/trace/listener'
 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
@@ -36,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
@@ -67,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
 
@@ -81,34 +83,65 @@ 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
     # @param context [Object] https://docs.aws.amazon.com/lambda/latest/dg/ruby-context.html
     # @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(':')
-      {
+      # Check if we have an alias or version
+      function_alias = arn_parts[7].nil? ? nil : arn_parts[7]
+
+      tags = {
         functionname: context.function_name,
         region: arn_parts[3],
         account_id: arn_parts[4],
         memorysize: context.memory_limit_in_mb,
         cold_start: @is_cold_start,
-        runtime: "Ruby #{RUBY_VERSION}"
+        runtime: "Ruby #{RUBY_VERSION}",
+        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.
+        if function_alias.start_with?('$')
+          function_alias[0] = ''
+          # If the alias is not a version number add the executed version tag
+        elsif !/\A\d+\z/.match(function_alias)
+          tags[:executedversion] = context.function_version
+        end
+        # Append the alias to the resource tag
+        tags[:resource] = context.function_name + ':' + function_alias
+      end
+
+      tags
     rescue StandardError => e
       Datadog::Utils.logger.error 'Unable to parse Lambda context' \
       "#{context}: #{e}"
       {}
     end
 
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     # Format and add tags to enhanced metrics
     # This method wraps the metric method, checking the DD_ENHANCED_METRICS
     # environment variable, adding 'aws.lambda.enhanced' to the metric name,
@@ -116,13 +149,13 @@ module Datadog
     # @param metric_name [String] basic name of the metric
     # @param context [Object] AWS Ruby Lambda Context
     # @return [boolean] false if the metric was not added for some reason,
-    #   true otherwise (for ease of testing)
+    #   true otherwise (for ease of testing
 
     def self.record_enhanced(metric_name, context)
       return false unless do_enhanced_metrics?
 
       etags = gen_enhanced_tags(context)
-      metric("aws.lambda.enhanced.#{metric_name}", 1, etags)
+      metric("aws.lambda.enhanced.#{metric_name}", 1, **etags)
       true
     end
 
@@ -131,7 +164,7 @@ module Datadog
     # enhanced metrics
     def self.do_enhanced_metrics?
       dd_enhanced_metrics = ENV['DD_ENHANCED_METRICS']
-      return false if dd_enhanced_metrics.nil?
+      return true if dd_enhanced_metrics.nil?
 
       dd_enhanced_metrics.downcase == 'true'
     end
@@ -153,3 +186,4 @@ module Datadog
     end
   end
 end
+# rubocop:enable Metrics/ModuleLength

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

@@ -37,22 +37,39 @@ module Datadog
       def on_end; end
 
       def on_wrap(request_context:, cold_start:, &block)
+        options = get_option_tags(
+          request_context: request_context,
+          cold_start: cold_start
+        )
+        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
+          block.call
+        end
+      end
+
+      private
+
+      def get_option_tags(request_context:, cold_start:)
+        function_arn = request_context.invoked_function_arn.downcase
+        tk = function_arn.split(':')
+        function_arn = tk.length > 7 ? tk[0, 7].join(':') : function_arn
+        function_version = tk.length > 7 ? tk[7] : '$LATEST'
         options = {
           tags: {
             cold_start: cold_start,
-            function_arn: request_context.invoked_function_arn.downcase,
+            function_arn: function_arn,
+            function_version: function_version,
             request_id: request_context.aws_request_id,
             resource_names: request_context.function_name
           }
         }
-
-        options[:resource] = @handler_name
-        options[:service] =  @function_name
-        options[:span_type] = 'serverless'
-        Datadog::Trace.apply_datadog_trace_context(Datadog::Trace.trace_context)
-        Datadog::Trace.wrap_datadog(options) do
-          block.call
-        end
+        options
       end
     end
   end

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 = 6
+      MAJOR = 1
+      MINOR = 11
       PATCH = 0
       PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-10-14 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/dd-lambda-rb
+homepage: https://github.com/DataDog/datadog-lambda-rb
 licenses:
 - Apache-2.0
 metadata: