datadog-lambda 2.16.0 → 2.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/datadog/lambda/trace/ddtrace.rb +1 -1
  3. data/lib/datadog/lambda/utils/extension.rb +33 -0
  4. data/lib/datadog/lambda/version.rb +1 -1
  5. data/lib/datadog/lambda.rb +6 -3
  6. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2db432203f35cb4abd7dfb7d9b072db41a8187ce990d8d8fe7e23e76bb880d80
4
- data.tar.gz: 44e85f5fbbaca2e2eff04c1a44c176983cd532580ab4ada6b6beca9c40cd04d3
3
+ metadata.gz: 14af71dd28cbd28bb7245d9a265c1ef5aae17cc7fca08cdfeec920a0df15863f
4
+ data.tar.gz: ddaef0b0f205fd9fabdcd1ee2d6663e3f47f1b80e5a7640bb8b0906600807a9d
5
5
  SHA512:
6
- metadata.gz: 49fa2240d7e2c0e7d98536ab0c958b29910b805c8933611239143d45621409fbf7b22f14626d46262ba17ed8ce65c4af7a35ca680854cec259dc9272fa899784
7
- data.tar.gz: 0053b4ff3302215716ccc43e7d077b3fff41672adb8eea39a7df4800adec31b51d6ed83f7d53129f06d689638b4b2a1b45a4a9b5a1aa749bc1f14d9b60381471
6
+ metadata.gz: 7e91c96b8bd3c20e420b94621df6eb260e3baaa310fc131600e6343663a6b8f613091a5f7b7beba460cce0c3c4c62b2a932e18c83f47ce2848c4a89b8c135053
7
+ data.tar.gz: 9dbf1189862c063bdf8eaa361fcebcbca5ee857bb8196b8d420d5a0f9151e7468f971d3628a68baf8182247a57227366ca6387f98523ccb6a86b2ad2b748536d
data/lib/datadog/lambda/trace/ddtrace.rb CHANGED
@@ -33,7 +33,7 @@ module Datadog
33
33
  return block.call
34
34
  end
35
35
 
36
- Datadog::Tracing.trace('aws.lambda', options) do |_span|
36
+ Datadog::Tracing.trace('aws.lambda', **options) do |_span|
37
37
  block.call
38
38
  end
39
39
  end
data/lib/datadog/lambda/utils/extension.rb ADDED
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+
3
+ #
4
+ # Unless explicitly stated otherwise all files in this repository are licensed
5
+ # under the Apache License Version 2.0.
6
+ #
7
+ # This product includes software developed at Datadog (https://www.datadoghq.com/).
8
+ # Copyright 2023 Datadog, Inc.
9
+ #
10
+ require 'net/http'
11
+
12
+ module Datadog
13
+ # Utils contains utility functions shared between modules
14
+ module Utils
15
+ AGENT_URL = 'http://127.0.0.1:8124'
16
+ HELLO_PATH = '/lambda/hello'
17
+ EXTENSION_CHECK_URI = URI(AGENT_URL + HELLO_PATH).freeze
18
+ EXTENSION_PATH = '/opt/extensions/datadog-agent'
19
+
20
+ def self.extension_running
21
+ return false unless File.exist?(EXTENSION_PATH)
22
+
23
+ begin
24
+ Net::HTTP.get(EXTENSION_CHECK_URI)
25
+ rescue StandardError => e
26
+ Datadog::Utils.logger.debug "extension is not running, returned with error #{e}"
27
+ return false
28
+ end
29
+
30
+ true
31
+ end
32
+ end
33
+ end
data/lib/datadog/lambda/version.rb CHANGED
@@ -12,7 +12,7 @@ module Datadog
12
12
  module Lambda
13
13
  module VERSION
14
14
  MAJOR = 2
15
- MINOR = 16
15
+ MINOR = 19
16
16
  PATCH = 0
17
17
  PRE = nil
18
18
 
data/lib/datadog/lambda.rb CHANGED
@@ -11,6 +11,7 @@
11
11
 
12
12
  require 'datadog/lambda/trace/listener'
13
13
  require 'datadog/lambda/utils/logger'
14
+ require 'datadog/lambda/utils/extension'
14
15
  require 'datadog/lambda/trace/patch_http'
15
16
  require 'json'
16
17
  require 'time'
@@ -35,9 +36,11 @@ module Datadog
35
36
  $stdout.sync = true
36
37
 
37
38
  Datadog.configure do |c|
38
- c.tracing.writer = Datadog::Tracing::SyncWriter.new(
39
- transport: Datadog::Transport::IO.default
40
- )
39
+ unless Datadog::Utils.extension_running
40
+ c.tracing.writer = Datadog::Tracing::SyncWriter.new(
41
+ transport: Datadog::Transport::IO.default
42
+ )
43
+ end
41
44
  c.tags = { "_dd.origin": 'lambda' }
42
45
  yield(c) if block_given?
43
46
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: datadog-lambda
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.16.0
4
+ version: 2.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Datadog, Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-10-21 00:00:00.000000000 Z
11
+ date: 2023-05-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-xray-sdk
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.5.0
33
+ version: 1.11.0
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.5.0
40
+ version: 1.11.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
125
125
  - lib/datadog/lambda/trace/listener.rb
126
126
  - lib/datadog/lambda/trace/patch_http.rb
127
127
  - lib/datadog/lambda/trace/xray.rb
128
+ - lib/datadog/lambda/utils/extension.rb
128
129
  - lib/datadog/lambda/utils/logger.rb
129
130
  - lib/datadog/lambda/version.rb
130
131
  homepage: https://github.com/DataDog/datadog-lambda-rb