datadog-lambda 2.16.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db432203f35cb4abd7dfb7d9b072db41a8187ce990d8d8fe7e23e76bb880d80
-  data.tar.gz: 44e85f5fbbaca2e2eff04c1a44c176983cd532580ab4ada6b6beca9c40cd04d3
+  metadata.gz: 14af71dd28cbd28bb7245d9a265c1ef5aae17cc7fca08cdfeec920a0df15863f
+  data.tar.gz: ddaef0b0f205fd9fabdcd1ee2d6663e3f47f1b80e5a7640bb8b0906600807a9d
 SHA512:
-  metadata.gz: 49fa2240d7e2c0e7d98536ab0c958b29910b805c8933611239143d45621409fbf7b22f14626d46262ba17ed8ce65c4af7a35ca680854cec259dc9272fa899784
-  data.tar.gz: 0053b4ff3302215716ccc43e7d077b3fff41672adb8eea39a7df4800adec31b51d6ed83f7d53129f06d689638b4b2a1b45a4a9b5a1aa749bc1f14d9b60381471
+  metadata.gz: 7e91c96b8bd3c20e420b94621df6eb260e3baaa310fc131600e6343663a6b8f613091a5f7b7beba460cce0c3c4c62b2a932e18c83f47ce2848c4a89b8c135053
+  data.tar.gz: 9dbf1189862c063bdf8eaa361fcebcbca5ee857bb8196b8d420d5a0f9151e7468f971d3628a68baf8182247a57227366ca6387f98523ccb6a86b2ad2b748536d

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

@@ -33,7 +33,7 @@ module Datadog
           return block.call
         end
 
-        Datadog::Tracing.trace('aws.lambda', options) do |_span|
+        Datadog::Tracing.trace('aws.lambda', **options) do |_span|
           block.call
         end
       end

data/lib/datadog/lambda/utils/extension.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+#
+# Unless explicitly stated otherwise all files in this repository are licensed
+# under the Apache License Version 2.0.
+#
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2023 Datadog, Inc.
+#
+require 'net/http'
+
+module Datadog
+  # Utils contains utility functions shared between modules
+  module Utils
+    AGENT_URL = 'http://127.0.0.1:8124'
+    HELLO_PATH = '/lambda/hello'
+    EXTENSION_CHECK_URI = URI(AGENT_URL + HELLO_PATH).freeze
+    EXTENSION_PATH = '/opt/extensions/datadog-agent'
+
+    def self.extension_running
+      return false unless File.exist?(EXTENSION_PATH)
+
+      begin
+        Net::HTTP.get(EXTENSION_CHECK_URI)
+      rescue StandardError => e
+        Datadog::Utils.logger.debug "extension is not running, returned with error #{e}"
+        return false
+      end
+
+      true
+    end
+  end
+end

data/lib/datadog/lambda/version.rb

@@ -12,7 +12,7 @@ module Datadog
   module Lambda
     module VERSION
       MAJOR = 2
-      MINOR = 16
+      MINOR = 19
       PATCH = 0
       PRE = nil
 

data/lib/datadog/lambda.rb

@@ -11,6 +11,7 @@
 
 require 'datadog/lambda/trace/listener'
 require 'datadog/lambda/utils/logger'
+require 'datadog/lambda/utils/extension'
 require 'datadog/lambda/trace/patch_http'
 require 'json'
 require 'time'
@@ -35,9 +36,11 @@ module Datadog
       $stdout.sync = true
 
       Datadog.configure do |c|
-        c.tracing.writer = Datadog::Tracing::SyncWriter.new(
-          transport: Datadog::Transport::IO.default
-        )
+        unless Datadog::Utils.extension_running
+          c.tracing.writer = Datadog::Tracing::SyncWriter.new(
+            transport: Datadog::Transport::IO.default
+          )
+        end
         c.tags = { "_dd.origin": 'lambda' }
         yield(c) if block_given?
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-05-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: 1.5.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - lib/datadog/lambda/trace/listener.rb
 - lib/datadog/lambda/trace/patch_http.rb
 - lib/datadog/lambda/trace/xray.rb
+- lib/datadog/lambda/utils/extension.rb
 - lib/datadog/lambda/utils/logger.rb
 - lib/datadog/lambda/version.rb
 homepage: https://github.com/DataDog/datadog-lambda-rb