From c03f396ff40531805a1d22578ec1981738586a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:31:25 -0400
Subject: [PATCH 1/9] add `ext.rb`

---
 .../tracing/contrib/aws_lambda_ric/ext.rb     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 lib/datadog/tracing/contrib/aws_lambda_ric/ext.rb

diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/ext.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/ext.rb
new file mode 100644
index 00000000000..a1489bbb820
--- /dev/null
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/ext.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        # AWS integration constants
+        # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
+        module Ext
+          ENV_ENABLED = 'DD_TRACE_AWS_LAMBDA_RIC_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_AWS_LAMBDA_RIC_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_AWS_LAMBDA_RIC_PEER_SERVICE'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_LAMBDA_RIC_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_LAMBDA_RIC_ANALYTICS_SAMPLE_RATE'
+          # DEFAULT_PEER_SERVICE_NAME = 'aws'
+          SPAN_COMMAND = 'aws.lambda'
+          # TAG_AGENT = 'aws.agent'
+          # TAG_COMPONENT = 'aws'
+          TAG_DEFAULT_AGENT = 'aws-sdk-ruby'
+          # TAG_HOST = 'host'
+          TAG_OPERATION = 'aws.lambda'
+          # TAG_OPERATION_COMMAND = 'command'
+          # TAG_PATH = 'path'
+          TAG_AWS_REGION = 'aws.region'
+          TAG_REGION = 'region'
+          TAG_AWS_ACCOUNT = 'aws_account'
+          TAG_FUNCTION_NAME = 'functionname'
+          PEER_SERVICE_SOURCES = Array[TAG_FUNCTION_NAME,
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+        end
+      end
+    end
+  end
+end

From 4bb1ee760b55f677f18b861db184628956a819aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:32:35 -0400
Subject: [PATCH 2/9] add `settings.rb`

also add import in `contrib.rb`
---
 lib/datadog/tracing/contrib.rb                |  1 +
 .../aws_lambda_ric/configuration/settings.rb  | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 lib/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rb

diff --git a/lib/datadog/tracing/contrib.rb b/lib/datadog/tracing/contrib.rb
index 4e51e6a5b78..8c5bf25c6af 100644
--- a/lib/datadog/tracing/contrib.rb
+++ b/lib/datadog/tracing/contrib.rb
@@ -39,6 +39,7 @@ module Contrib
 require_relative 'contrib/active_record/integration'
 require_relative 'contrib/active_support/integration'
 require_relative 'contrib/aws/integration'
+require_relative 'contrib/aws_lambda_ric/integration'
 require_relative 'contrib/concurrent_ruby/integration'
 require_relative 'contrib/dalli/integration'
 require_relative 'contrib/delayed_job/integration'
diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rb
new file mode 100644
index 00000000000..10df52ce415
--- /dev/null
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative '../../configuration/settings'
+require_relative '../ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        module Configuration
+          # Custom settings for the AWS Lambda RIC integration
+          class Settings < Contrib::Configuration::Settings
+            option :enabled, default: true
+            option :analytics_enabled, default: false
+            option :analytics_sample_rate, default: 1.0
+            option :service_name, default: Ext::TAG_DEFAULT_AGENT
+            option :peer_service, default: nil
+            option :on_error, default: nil
+          end
+        end
+      end
+    end
+  end
+end

From 08aa795f8e973f913575fc344c2f03bc4fd1ac29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:33:07 -0400
Subject: [PATCH 3/9] add `patcher.rb`

---
 .../tracing/contrib/aws_lambda_ric/patcher.rb | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 lib/datadog/tracing/contrib/aws_lambda_ric/patcher.rb

diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/patcher.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/patcher.rb
new file mode 100644
index 00000000000..314da32fbcc
--- /dev/null
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/patcher.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative '../patcher'
+require_relative 'instrumentation'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        # Patcher enables patching of 'aws_lambda_ric' module.
+        module Patcher
+          include Contrib::Patcher
+
+          module_function
+
+          def target_version
+            Integration.version
+          end
+
+          def patch
+            patch_lambda_runner
+            patch_lambda_handler
+          end
+
+          def patch_lambda_runner
+            return unless defined?(::AwsLambdaRIC::LambdaRunner)
+
+            ::AwsLambdaRIC::LambdaRunner.include(Instrumentation)
+          rescue StandardError => e
+            Datadog.logger.debug("Unable to patch AwsLambdaRIC::LambdaRunner: #{e}")
+          end
+
+          def patch_lambda_handler
+            return unless defined?(::AwsLambdaRIC::LambdaHandler)
+
+            ::AwsLambdaRIC::LambdaHandler.include(Instrumentation)
+          rescue StandardError => e
+            Datadog.logger.debug("Unable to patch AwsLambdaRIC::LambdaHandler: #{e}")
+          end
+        end
+      end
+    end
+  end
+end

From 49db0e2365c65f3ec58d8646d4041082e77b3f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:33:30 -0400
Subject: [PATCH 4/9] add `integration.rb`

---
 .../contrib/aws_lambda_ric/integration.rb     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb

diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb
new file mode 100644
index 00000000000..20e0a50d7d7
--- /dev/null
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        # Description of AWS Lambda RIC integration
+        class Integration
+          include Contrib::Integration
+
+          MINIMUM_VERSION = Gem::Version.new('3.0')
+
+          # @public_api Changing the integration name or integration options can cause breaking changes
+          register_as :aws_lambda_ric, auto_patch: true
+          def self.gem_name
+            'aws_lambda_ric'
+          end
+
+          def self.version
+            if Gem.loaded_specs['aws_lambda_ric']
+              Gem.loaded_specs['aws_lambda_ric'].version
+            end
+          end
+
+          def self.loaded?
+            !defined?(::AwsLambdaRIC).nil?
+          end
+
+          def self.compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

From 533a0b00db3e699a846db1a22244a23c811f412a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:34:30 -0400
Subject: [PATCH 5/9] add first iteration of `instrumentation.rb`

patches two methods so we can get `request`, `context`, and `response`
---
 .../contrib/aws_lambda_ric/instrumentation.rb | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb

diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb
new file mode 100644
index 00000000000..27ba28697f7
--- /dev/null
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb
@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative '../ext'
+require_relative 'ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        # AWS Lambda RIC instrumentation module
+        module Instrumentation
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          # Instance methods for AWS Lambda RIC classes
+          module InstanceMethods
+            def run_user_code
+              return super unless enabled?
+
+              # Store the arguments for later use in the trace
+              @lambda_user_code_args = method(__method__).super_method.parameters.map do |type, name|
+                [type, name, binding.local_variable_get(name)] if binding.local_variable_defined?(name)
+              end.compact
+
+              super
+            end
+
+            def call_handler(request:, context:)
+              return super unless enabled?
+
+              # Store the arguments for later use in the trace
+              @lambda_call_handler_args = { request: request, context: context }
+
+              # Start the trace when the handler is called
+              start_lambda_trace
+              result = super
+              # Store the result for later use in the trace
+              @lambda_handler_result = result
+              # Finish the trace when the handler completes
+              finish_lambda_trace
+              result
+            end
+
+            private
+
+            def start_lambda_trace
+              service = datadog_configuration[:service_name]
+              on_error = datadog_configuration[:on_error]
+
+              # Start a new span manually
+              @lambda_span = Tracing.start_span(
+                Ext::SPAN_COMMAND,
+                service: service,
+                resource: 'lambda_execution',
+                type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
+              )
+
+              annotate_span!(@lambda_span, 'lambda_execution')
+
+              # Set analytics sample rate
+              Contrib::Analytics.set_sample_rate(@lambda_span, analytics_sample_rate) if analytics_enabled?
+
+              # Set error handler
+              @lambda_span.on_error = on_error if on_error
+            end
+
+            def finish_lambda_trace
+              return unless @lambda_span
+
+              # Add any additional tags or metadata before finishing
+              if @lambda_user_code_args
+                @lambda_span.set_tag('lambda.user_code_args', @lambda_user_code_args.to_json)
+              end
+
+              if @lambda_call_handler_args
+                @lambda_span.set_tag('lambda.call_handler.request', @lambda_call_handler_args[:request].to_json)
+                @lambda_span.set_tag('lambda.call_handler.context', @lambda_call_handler_args[:context].to_json)
+              end
+
+              if @lambda_handler_result
+                handler_response, content_type = @lambda_handler_result
+                @lambda_span.set_tag('lambda.handler_response', handler_response.to_json)
+                @lambda_span.set_tag('lambda.content_type', content_type.to_json) if content_type
+              end
+
+              # Finish the span
+              @lambda_span.finish
+
+              # Clean up instance variables
+              @lambda_span = nil
+              @lambda_user_code_args = nil
+              @lambda_call_handler_args = nil
+              @lambda_handler_result = nil
+            end
+
+            def annotate_span!(span, operation)
+              span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_DEFAULT_AGENT)
+              span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION)
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
+
+              # Add AWS Lambda specific tags
+              span.set_tag(Ext::TAG_FUNCTION_NAME, function_name) if respond_to?(:function_name)
+              span.set_tag(Ext::TAG_AWS_REGION, aws_region) if respond_to?(:aws_region)
+              span.set_tag(Ext::TAG_AWS_ACCOUNT, aws_account) if respond_to?(:aws_account)
+
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.tracing[:aws_lambda_ric]
+            end
+
+            def analytics_enabled?
+              datadog_configuration[:analytics_enabled]
+            end
+
+            def analytics_sample_rate
+              datadog_configuration[:analytics_sample_rate]
+            end
+
+            def enabled?
+              datadog_configuration[:enabled]
+            end
+          end
+        end
+      end
+    end
+  end
+end

From 5e6fca122295ee011d0fb6fe211dba7d868946f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:46:04 -0400
Subject: [PATCH 6/9] fmt `instrumentation.rb`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

also `integration.rb` – just a rubocop fix
---
 lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb | 4 +---
 lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb
index 27ba28697f7..44aa2b583c3 100644
--- a/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rb
@@ -71,9 +71,7 @@ def finish_lambda_trace
               return unless @lambda_span
 
               # Add any additional tags or metadata before finishing
-              if @lambda_user_code_args
-                @lambda_span.set_tag('lambda.user_code_args', @lambda_user_code_args.to_json)
-              end
+              @lambda_span.set_tag('lambda.user_code_args', @lambda_user_code_args.to_json) if @lambda_user_code_args
 
               if @lambda_call_handler_args
                 @lambda_span.set_tag('lambda.call_handler.request', @lambda_call_handler_args[:request].to_json)
diff --git a/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb b/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb
index 20e0a50d7d7..cab0c610372 100644
--- a/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb
+++ b/lib/datadog/tracing/contrib/aws_lambda_ric/integration.rb
@@ -21,9 +21,7 @@ def self.gem_name
           end
 
           def self.version
-            if Gem.loaded_specs['aws_lambda_ric']
-              Gem.loaded_specs['aws_lambda_ric'].version
-            end
+            Gem.loaded_specs['aws_lambda_ric'].version if Gem.loaded_specs['aws_lambda_ric']
           end
 
           def self.loaded?

From d400a2d16049ec72189ba6a2db4c3217f4621e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Jun 2025 16:48:40 -0400
Subject: [PATCH 7/9] add `rbs` files

---
 .../aws_lambda_ric/configuration/settings.rbs | 12 ++++++
 .../tracing/contrib/aws_lambda_ric/ext.rbs    | 30 +++++++++++++++
 .../aws_lambda_ric/instrumentation.rbs        | 37 +++++++++++++++++++
 .../contrib/aws_lambda_ric/integration.rbs    | 25 +++++++++++++
 .../contrib/aws_lambda_ric/patcher.rbs        | 19 ++++++++++
 5 files changed, 123 insertions(+)
 create mode 100644 sig/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rbs
 create mode 100644 sig/datadog/tracing/contrib/aws_lambda_ric/ext.rbs
 create mode 100644 sig/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rbs
 create mode 100644 sig/datadog/tracing/contrib/aws_lambda_ric/integration.rbs
 create mode 100644 sig/datadog/tracing/contrib/aws_lambda_ric/patcher.rbs

diff --git a/sig/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rbs b/sig/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rbs
new file mode 100644
index 00000000000..8571e5dbb95
--- /dev/null
+++ b/sig/datadog/tracing/contrib/aws_lambda_ric/configuration/settings.rbs
@@ -0,0 +1,12 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        module Configuration
+          class Settings < Contrib::Configuration::Settings
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/sig/datadog/tracing/contrib/aws_lambda_ric/ext.rbs b/sig/datadog/tracing/contrib/aws_lambda_ric/ext.rbs
new file mode 100644
index 00000000000..4bc714c04d7
--- /dev/null
+++ b/sig/datadog/tracing/contrib/aws_lambda_ric/ext.rbs
@@ -0,0 +1,30 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        module Ext
+          ENV_ENABLED: "DD_TRACE_AWS_LAMBDA_RIC_ENABLED"
+
+          ENV_SERVICE_NAME: "DD_TRACE_AWS_LAMBDA_RIC_SERVICE_NAME"
+
+          ENV_PEER_SERVICE: "DD_TRACE_AWS_LAMBDA_RIC_PEER_SERVICE"
+          ENV_ANALYTICS_ENABLED: "DD_TRACE_AWS_LAMBDA_RIC_ANALYTICS_ENABLED"
+
+          ENV_ANALYTICS_SAMPLE_RATE: "DD_TRACE_AWS_LAMBDA_RIC_ANALYTICS_SAMPLE_RATE"
+          SPAN_COMMAND: "aws.lambda"
+          TAG_DEFAULT_AGENT: "aws-sdk-ruby"
+          TAG_OPERATION: "aws.lambda"
+          TAG_AWS_REGION: "aws.region"
+
+          TAG_REGION: "region"
+
+          TAG_AWS_ACCOUNT: "aws_account"
+
+          TAG_FUNCTION_NAME: "functionname"
+
+          PEER_SERVICE_SOURCES: untyped
+        end
+      end
+    end
+  end
+end
diff --git a/sig/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rbs b/sig/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rbs
new file mode 100644
index 00000000000..d69a08730f2
--- /dev/null
+++ b/sig/datadog/tracing/contrib/aws_lambda_ric/instrumentation.rbs
@@ -0,0 +1,37 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        module Instrumentation
+          def self.included: (untyped base) -> untyped
+          module InstanceMethods
+            @lambda_user_code_args: untyped
+            @lambda_call_handler_args: untyped
+            @lambda_handler_result: untyped
+            @lambda_span: untyped
+
+            def run_user_code: () -> untyped
+
+            def call_handler: (request: untyped, context: untyped) -> untyped
+
+            private
+
+            def start_lambda_trace: () -> untyped
+
+            def finish_lambda_trace: () -> (nil | untyped)
+
+            def annotate_span!: (untyped span, untyped operation) -> untyped
+
+            def datadog_configuration: () -> untyped
+
+            def analytics_enabled?: () -> untyped
+
+            def analytics_sample_rate: () -> untyped
+
+            def enabled?: () -> untyped
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/sig/datadog/tracing/contrib/aws_lambda_ric/integration.rbs b/sig/datadog/tracing/contrib/aws_lambda_ric/integration.rbs
new file mode 100644
index 00000000000..587feb8208d
--- /dev/null
+++ b/sig/datadog/tracing/contrib/aws_lambda_ric/integration.rbs
@@ -0,0 +1,25 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        class Integration
+          include Contrib::Integration
+
+          MINIMUM_VERSION: untyped
+
+          def self.gem_name: () -> "aws_lambda_ric"
+
+          def self.version: () -> (untyped | nil)
+
+          def self.loaded?: () -> untyped
+
+          def self.compatible?: () -> untyped
+
+          def new_configuration: () -> untyped
+
+          def patcher: () -> untyped
+        end
+      end
+    end
+  end
+end
diff --git a/sig/datadog/tracing/contrib/aws_lambda_ric/patcher.rbs b/sig/datadog/tracing/contrib/aws_lambda_ric/patcher.rbs
new file mode 100644
index 00000000000..ddebb30bb31
--- /dev/null
+++ b/sig/datadog/tracing/contrib/aws_lambda_ric/patcher.rbs
@@ -0,0 +1,19 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module AwsLambdaRic
+        module Patcher
+          include Contrib::Patcher
+
+          def self?.target_version: () -> untyped
+
+          def self?.patch: () -> untyped
+
+          def self?.patch_lambda_runner: () -> untyped
+
+          def self?.patch_lambda_handler: () -> untyped
+        end
+      end
+    end
+  end
+end

From 5d9a6f93abfec8c52060cc7d9d7221f5fdf4d73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Wed, 2 Jul 2025 15:36:53 -0400
Subject: [PATCH 8/9] add lambda module with handler

---
 .rubocop_todo.yml     |  1 +
 lib/datadog/lambda.rb | 54 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 lib/datadog/lambda.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93d7206858a..434f3d01282 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,6 +64,7 @@ Naming/FileName:
     - 'lib/datadog/profiling/preload.rb'
     - 'lib/datadog/transport/ext.rb'
     - 'lib/datadog/version.rb'
+    - 'lib/datadog/lambda.rb'
 
 # Offense count: 1
 RSpec/IteratedExpectation:
diff --git a/lib/datadog/lambda.rb b/lib/datadog/lambda.rb
new file mode 100644
index 00000000000..16d786548e9
--- /dev/null
+++ b/lib/datadog/lambda.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'aws_lambda_ric/lambda_handler'
+
+module Datadog
+  # Lambda module streamlines instrumenting AWS Lambda functions with Datadog.
+  module Lambda
+    def self.handler(event:, context:)
+      begin
+        env_handler = ENV['DD_LAMBDA_HANDLER']
+        raise 'DD_LAMBDA_HANDLER is not set, Datadog will not work as expected' if env_handler.nil?
+
+        @lambda_handler = LambdaHandler.new(env_handler: env_handler)
+        require @lambda_handler.handler_file_name
+
+        configure_apm do |c|
+          c.tracing.instrument :aws
+        end
+
+        @lambda_handler.call_handler(request: event, context: context)
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        raise e
+      end
+    end
+
+    def self.configure_apm
+      require_relative 'datadog/tracing'
+      require_relative 'datadog/tracing/transport/io'
+
+      # Needed to keep trace flushes on a single line
+      $stdout.sync = true
+
+      Datadog.configure do |c|
+        # unless Datadog::Utils.extension_running?
+        #   c.tracing.writer = Datadog::Tracing::SyncWriter.new(
+        #     transport: Datadog::Tracing::Transport::IO.default
+        #   )
+        # end
+        c.tags = { "_dd.origin": 'lambda' }
+        # Enable AWS SDK instrumentation
+        c.tracing.instrument :aws if trace_managed_services?
+
+        yield(c) if block_given?
+      end
+    end
+
+    def self.trace_managed_services?
+      dd_trace_managed_services = ENV['DD_TRACE_MANAGED_SERVICES']
+      return true if dd_trace_managed_services.nil?
+
+      dd_trace_managed_services.downcase == 'true'
+    end
+  end
+end

From 4b9d63c3832204f1e192172ae12531de772ae1cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:21:13 -0400
Subject: [PATCH 9/9] remove loading handler in lambda module

---
 lib/datadog/lambda.rb | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/datadog/lambda.rb b/lib/datadog/lambda.rb
index 16d786548e9..0bd2a9fd7ee 100644
--- a/lib/datadog/lambda.rb
+++ b/lib/datadog/lambda.rb
@@ -1,31 +1,21 @@
 # frozen_string_literal: true
 
-require 'aws_lambda_ric/lambda_handler'
-
 module Datadog
   # Lambda module streamlines instrumenting AWS Lambda functions with Datadog.
   module Lambda
-    def self.handler(event:, context:)
-      begin
-        env_handler = ENV['DD_LAMBDA_HANDLER']
-        raise 'DD_LAMBDA_HANDLER is not set, Datadog will not work as expected' if env_handler.nil?
-
-        @lambda_handler = LambdaHandler.new(env_handler: env_handler)
-        require @lambda_handler.handler_file_name
+    def self.configure_apm
+      # Load tracing
+      require_relative 'tracing'
+      require_relative 'tracing/contrib'
 
-        configure_apm do |c|
-          c.tracing.instrument :aws
-        end
+      # Load other products (must follow tracing)
+      require_relative 'profiling'
+      require_relative 'appsec'
+      require_relative 'di'
+      require_relative 'error_tracking'
+      require_relative 'kit'
 
-        @lambda_handler.call_handler(request: event, context: context)
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        raise e
-      end
-    end
-
-    def self.configure_apm
-      require_relative 'datadog/tracing'
-      require_relative 'datadog/tracing/transport/io'
+      require_relative 'tracing/transport/io'
 
       # Needed to keep trace flushes on a single line
       $stdout.sync = true
@@ -38,7 +28,7 @@ def self.configure_apm
         # end
         c.tags = { "_dd.origin": 'lambda' }
         # Enable AWS SDK instrumentation
-        c.tracing.instrument :aws if trace_managed_services?
+        # c.tracing.instrument :aws if trace_managed_services?
 
         yield(c) if block_given?
       end