datadog-lambda 2.16.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db432203f35cb4abd7dfb7d9b072db41a8187ce990d8d8fe7e23e76bb880d80
-  data.tar.gz: 44e85f5fbbaca2e2eff04c1a44c176983cd532580ab4ada6b6beca9c40cd04d3
+  metadata.gz: 7190d039044c87a9835b29f812e930cc6c3fee9cdc5348226df7fe603b15a7bf
+  data.tar.gz: 35c495079f2b934ba036008084765d92a376f6924f7a4c5468ad34303ee1912c
 SHA512:
-  metadata.gz: 49fa2240d7e2c0e7d98536ab0c958b29910b805c8933611239143d45621409fbf7b22f14626d46262ba17ed8ce65c4af7a35ca680854cec259dc9272fa899784
-  data.tar.gz: 0053b4ff3302215716ccc43e7d077b3fff41672adb8eea39a7df4800adec31b51d6ed83f7d53129f06d689638b4b2a1b45a4a9b5a1aa749bc1f14d9b60381471
+  metadata.gz: c51f7c325e147d68a713d763c9550f2bf11b3ba9f7492f48c4b5195302f4c5fd4c0da20a9893ea19c27be24c4adf8740186f394250f830cfe8b6d8890c861d7b
+  data.tar.gz: 58f67b709d96a5b9e8ce628c4c1d0c02385508de007772a2560da26dc8cc7e90d23562063e3a8e73a5c90f73e71fd7c0cc0fac305c36cca6d901977d39c3fd6f

data/lib/datadog/lambda/metrics.rb

@@ -0,0 +1,70 @@
+# 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 'datadog/statsd'
+require 'time'
+
+module Datadog
+  # Metrics module contains the singleton class Client to send custom
+  # metrics to Datadog.
+  module Metrics
+    URL = 'localhost'
+    PORT = '8125'
+    # Client is a singleton class that instantiates a Datadog::Statsd
+    # client to send metrics to the Datadog Extension if present.
+    class Client
+      private_class_method :new
+
+      def self.instance
+        @instance ||= new
+      end
+
+      def distribution(name, value, time: nil, **tags)
+        tag_list = get_tags(**tags)
+
+        if Datadog::Utils.extension_running?
+          begin
+            @statsd.distribution(name, value, tags: tag_list)
+          rescue StandardError => e
+            Datadog::Utils.logger.warning "error sending metric to the extension: #{e}"
+          end
+        else
+          time ||= Time.now
+          time_ms = time.to_i
+
+          metric = { e: time_ms, m: name, t: tag_list, v: value }
+          puts metric.to_json
+        end
+      end
+
+      def close
+        @statsd&.close
+      end
+
+      def get_tags(**tags)
+        tag_list = ["dd_lambda_layer:datadog-ruby#{Datadog::Lambda.dd_lambda_layer_tag}"]
+        tags.each do |tag|
+          tag_list << "#{tag[0]}:#{tag[1]}"
+        end
+
+        tag_list
+      end
+
+      private_class_method def initialize
+        if Datadog::Utils.extension_running?
+          Datadog::Utils.logger.debug 'sending metrics through extension'
+          @statsd = Datadog::Statsd.new(URL, PORT, single_thread: true)
+        else
+          Datadog::Utils.logger.debug 'metrics are going to be handled by the forwarder'
+        end
+      end
+    end
+  end
+end

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,41 @@
+# 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'
+
+    @is_extension_running = nil
+
+    def self.extension_running?
+      return @is_extension_running unless @is_extension_running.nil?
+
+      @is_extension_running = check_extension_running
+    end
+
+    def self.check_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 = 20
       PATCH = 0
       PRE = nil
 

data/lib/datadog/lambda.rb

@@ -9,11 +9,12 @@
 #
 # rubocop:disable Metrics/ModuleLength
 
+require 'datadog/lambda/metrics'
 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'
 require 'datadog/lambda/version'
 
 module Datadog
@@ -22,6 +23,7 @@ module Datadog
   module Lambda
     @is_cold_start = true
     @patch_http = true
+    @metrics_client = Metrics::Client.instance
 
     # Configures Datadog's APM tracer with lambda specific defaults.
     # Same options can be given as Datadog.configure in tracer
@@ -35,9 +37,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
@@ -63,6 +67,7 @@ module Datadog
       ensure
         @listener.on_end
         @is_cold_start = false
+        @metrics_client.close
       end
       res
     end
@@ -82,15 +87,7 @@ module Datadog
       raise 'name must be a string' unless name.is_a?(String)
       raise 'value must be a number' unless value.is_a?(Numeric)
 
-      time ||= Time.now
-      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
-      metric = { e: time_ms, m: name, t: tag_list, v: value }
-      puts metric.to_json
+      @metrics_client.distribution(name, value, time: time, **tags)
     end
 
     def self.dd_lambda_layer_tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-lambda
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: dogstatsd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ddtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,12 +133,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/datadog/lambda.rb
+- lib/datadog/lambda/metrics.rb
 - lib/datadog/lambda/trace/constants.rb
 - lib/datadog/lambda/trace/context.rb
 - lib/datadog/lambda/trace/ddtrace.rb
 - 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