Skip to content

Commit 4b9d63c

Browse files
committed
remove loading handler in lambda module
1 parent 5d9a6f9 commit 4b9d63c

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

lib/datadog/lambda.rb

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
# frozen_string_literal: true
22

3-
require 'aws_lambda_ric/lambda_handler'
4-
53
module Datadog
64
# Lambda module streamlines instrumenting AWS Lambda functions with Datadog.
75
module Lambda
8-
def self.handler(event:, context:)
9-
begin
10-
env_handler = ENV['DD_LAMBDA_HANDLER']
11-
raise 'DD_LAMBDA_HANDLER is not set, Datadog will not work as expected' if env_handler.nil?
12-
13-
@lambda_handler = LambdaHandler.new(env_handler: env_handler)
14-
require @lambda_handler.handler_file_name
6+
def self.configure_apm
7+
# Load tracing
8+
require_relative 'tracing'
9+
require_relative 'tracing/contrib'
1510

16-
configure_apm do |c|
17-
c.tracing.instrument :aws
18-
end
11+
# Load other products (must follow tracing)
12+
require_relative 'profiling'
13+
require_relative 'appsec'
14+
require_relative 'di'
15+
require_relative 'error_tracking'
16+
require_relative 'kit'
1917

20-
@lambda_handler.call_handler(request: event, context: context)
21-
rescue Exception => e # rubocop:disable Lint/RescueException
22-
raise e
23-
end
24-
end
25-
26-
def self.configure_apm
27-
require_relative 'datadog/tracing'
28-
require_relative 'datadog/tracing/transport/io'
18+
require_relative 'tracing/transport/io'
2919

3020
# Needed to keep trace flushes on a single line
3121
$stdout.sync = true
@@ -38,7 +28,7 @@ def self.configure_apm
3828
# end
3929
c.tags = { "_dd.origin": 'lambda' }
4030
# Enable AWS SDK instrumentation
41-
c.tracing.instrument :aws if trace_managed_services?
31+
# c.tracing.instrument :aws if trace_managed_services?
4232

4333
yield(c) if block_given?
4434
end

0 commit comments

Comments
 (0)