ddtrace 1.1.0 → 1.4.0

data/lib/datadog/appsec/contrib/rails/integration.rb

@@ -1,10 +1,10 @@
 # typed: ignore
 
-require 'datadog/appsec/contrib/integration'
+require_relative '../integration'
 
-require 'datadog/appsec/contrib/rails/configuration/settings'
-require 'datadog/appsec/contrib/rails/patcher'
-require 'datadog/appsec/contrib/rails/request_middleware'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+require_relative 'request_middleware'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/contrib/rails/patcher.rb

@@ -1,14 +1,14 @@
 # typed: ignore
 
-require 'datadog/core/utils/only_once'
+require_relative '../../../core/utils/only_once'
 
-require 'datadog/appsec/contrib/patcher'
-require 'datadog/appsec/contrib/rails/framework'
-require 'datadog/appsec/contrib/rack/request_middleware'
-require 'datadog/appsec/contrib/rack/request_body_middleware'
-require 'datadog/appsec/contrib/rails/gateway/watcher'
+require_relative '../patcher'
+require_relative 'framework'
+require_relative '../rack/request_middleware'
+require_relative '../rack/request_body_middleware'
+require_relative 'gateway/watcher'
 
-require 'datadog/tracing/contrib/rack/middlewares'
+require_relative '../../../tracing/contrib/rack/middlewares'
 
 module Datadog
   module AppSec
@@ -58,8 +58,10 @@ module Datadog
           def add_middleware(app)
             # Add trace middleware
             if include_middleware?(Datadog::Tracing::Contrib::Rack::TraceMiddleware, app)
-              app.middleware.insert_after(Datadog::Tracing::Contrib::Rack::TraceMiddleware,
-                                          Datadog::AppSec::Contrib::Rack::RequestMiddleware)
+              app.middleware.insert_after(
+                Datadog::Tracing::Contrib::Rack::TraceMiddleware,
+                Datadog::AppSec::Contrib::Rack::RequestMiddleware
+              )
             else
               app.middleware.insert_before(0, Datadog::AppSec::Contrib::Rack::RequestMiddleware)
             end
@@ -81,9 +83,11 @@ module Datadog
               end
 
               if request_response && request_response.any? { |action, _event| action == :block }
-                @_response = ::ActionDispatch::Response.new(403,
-                                                            { 'Content-Type' => 'text/html' },
-                                                            [Datadog::AppSec::Assets.blocked])
+                @_response = ::ActionDispatch::Response.new(
+                  403,
+                  { 'Content-Type' => 'text/html' },
+                  [Datadog::AppSec::Assets.blocked]
+                )
                 request_return = @_response.body
               end
 

data/lib/datadog/appsec/contrib/rails/reactive/action.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/appsec/contrib/rails/request'
+require_relative '../request'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/contrib/sinatra/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/appsec/contrib/configuration/settings'
-require 'datadog/appsec/contrib/sinatra/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb

@@ -1,10 +1,10 @@
 # typed: false
 
-require 'datadog/appsec/instrumentation/gateway'
-require 'datadog/appsec/reactive/operation'
-require 'datadog/appsec/contrib/rack/reactive/request_body'
-require 'datadog/appsec/contrib/sinatra/reactive/routed'
-require 'datadog/appsec/event'
+require_relative '../../../instrumentation/gateway'
+require_relative '../../../reactive/operation'
+require_relative '../../rack/reactive/request_body'
+require_relative '../reactive/routed'
+require_relative '../../../event'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/contrib/sinatra/integration.rb

@@ -1,10 +1,10 @@
 # typed: ignore
 
-require 'datadog/appsec/contrib/integration'
+require_relative '../integration'
 
-require 'datadog/appsec/contrib/sinatra/configuration/settings'
-require 'datadog/appsec/contrib/sinatra/patcher'
-require 'datadog/appsec/contrib/sinatra/request_middleware'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+require_relative 'request_middleware'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/contrib/sinatra/patcher.rb

@@ -1,12 +1,12 @@
 # typed: ignore
 
-require 'datadog/tracing/contrib/rack/middlewares'
+require_relative '../../../tracing/contrib/rack/middlewares'
 
-require 'datadog/appsec/contrib/patcher'
-require 'datadog/appsec/contrib/rack/request_middleware'
-require 'datadog/appsec/contrib/sinatra/framework'
-require 'datadog/appsec/contrib/sinatra/gateway/watcher'
-require 'datadog/tracing/contrib/sinatra/framework'
+require_relative '../patcher'
+require_relative '../rack/request_middleware'
+require_relative 'framework'
+require_relative 'gateway/watcher'
+require_relative '../../../tracing/contrib/sinatra/framework'
 
 module Datadog
   module AppSec
@@ -31,9 +31,11 @@ module Datadog
               tracing_middleware = Datadog::Tracing::Contrib::Rack::TraceMiddleware
 
               if tracing_sinatra_framework.include_middleware?(tracing_middleware, builder)
-                tracing_sinatra_framework.add_middleware_after(tracing_middleware,
-                                                               Datadog::AppSec::Contrib::Rack::RequestMiddleware,
-                                                               builder)
+                tracing_sinatra_framework.add_middleware_after(
+                  tracing_middleware,
+                  Datadog::AppSec::Contrib::Rack::RequestMiddleware,
+                  builder
+                )
               else
                 tracing_sinatra_framework.add_middleware(Datadog::AppSec::Contrib::Rack::RequestMiddleware, builder)
               end
@@ -59,9 +61,11 @@ module Datadog
             end
 
             if request_response && request_response.any? { |action, _event| action == :block }
-              self.response = ::Sinatra::Response.new([Datadog::AppSec::Assets.blocked],
-                                                      403,
-                                                      { 'Content-Type' => 'text/html' })
+              self.response = ::Sinatra::Response.new(
+                [Datadog::AppSec::Assets.blocked],
+                403,
+                { 'Content-Type' => 'text/html' }
+              )
               request_return = nil
             end
 

data/lib/datadog/appsec/event.rb

@@ -2,9 +2,9 @@
 
 require 'json'
 
-require 'datadog/appsec/contrib/rack/request'
-require 'datadog/appsec/contrib/rack/response'
-require 'datadog/appsec/rate_limiter'
+require_relative 'contrib/rack/request'
+require_relative 'contrib/rack/response'
+require_relative 'rate_limiter'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/extensions.rb

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'datadog/appsec/configuration'
+require_relative 'configuration'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/processor.rb

@@ -1,6 +1,6 @@
 # typed: ignore
 
-require 'datadog/appsec/assets'
+require_relative 'assets'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/reactive/engine.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/appsec/reactive/address_hash'
-require 'datadog/appsec/reactive/subscriber'
+require_relative 'address_hash'
+require_relative 'subscriber'
 
 module Datadog
   module AppSec

data/lib/datadog/appsec/reactive/operation.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/appsec/reactive/engine'
+require_relative 'engine'
 
 module Datadog
   module AppSec
@@ -8,8 +8,8 @@ module Datadog
       # Reactive Engine nested operation tracking
       class Operation
         attr_reader :reactive,
-                    :parent,
-                    :name
+          :parent,
+          :name
 
         def initialize(name, parent = nil, reactive_engine = nil)
           Datadog.logger.debug { "operation: #{name} initialize" }

data/lib/datadog/appsec.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/appsec/configuration'
-require 'datadog/appsec/extensions'
+require_relative 'appsec/configuration'
+require_relative 'appsec/extensions'
 
 module Datadog
   # Namespace for Datadog AppSec instrumentation
@@ -18,6 +18,6 @@ module Datadog
 end
 
 # Integrations
-require 'datadog/appsec/contrib/rack/integration'
-require 'datadog/appsec/contrib/sinatra/integration'
-require 'datadog/appsec/contrib/rails/integration'
+require_relative 'appsec/contrib/rack/integration'
+require_relative 'appsec/contrib/sinatra/integration'
+require_relative 'appsec/contrib/rails/integration'

data/lib/datadog/ci/configuration/components.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/ci/flush'
+require_relative '../flush'
 
 module Datadog
   module CI

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

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'datadog/ci/ext/settings'
+require_relative '../ext/settings'
 
 module Datadog
   module CI

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

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

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

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/ci/test'
-require 'datadog/ci/ext/app_types'
-require 'datadog/ci/ext/environment'
-require 'datadog/ci/ext/test'
-require 'datadog/ci/contrib/cucumber/ext'
+require_relative '../../test'
+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/cucumber/instrumentation.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/ci/contrib/cucumber/formatter'
+require_relative 'formatter'
 
 module Datadog
   module CI

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

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

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,7 +2,7 @@
 
 # typed: true
 
-require 'datadog/core/git/ext'
+require_relative '../../core/git/ext'
 
 require 'open3'
 
@@ -119,17 +119,19 @@ 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',

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
@@ -221,9 +221,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

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
@@ -79,6 +79,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