datadog-lambda 1.14.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0299ef3a855a65e1b2bd066dca1bc81421d6173118775a8be556f497762a7e5
-  data.tar.gz: 8193383951539a3db0043f10141b228ba4dd51ee9f806d2f5e1570e4c58a2306
+  metadata.gz: 14af71dd28cbd28bb7245d9a265c1ef5aae17cc7fca08cdfeec920a0df15863f
+  data.tar.gz: ddaef0b0f205fd9fabdcd1ee2d6663e3f47f1b80e5a7640bb8b0906600807a9d
 SHA512:
-  metadata.gz: 22e350877b7fb4fc6ace6523c67d4e6283f4acc2b5af6db6393f86a3168b66c8a471b3365eb9c07ca8e995972afc29ea4c6c6eb1e95114cc7887601d221efbb9
-  data.tar.gz: 19650c82c373aa12c399b5196d0b6f6d5713451b68e26fe502bbde8cd6395972e38c37a79c90e3cfe41d2866d56de297806e4a674c70b72fe2d0a5b9f3e4c8c4
+  metadata.gz: 7e91c96b8bd3c20e420b94621df6eb260e3baaa310fc131600e6343663a6b8f613091a5f7b7beba460cce0c3c4c62b2a932e18c83f47ce2848c4a89b8c135053
+  data.tar.gz: 9dbf1189862c063bdf8eaa361fcebcbca5ee857bb8196b8d420d5a0f9151e7468f971d3628a68baf8182247a57227366ca6387f98523ccb6a86b2ad2b748536d

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# ddtrace is an optional dependency for the ruby package
+# `ddtrace`` is an optional dependency for the ruby package
 begin
   require 'ddtrace'
 rescue LoadError
@@ -16,27 +16,24 @@ module Datadog
           trace_id = context[:trace_id].to_i
           span_id = context[:parent_id].to_i
           sampling_priority = context[:sample_mode]
-          Datadog.tracer.provider.context = Datadog::Context.new(
-            trace_id: trace_id,
+          trace_digest = Datadog::Tracing::TraceDigest.new(
             span_id: span_id,
-            sampling_priority: sampling_priority
+            trace_id: trace_id,
+            trace_sampling_priority: sampling_priority
           )
+          Datadog::Tracing.continue_trace!(trace_digest)
         end
       rescue StandardError
         Datadog::Utils.logger.debug 'dd-trace unavailable'
       end
 
       def wrap_datadog(options, &block)
-        tracer_available = false
-        begin
-          Datadog.tracer
-          tracer_available = true
-        rescue StandardError
+        unless Datadog::Tracing.enabled?
           Datadog::Utils.logger.debug 'dd-trace unavailable'
+          return block.call
         end
-        return block.call unless tracer_available
 
-        Datadog.tracer.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

@@ -11,8 +11,8 @@
 module Datadog
   module Lambda
     module VERSION
-      MAJOR = 1
-      MINOR = 14
+      MAJOR = 2
+      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'
@@ -27,17 +28,19 @@ module Datadog
     # Same options can be given as Datadog.configure in tracer
     # See https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#quickstart-for-ruby-applications
     def self.configure_apm
-      require 'ddtrace'
-      require 'ddtrace/sync_writer'
+      require 'datadog/tracing'
+      require 'ddtrace/transport/io'
 
       @patch_http = false
       # Needed to keep trace flushes on a single line
       $stdout.sync = true
 
       Datadog.configure do |c|
-        c.tracer writer: Datadog::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
@@ -160,7 +163,7 @@ module Datadog
     end
 
     # Check the DD_ENHANCED_METRICS environment variable
-    # @reurn [boolean] true if this lambda should have
+    # @return [boolean] true if this lambda should have
     # enhanced metrics
     def self.do_enhanced_metrics?
       dd_enhanced_metrics = ENV['DD_ENHANCED_METRICS']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-27 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: '0.4'
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +94,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.74'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.2
 description: |
-  datadog-lambda is Datadog’s AWS Lambda integration for ruby. It is used to perform
+  datadog-lambda is Datadog's AWS Lambda integration for ruby. It is used to perform
   distributed tracing between serverful and serverless environments, and send
   custom metrics to Datadog.
 email:
@@ -111,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
@@ -118,7 +133,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -126,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -134,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Instruments your Ruby AWS Lambda functions with Datadog
 test_files: []