datadog-lambda 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37e92d79f90e4049e303719d3639560e7b025e20a62c2199342603e9f76f71d
-  data.tar.gz: c82eb5b84734b2621220eb402e57ba1f88855f39ba94e6567bdde4a6bc6ea80c
+  metadata.gz: 8037783498999fb1a3291a4b6c72d13933efc9c4056b08f96e560debf804797d
+  data.tar.gz: 8f1f8794b9fd7a7886715afe3d41e9398e0d110ace2279c5bec2e2a34d2d60d7
 SHA512:
-  metadata.gz: d6154dce5ec1743195799df476f5b0da7f13db96015822ecfcc4b42e560ba042b9b403355b33a060417c05efa2b9a99975e8fedc540cfea73c1f8e872b8d3985
-  data.tar.gz: 649a76d46ce8fc2ab5f22590137448ec77d518f7f27cb7518300a90ee00fae638250de6ebb486bcf8c3346fa7074257f901dab00b643b30b32e8a2611cf919e1
+  metadata.gz: 98545e61a901be1b3441ba52d197ea69dfe6eee9469d571b2a77e979d4f73c56e133cc0d9502c003342a5a78ee50fea4ca4fb0af6ad7bd3a47d9bd8d5aede373
+  data.tar.gz: d27d0e7a1a9774347fa5865ce508b09f91137b56e400614ad15c06ba3492a977e1734b2015d380f1d14c36b896ace3bfc64e4e4839b2533280c8d411c30503c7

data/lib/datadog/lambda.rb

@@ -18,19 +18,24 @@ module Datadog
   # Instruments AWS Lambda functions with Datadog distributed tracing and
   # custom metrics
   module Lambda
+    @is_cold_start = true
     # Wrap the body of a lambda invocation
     # @param event [Object] event sent to lambda
     # @param context [Object] lambda context
     # @param block [Proc] implementation of the handler function.
-    def self.wrap(event, _context, &block)
+    def self.wrap(event, context, &block)
       Datadog::Utils.update_log_level
-
       @listener ||= Trace::Listener.new
       @listener.on_start(event: event)
+      record_enhanced('invocations', context)
       begin
         res = block.call
+      rescue StandardError => e
+        record_enhanced('errors', context)
+        raise e
       ensure
         @listener.on_end
+        @is_cold_start = false
       end
       res
     end
@@ -58,5 +63,51 @@ module Datadog
       metric = { e: time_ms, m: name, t: tag_list, v: value }.to_json
       puts metric
     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
+    def self.gen_enhanced_tags(context)
+      arn_parts = context.invoked_function_arn.split(':')
+      {
+        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}"
+      }
+    rescue StandardError => e
+      Datadog::Utils.logger.error 'Unable to parse Lambda context' \
+      "#{context}: #{e}"
+      {}
+    end
+
+    # 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,
+    # and adding the enhanced metric tags to the enhanced metrics.
+    # @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)
+
+    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)
+      true
+    end
+
+    # Check the DD_ENHANCED_METRICS environment variable
+    # @reurn [boolean] true if this lambda should have
+    # enhanced metrics
+    def self.do_enhanced_metrics?
+      dd_enhanced_metrics = ENV['DD_ENHANCED_METRICS']
+      return false if dd_enhanced_metrics.nil?
+
+      dd_enhanced_metrics.downcase == 'true'
+    end
   end
 end

data/lib/datadog/lambda/version.rb

@@ -12,7 +12,7 @@ module Datadog
   module Lambda
     module VERSION
       MAJOR = 0
-      MINOR = 4
+      MINOR = 5
       PATCH = 0
       PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk