yake 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b15fb667d8aba0f2fed790898bac47dc745883203f5cc7adda48e5f9c1c58bd
-  data.tar.gz: e07bd79d34cb1a6e841eda84df0b392d8419e0ed3bcbcdb5bf49d2319b47b3c7
+  metadata.gz: 27610c07a200a3f10913adf3a8ce42a892383de03663587f885770b903b48c03
+  data.tar.gz: 062e3bcfab24054137e70643435c39bfe9e61e37b6882a9fc720b0fb57ded05f
 SHA512:
-  metadata.gz: 26e801e5d27b2a8c0241d465f7507cae64913e05e67d91a085ee179e8ec675c06d7e058013464e152e8255343a1790c4a9b7a1c2db45a74461c5a46524549687
-  data.tar.gz: 272b1c2ee937e87fdce222ad8228893614c18b4dd01072b050ce3ba24095c577a8ee6a40988ca00968156d916d87b0b0a9da04a668c2efde79c8ec798721dd94
+  metadata.gz: c9dbfc3ff7244e92d1a963054ef23007fe31cfabce8a00423d0d4d926fa130017b84e1737d8ba527cb274afce62a06cc59f129c97906bdabfd7c683b99ded112
+  data.tar.gz: 4d6e4458f0e305468499bef5e069dda1b6912969083c0d18469ffcd7e906c2f29536a670ddaf1bcd63e8734a56b72ec041abaa69898ab6963393128eee6254b7

data/README.md

@@ -1,6 +1,6 @@
 # λake
 
-![gem](https://img.shields.io/gem/v/yake?color=crimson&logo=rubygems&logoColor=eee&style=flat-square)
+[![gem](https://img.shields.io/gem/v/yake?color=crimson&logo=rubygems&logoColor=eee&style=flat-square)](https://rubygems.org/gems/yake)
 [![rspec](https://img.shields.io/github/workflow/status/amancevice/yake/RSpec?logo=github&style=flat-square)](https://github.com/amancevice/yake/actions)
 [![coverage](https://img.shields.io/codeclimate/coverage/amancevice/yake?logo=code-climate&style=flat-square)](https://codeclimate.com/github/amancevice/yake/test_coverage)
 [![maintainability](https://img.shields.io/codeclimate/maintainability/amancevice/yake?logo=code-climate&style=flat-square)](https://codeclimate.com/github/amancevice/yake/maintainability)
@@ -331,6 +331,8 @@ UTC.now
 
 As of `~> 0.4`, `yake` comes with a helper for writing Lambdas that integrate with Datadog's `datadog-ruby` gem.
 
+As of `~> 0.8`, `yake` uses the v2 Datadog Lambda gem.
+
 Creating a Lambda handler that wraps the Datadog tooling is easy:
 
 ```ruby
@@ -338,7 +340,7 @@ require 'aws-sdk-someservice'
 require 'yake/datadog'
 
 # Configure Datadog to use AWS tracing
-Datadog::Lambda.configure_apm { |config| config.use :aws }
+Datadog::Lambda.configure_apm { |c| c.tracing.instrument :aws }
 
 datadog :handler do |event|
   # …

data/lib/yake/datadog/v1.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+require 'logger'
+
+require 'datadog/lambda'
+require 'yake'
+
+module Yake
+  module Datadog
+    class Formatter < ::Logger::Formatter
+      Format = "[%s] %s %s %s %s\n"
+
+      def call(severity, time, progname, msg)
+        Format % [
+          severity,
+          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+          progname.nil? ? '-' : progname.split.last,
+          ::Datadog.tracer.active_correlation,
+          msg2str(msg).strip,
+        ]
+      end
+    end
+
+    class MockContext < Struct.new(
+      :clock_diff,
+      :deadline_ms,
+      :aws_request_id,
+      :invoked_function_arn,
+      :log_group_name,
+      :log_stream_name,
+      :function_name,
+      :memory_limit_in_mb,
+      :function_version)
+
+      def invoked_function_arn
+        @invoked_function_arn ||= begin
+          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+          "arn:aws:lambda:#{region}:123456789012:function-name"
+        end
+      end
+    end
+
+    module DSL
+      include Yake::DSL
+
+      ##
+      # Datadog handler wrapper
+      def datadog(name, &block)
+        define_method(name) do |event:nil, context:nil|
+          context ||= MockContext.new
+          ::Datadog::Lambda.wrap(event, context) do
+            Yake.wrap(event, context, &block)
+          end
+        end
+      end
+    end
+  end
+
+  logger.formatter = Datadog::Formatter.new
+end
+
+extend Yake::Datadog::DSL

data/lib/yake/datadog/v2.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+require 'logger'
+
+require 'datadog/lambda'
+require 'yake'
+
+module Yake
+  module Datadog
+    class Formatter < ::Logger::Formatter
+      Format = "[%s] %s %s %s %s\n"
+
+      def call(severity, time, progname, msg)
+        Format % [
+          severity,
+          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+          progname.nil? ? '-' : progname.split.last,
+          ::Datadog::Tracing.log_correlation,
+          msg2str(msg).strip,
+        ]
+      end
+    end
+
+    class MockContext < Struct.new(
+      :clock_diff,
+      :deadline_ms,
+      :aws_request_id,
+      :invoked_function_arn,
+      :log_group_name,
+      :log_stream_name,
+      :function_name,
+      :memory_limit_in_mb,
+      :function_version)
+
+      def invoked_function_arn
+        @invoked_function_arn ||= begin
+          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+          "arn:aws:lambda:#{region}:123456789012:function-name"
+        end
+      end
+    end
+
+    module DSL
+      include Yake::DSL
+
+      ##
+      # Datadog handler wrapper
+      def datadog(name, &block)
+        define_method(name) do |event:nil, context:nil|
+          context ||= MockContext.new
+          ::Datadog::Lambda.wrap(event, context) do
+            Yake.wrap(event, context, &block)
+          end
+        end
+      end
+    end
+  end
+
+  logger.formatter = Datadog::Formatter.new
+end
+
+extend Yake::Datadog::DSL

data/lib/yake/datadog.rb

@@ -1,61 +1,3 @@
 # frozen_string_literal: true
-require 'logger'
-
 require 'datadog/lambda'
-require 'yake'
-
-module Yake
-  module Datadog
-    class Formatter < ::Logger::Formatter
-      Format = "[%s] %s %s %s %s\n"
-
-      def call(severity, time, progname, msg)
-        Format % [
-          severity,
-          time.utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
-          progname.nil? ? '-' : progname.split.last,
-          ::Datadog.tracer.active_correlation,
-          msg2str(msg).strip,
-        ]
-      end
-    end
-
-    class MockContext < Struct.new(
-      :clock_diff,
-      :deadline_ms,
-      :aws_request_id,
-      :invoked_function_arn,
-      :log_group_name,
-      :log_stream_name,
-      :function_name,
-      :memory_limit_in_mb,
-      :function_version)
-
-      def invoked_function_arn
-        @invoked_function_arn ||= begin
-          region = ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
-          "arn:aws:lambda:#{region}:123456789012:function-name"
-        end
-      end
-    end
-
-    module DSL
-      include Yake::DSL
-
-      ##
-      # Datadog handler wrapper
-      def datadog(name, &block)
-        define_method(name) do |event:nil, context:nil|
-          context ||= MockContext.new
-          ::Datadog::Lambda.wrap(event, context) do
-            Yake.wrap(event, context, &block)
-          end
-        end
-      end
-    end
-  end
-
-  logger.formatter = Datadog::Formatter.new
-end
-
-extend Yake::Datadog::DSL
+require_relative "datadog/v#{Datadog::Lambda::VERSION::MAJOR}"

data/lib/yake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yake
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yake
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -22,6 +22,8 @@ files:
 - lib/yake.rb
 - lib/yake/api.rb
 - lib/yake/datadog.rb
+- lib/yake/datadog/v1.rb
+- lib/yake/datadog/v2.rb
 - lib/yake/dsl.rb
 - lib/yake/errors.rb
 - lib/yake/logger.rb