ddtrace 1.0.0 → 1.9.0

data/lib/datadog/ci/contrib/cucumber/patcher.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/ci/contrib/cucumber/instrumentation'
+require_relative '../../../tracing/contrib/patcher'
+require_relative 'instrumentation'
 
 module Datadog
   module CI

data/lib/datadog/ci/contrib/rspec/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/ci/contrib/rspec/ext'
+require_relative '../../../../tracing/contrib/configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module CI

data/lib/datadog/ci/contrib/rspec/example.rb

@@ -1,11 +1,11 @@
 # typed: false
 
-require 'datadog/ci/test'
+require_relative '../../test'
 
-require 'datadog/ci/ext/app_types'
-require 'datadog/ci/ext/environment'
-require 'datadog/ci/ext/test'
-require 'datadog/ci/contrib/rspec/ext'
+require_relative '../../ext/app_types'
+require_relative '../../ext/environment'
+require_relative '../../ext/test'
+require_relative 'ext'
 
 module Datadog
   module CI

data/lib/datadog/ci/contrib/rspec/integration.rb

@@ -1,9 +1,9 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
+require_relative '../../../tracing/contrib/integration'
 
-require 'datadog/ci/contrib/rspec/configuration/settings'
-require 'datadog/ci/contrib/rspec/patcher'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module CI
@@ -36,7 +36,7 @@ module Datadog
             false
           end
 
-          def default_configuration
+          def new_configuration
             Configuration::Settings.new
           end
 

data/lib/datadog/ci/contrib/rspec/patcher.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/ci/contrib/rspec/example'
+require_relative '../../../tracing/contrib/patcher'
+require_relative 'example'
 
 module Datadog
   module CI

data/lib/datadog/ci/ext/environment.rb

@@ -2,15 +2,15 @@
 
 # typed: true
 
-require 'datadog/core/git/ext'
+require_relative '../../core/git/ext'
 
 require 'open3'
+require 'json'
 
 module Datadog
   module CI
     module Ext
       # Defines constants for CI tags
-      # rubocop:disable Metrics/ModuleLength:
       module Environment
         include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
 
@@ -23,11 +23,13 @@ module Datadog
         TAG_PROVIDER_NAME = 'ci.provider.name'
         TAG_STAGE_NAME = 'ci.stage.name'
         TAG_WORKSPACE_PATH = 'ci.workspace_path'
+        TAG_CI_ENV_VARS = '_dd.ci.env_vars'
 
         PROVIDERS = [
           ['APPVEYOR', :extract_appveyor],
           ['TF_BUILD', :extract_azure_pipelines],
           ['BITBUCKET_COMMIT', :extract_bitbucket],
+          ['BUDDY', :extract_buddy],
           ['BUILDKITE', :extract_buildkite],
           ['CIRCLECI', :extract_circle_ci],
           ['GITHUB_SHA', :extract_github_actions],
@@ -44,7 +46,6 @@ module Datadog
           # Extract metadata from CI provider environment variables
           _, extractor = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
           tags = extractor ? public_send(extractor, env).reject { |_, v| v.nil? || v.strip.empty? } : {}
-          tags.delete(Core::Git::Ext::TAG_BRANCH) unless tags[Core::Git::Ext::TAG_TAG].nil?
 
           # If user defined metadata is defined, overwrite
           tags.merge!(extract_user_defined_git(env))
@@ -97,6 +98,12 @@ module Datadog
             tag = env['APPVEYOR_REPO_TAG_NAME']
           end
 
+          commit_message = env['APPVEYOR_REPO_COMMIT_MESSAGE']
+          if commit_message
+            extended = env['APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED']
+            commit_message = "#{commit_message}\n#{extended}" if extended
+          end
+
           {
             TAG_PROVIDER_NAME => 'appveyor',
             Core::Git::Ext::TAG_REPOSITORY_URL => repository,
@@ -111,7 +118,7 @@ module Datadog
             Core::Git::Ext::TAG_TAG => tag,
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['APPVEYOR_REPO_COMMIT_AUTHOR'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => commit_message
           }
         end
 
@@ -119,17 +126,15 @@ module Datadog
           build_id = env['BUILD_BUILDID']
 
           if build_id &&
-             (team_foundation_server_uri = env['SYSTEM_TEAMFOUNDATIONSERVERURI']) &&
-             (team_project_id = env['SYSTEM_TEAMPROJECTID'])
-
+              (team_foundation_server_uri = env['SYSTEM_TEAMFOUNDATIONSERVERURI']) &&
+              (team_project_id = env['SYSTEM_TEAMPROJECTID'])
             pipeline_url = "#{team_foundation_server_uri}#{team_project_id}/_build/results?buildId=#{build_id}"
-
             job_url = "#{pipeline_url}&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
           end
 
-          branch, tag = branch_or_tag(env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] ||
-                                        env['BUILD_SOURCEBRANCH'] ||
-                                        env['BUILD_SOURCEBRANCHNAME'])
+          branch, tag = branch_or_tag(
+            env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCHNAME']
+          )
 
           {
             TAG_PROVIDER_NAME => 'azurepipelines',
@@ -149,7 +154,12 @@ module Datadog
             Core::Git::Ext::TAG_TAG => tag,
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'SYSTEM_TEAMPROJECTID' => env['SYSTEM_TEAMPROJECTID'],
+              'BUILD_BUILDID' => env['BUILD_BUILDID'],
+              'SYSTEM_JOBID' => env['SYSTEM_JOBID']
+            }.to_json
           }
         end
 
@@ -174,6 +184,24 @@ module Datadog
           }
         end
 
+        def extract_buddy(env)
+          {
+            TAG_PROVIDER_NAME => 'buddy',
+            TAG_PIPELINE_ID => "#{env['BUDDY_PIPELINE_ID']}/#{env['BUDDY_EXECUTION_ID']}",
+            TAG_PIPELINE_NAME => env['BUDDY_PIPELINE_NAME'],
+            TAG_PIPELINE_NUMBER => env['BUDDY_EXECUTION_ID'],
+            TAG_PIPELINE_URL => env['BUDDY_EXECUTION_URL'],
+            TAG_WORKSPACE_PATH => env['CI_WORKSPACE_PATH'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['BUDDY_SCM_URL'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['BUDDY_EXECUTION_REVISION'],
+            Core::Git::Ext::TAG_BRANCH => env['BUDDY_EXECUTION_BRANCH'],
+            Core::Git::Ext::TAG_TAG => env['BUDDY_EXECUTION_TAG'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUDDY_EXECUTION_REVISION_MESSAGE'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => env['BUDDY_EXECUTION_REVISION_COMMITTER_NAME'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => env['BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL'],
+          }
+        end
+
         def extract_buildkite(env)
           {
             Core::Git::Ext::TAG_BRANCH => env['BUILDKITE_BRANCH'],
@@ -189,7 +217,11 @@ module Datadog
             TAG_WORKSPACE_PATH => env['BUILDKITE_BUILD_CHECKOUT_PATH'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILDKITE_BUILD_AUTHOR'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILDKITE_BUILD_AUTHOR_EMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILDKITE_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILDKITE_MESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'BUILDKITE_BUILD_ID' => env['BUILDKITE_BUILD_ID'],
+              'BUILDKITE_JOB_ID' => env['BUILDKITE_JOB_ID']
+            }.to_json
           }
         end
 
@@ -208,7 +240,11 @@ module Datadog
             TAG_WORKSPACE_PATH => env['CIRCLE_WORKING_DIRECTORY'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'CIRCLE_WORKFLOW_ID' => env['CIRCLE_WORKFLOW_ID'],
+              'CIRCLE_BUILD_NUM' => env['CIRCLE_BUILD_NUM']
+            }.to_json
           }
         end
 
@@ -226,6 +262,7 @@ module Datadog
             Core::Git::Ext::TAG_REPOSITORY_URL => "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}.git",
             Core::Git::Ext::TAG_TAG => tag,
             TAG_JOB_URL => "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}/commit/#{env['GITHUB_SHA']}/checks",
+            TAG_JOB_NAME => env['GITHUB_JOB'],
             TAG_PIPELINE_ID => env['GITHUB_RUN_ID'],
             TAG_PIPELINE_NAME => env['GITHUB_WORKFLOW'],
             TAG_PIPELINE_NUMBER => env['GITHUB_RUN_NUMBER'],
@@ -234,7 +271,13 @@ module Datadog
             TAG_WORKSPACE_PATH => env['GITHUB_WORKSPACE'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'GITHUB_SERVER_URL' => env['GITHUB_SERVER_URL'],
+              'GITHUB_REPOSITORY' => env['GITHUB_REPOSITORY'],
+              'GITHUB_RUN_ID' => env['GITHUB_RUN_ID'],
+              'GITHUB_RUN_ATTEMPT' => env['GITHUB_RUN_ATTEMPT'],
+            }.reject { |_k, v| v.nil? }.to_json
           }
         end
 
@@ -259,7 +302,12 @@ module Datadog
             TAG_PIPELINE_URL => (url.gsub(%r{/-/pipelines/}, '/pipelines/') if url),
             TAG_PROVIDER_NAME => 'gitlab',
             TAG_WORKSPACE_PATH => env['CI_PROJECT_DIR'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['CI_COMMIT_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['CI_COMMIT_MESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'CI_PROJECT_URL' => env['CI_PROJECT_URL'],
+              'CI_PIPELINE_ID' => env['CI_PIPELINE_ID'],
+              'CI_JOB_ID' => env['CI_JOB_ID']
+            }.to_json
           }
         end
 
@@ -283,7 +331,10 @@ module Datadog
             TAG_WORKSPACE_PATH => env['WORKSPACE'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'DD_CUSTOM_TRACE_ID' => env['DD_CUSTOM_TRACE_ID']
+            }.to_json
           }
         end
 
@@ -296,7 +347,7 @@ module Datadog
             TAG_PIPELINE_ID => env['BUILD_ID'],
             TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
             TAG_PIPELINE_URL => (
-              env['SERVER_URL'] && env['BUILD_ID'] ? "#{env['SERVER_URL']}/viewLog.html?buildId=#{env['SERVER_URL']}" : nil
+              env['SERVER_URL'] && env['BUILD_ID'] ? "#{env['SERVER_URL']}/viewLog.html?buildId=#{env['BUILD_ID']}" : nil
             ),
             Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
             Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
@@ -328,6 +379,10 @@ module Datadog
           branch = (
             env['BITRISEIO_GIT_BRANCH_DEST'] || env['BITRISE_GIT_BRANCH']
           )
+          commiter_email = (
+            env['GIT_CLONE_COMMIT_COMMITER_EMAIL'] || env['GIT_CLONE_COMMIT_COMMITER_NAME']
+          )
+
           {
             TAG_PROVIDER_NAME => 'bitrise',
             TAG_PIPELINE_ID => env['BITRISE_BUILD_SLUG'],
@@ -339,7 +394,11 @@ module Datadog
             Core::Git::Ext::TAG_COMMIT_SHA => commit,
             Core::Git::Ext::TAG_BRANCH => branch,
             Core::Git::Ext::TAG_TAG => env['BITRISE_GIT_TAG'],
-            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BITRISE_GIT_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BITRISE_GIT_MESSAGE'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['GIT_CLONE_COMMIT_AUTHOR_NAME'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['GIT_CLONE_COMMIT_AUTHOR_EMAIL'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => env['GIT_CLONE_COMMIT_COMMITER_NAME'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => commiter_email
           }
         end
 
@@ -379,49 +438,63 @@ module Datadog
             committer_date: Time.at(fields[5].to_i).utc.to_datetime.iso8601
           }
         rescue => e
-          Datadog.logger.debug("Unable to read git commit users: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit users: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_repository_url
           exec_git_command('git ls-remote --get-url')
         rescue => e
-          Datadog.logger.debug("Unable to read git repository url: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git repository url: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_commit_message
           exec_git_command('git show -s --format=%s')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit message: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit message: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_branch
           exec_git_command('git rev-parse --abbrev-ref HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git branch: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git branch: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_commit_sha
           exec_git_command('git rev-parse HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit SHA: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit SHA: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_tag
           exec_git_command('git tag --points-at HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git tag: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git tag: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_base_directory
           exec_git_command('git rev-parse --show-toplevel')
         rescue => e
-          Datadog.logger.debug("Unable to read git base directory: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git base directory: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
@@ -483,7 +556,6 @@ module Datadog
           [nil, name_and_email]
         end
       end
-      # rubocop:enable Metrics/ModuleLength:
     end
   end
 end

data/lib/datadog/ci/extensions.rb

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core/configuration/settings'
-require 'datadog/core/configuration/components'
+require_relative '../core/configuration/settings'
+require_relative '../core/configuration/components'
 
-require 'datadog/ci/configuration/settings'
-require 'datadog/ci/configuration/components'
+require_relative 'configuration/settings'
+require_relative 'configuration/components'
 
 module Datadog
   module CI

data/lib/datadog/ci/flush.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/flush'
+require_relative '../tracing/metadata/ext'
+require_relative '../tracing/flush'
 
 module Datadog
   module CI

data/lib/datadog/ci/test.rb

@@ -2,10 +2,10 @@
 
 # typed: false
 
-require 'datadog/tracing/contrib/analytics'
+require_relative '../tracing/contrib/analytics'
 
-require 'datadog/ci/ext/app_types'
-require 'datadog/ci/ext/test'
+require_relative 'ext/app_types'
+require_relative 'ext/test'
 
 require 'rbconfig'
 

data/lib/datadog/ci.rb

@@ -1,8 +1,8 @@
 # typed: strict
 
-require 'datadog/core'
-require 'datadog/tracing'
-require 'datadog/tracing/contrib'
+require_relative 'core'
+require_relative 'tracing'
+require_relative 'tracing/contrib'
 
 module Datadog
   # Namespace for Datadog CI instrumentation:
@@ -12,9 +12,9 @@ module Datadog
 end
 
 # Integrations
-require 'datadog/ci/contrib/cucumber/integration'
-require 'datadog/ci/contrib/rspec/integration'
+require_relative 'ci/contrib/cucumber/integration'
+require_relative 'ci/contrib/rspec/integration'
 
 # Extensions
-require 'datadog/ci/extensions'
+require_relative 'ci/extensions'
 Datadog::CI::Extensions.activate!

data/lib/datadog/core/buffer/cruby.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/buffer/random'
+require_relative 'random'
 
 module Datadog
   module Core

data/lib/datadog/core/buffer/thread_safe.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/buffer/random'
+require_relative 'random'
 
 module Datadog
   module Core

data/lib/datadog/core/configuration/agent_settings_resolver.rb

@@ -2,9 +2,9 @@
 
 require 'uri'
 
-require 'datadog/core/configuration/settings'
-require 'datadog/tracing/configuration/ext'
-require 'ddtrace/transport/ext'
+require_relative 'settings'
+require_relative '../../tracing/configuration/ext'
+require_relative '../../../ddtrace/transport/ext'
 
 module Datadog
   module Core
@@ -18,8 +18,6 @@ module Datadog
       #
       # Whenever there is a conflict (different configurations are provided in different orders), it MUST warn the users
       # about it and pick a value based on the following priority: code > environment variable > defaults.
-      #
-      # rubocop:disable Metrics/ClassLength
       class AgentSettingsResolver
         AgentSettings = \
           Struct.new(
@@ -140,8 +138,8 @@ module Datadog
               value: parsed_url && parsed_url.hostname
             ),
             DetectedConfiguration.new(
-              friendly_name: "#{Datadog::Tracing::Configuration::Ext::Transport::ENV_DEFAULT_HOST} environment variable",
-              value: ENV[Datadog::Tracing::Configuration::Ext::Transport::ENV_DEFAULT_HOST]
+              friendly_name: "#{Datadog::Core::Configuration::Ext::Transport::ENV_DEFAULT_HOST} environment variable",
+              value: ENV[Datadog::Core::Configuration::Ext::Transport::ENV_DEFAULT_HOST]
             )
           )
         end
@@ -221,9 +219,9 @@ module Datadog
 
           @uds_fallback =
             if configured_hostname.nil? &&
-               configured_port.nil? &&
-               deprecated_for_removal_transport_configuration_proc.nil? &&
-               File.exist?(Transport::Ext::UnixSocket::DEFAULT_PATH)
+                configured_port.nil? &&
+                deprecated_for_removal_transport_configuration_proc.nil? &&
+                File.exist?(Transport::Ext::UnixSocket::DEFAULT_PATH)
 
               Transport::Ext::UnixSocket::DEFAULT_PATH
             end
@@ -303,7 +301,7 @@ module Datadog
               if logger
                 logger.debug do
                   'Could not extract configuration from transport_options proc. ' \
-                  "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                  "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
                 end
               end
 
@@ -359,7 +357,6 @@ module Datadog
           end
         end
       end
-      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/datadog/core/configuration/base.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/core/environment/variable_helpers'
-require 'datadog/core/configuration/options'
+require_relative '../environment/variable_helpers'
+require_relative 'options'
 
 module Datadog
   module Core
@@ -32,10 +32,13 @@ module Datadog
             option(name) do |o|
               o.default { settings_class.new }
               o.lazy
+
               o.resetter do |value|
                 value.reset! if value.respond_to?(:reset!)
                 value
               end
+
+              o.type settings_class
             end
           end
 
@@ -79,6 +82,15 @@ module Datadog
             options_hash
           end
 
+          # Retrieves a nested option from a list of symbols
+          def dig(*options)
+            raise ArgumentError, 'expected at least one option' if options.empty?
+
+            options.inject(self) do |receiver, option|
+              receiver.send(option)
+            end
+          end
+
           def reset!
             reset_options!
           end