datadog-lambda 0.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ddc462886c4a35ba66d327ebbc2be17c403b2d47cab973fa06e05d6df3d2d1
-  data.tar.gz: b90918aa8b2372e2149e4b084b5ee97d9a8268ebff7ebb83a0e1a6a3751488c1
+  metadata.gz: c19e8514981117ae88bdaa4d17f7a3a5db19595d39336100ac581e0cf330be1d
+  data.tar.gz: 5d2c0ef21fb1fb0d33759f0b3430daebe88100e4f626b20f6dd9512739c6b62c
 SHA512:
-  metadata.gz: 71b82b6b3ec47c17fff39fb4f3bfd40c6d2ef7ba477baa82de83a87bc710fc0114fa7aadc84153908db40de6af8437248e9634b8838a6d60af54e44fefbe8e29
-  data.tar.gz: ca9afd36577caa6b5efef5663add0b37e32bfa953b55ee2909bc2f104a139e0a6478fcddcdde67687537672ae88b2d50f81b3d79c4aefa2967c29cae4faf367b
+  metadata.gz: 6cab42dc833290ea7742def1dda6e4bb4a89ebb7f90240e053cdbcd8f8a338fbaaa98069dc48fdc6d823fb087a90c946c097bd012014e31b84629995f296fe0a
+  data.tar.gz: 4092f19c6b544307e2a82492fd13ce2241d2e0820df2b81da53a6adbd4ec3da0aa9b6d04a56c528b822f93df36e8122985d1a5c0584773d867c3f787feb46eba

data/lib/datadog/lambda.rb

@@ -37,6 +37,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 +69,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 +82,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

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

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

@@ -36,11 +36,7 @@ module Datadog
             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(
@@ -49,6 +45,17 @@ module Datadog
         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]
+        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 = 10
       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.10.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-08-10 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: