ddtrace 0.49.0 → 0.52.0

data/lib/ddtrace/contrib/sequel/utils.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/integration'
 
 module Datadog

data/lib/ddtrace/contrib/shoryuken/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 
 module Datadog

data/lib/ddtrace/contrib/shoryuken/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Shoryuken

data/lib/ddtrace/contrib/shoryuken/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/shoryuken/ext'
 require 'ddtrace/contrib/shoryuken/configuration/settings'

data/lib/ddtrace/contrib/shoryuken/patcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/shoryuken/tracer'
 
 module Datadog

data/lib/ddtrace/contrib/shoryuken/tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/analytics'
 
 module Datadog

data/lib/ddtrace/contrib/sidekiq/client_tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/sidekiq/tracing'
 require 'ddtrace/contrib/analytics'
 

data/lib/ddtrace/contrib/sidekiq/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/sidekiq/ext'
 

data/lib/ddtrace/contrib/sidekiq/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Sidekiq

data/lib/ddtrace/contrib/sidekiq/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/sidekiq/configuration/settings'
 require 'ddtrace/contrib/sidekiq/patcher'

data/lib/ddtrace/contrib/sidekiq/patcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/patcher'
 
 module Datadog

data/lib/ddtrace/contrib/sidekiq/server_tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/sidekiq/tracing'
 require 'ddtrace/contrib/analytics'
 

data/lib/ddtrace/contrib/sidekiq/tracing.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/sidekiq/ext'
 

data/lib/ddtrace/contrib/sinatra/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/sinatra/ext'

data/lib/ddtrace/contrib/sinatra/env.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/http'
 require 'ddtrace/contrib/sinatra/ext'
 

data/lib/ddtrace/contrib/sinatra/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module Sinatra

data/lib/ddtrace/contrib/sinatra/headers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/http'
 
 module Datadog

data/lib/ddtrace/contrib/sinatra/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/sinatra/configuration/settings'
 require 'ddtrace/contrib/sinatra/patcher'

data/lib/ddtrace/contrib/sinatra/patcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 
 module Datadog
@@ -5,6 +6,7 @@ module Datadog
     module Sinatra
       # Patcher enables patching of 'sinatra' module.
       module Patcher
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
         include Contrib::Patcher
 
         module_function
@@ -20,7 +22,7 @@ module Datadog
 
         def register_tracer
           ::Sinatra.send(:register, Datadog::Contrib::Sinatra::Tracer)
-          ::Sinatra::Base.send(:prepend, Sinatra::Tracer::Base)
+          ::Sinatra::Base.prepend(Sinatra::Tracer::Base)
         end
       end
     end

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'sinatra/base'
 
 require 'ddtrace/ext/app_types'
@@ -104,10 +105,9 @@ module Datadog
             tracer.trace(
               Ext::SPAN_ROUTE,
               service: configuration[:service_name],
-              span_type: Datadog::Ext::HTTP::TYPE_INBOUND
+              span_type: Datadog::Ext::HTTP::TYPE_INBOUND,
+              resource: "#{request.request_method} #{@datadog_route}",
             ) do |span|
-              span.resource = "#{request.request_method} #{@datadog_route}"
-
               span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
               span.set_tag(Ext::TAG_ROUTE_PATH, @datadog_route)
               span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name) if request.script_name && !request.script_name.empty?
@@ -115,6 +115,16 @@ module Datadog
               rack_request_span = env[Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
               rack_request_span.resource = span.resource if rack_request_span
 
+              sinatra_request_span =
+                if self.class <= ::Sinatra::Application # Classic style (top-level) application
+                  Sinatra::Env.datadog_span(env, ::Sinatra::Application)
+                else
+                  Sinatra::Env.datadog_span(env, self.class)
+                end
+              if sinatra_request_span # DEV: Is it possible for sinatra_request_span to ever be nil here?
+                sinatra_request_span.resource = span.resource
+              end
+
               Contrib::Analytics.set_measured(span)
 
               super

data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/sinatra/ext'
 require 'ddtrace/contrib/sinatra/env'
@@ -28,7 +29,9 @@ module Datadog
             Ext::SPAN_REQUEST,
             service: configuration[:service_name],
             span_type: Datadog::Ext::HTTP::TYPE_INBOUND,
-            resource: env['REQUEST_METHOD']
+            # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
+            # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
+            resource: nil,
           ) do |span|
             begin
               Sinatra::Env.set_datadog_span(env, @app_instance, span)
@@ -46,6 +49,10 @@ module Datadog
 
               span.set_tag(Ext::TAG_APP_NAME, @app_instance.settings.name)
 
+              # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
+              # resource; if no resource was set, let's use a fallback
+              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+
               # TODO: This backfills the non-matching Sinatra app with a "#{method} #{path}"
               # TODO: resource name. This shouldn't be the case, as that app has never handled
               # TODO: the response with that resource.

data/lib/ddtrace/contrib/sneakers/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/configuration/settings'

data/lib/ddtrace/contrib/sneakers/ext.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Datadog

data/lib/ddtrace/contrib/sneakers/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/integration'

data/lib/ddtrace/contrib/sneakers/patcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/sneakers/tracer'

data/lib/ddtrace/contrib/sneakers/tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/analytics'

data/lib/ddtrace/contrib/status_code_matcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'set'
 require 'ddtrace/ext/http'
 

data/lib/ddtrace/contrib/sucker_punch/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/sucker_punch/ext'
 

data/lib/ddtrace/contrib/sucker_punch/exception_handler.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'sucker_punch'
 
 module Datadog
@@ -10,13 +11,11 @@ module Datadog
         module_function
 
         def patch!
-          ::SuckerPunch.class_eval do
-            class << self
-              alias_method :__exception_handler, :exception_handler
+          ::SuckerPunch.singleton_class.class_eval do
+            alias_method :__exception_handler, :exception_handler
 
-              def exception_handler
-                ::Datadog::Contrib::SuckerPunch::ExceptionHandler::METHOD
-              end
+            def exception_handler
+              ::Datadog::Contrib::SuckerPunch::ExceptionHandler::METHOD
             end
           end
         end

data/lib/ddtrace/contrib/sucker_punch/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module SuckerPunch

data/lib/ddtrace/contrib/sucker_punch/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'sucker_punch'
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/sucker_punch/ext'

data/lib/ddtrace/contrib/sucker_punch/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/sucker_punch/configuration/settings'
 require 'ddtrace/contrib/sucker_punch/patcher'

data/lib/ddtrace/contrib/sucker_punch/patcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/sucker_punch/ext'
@@ -7,6 +8,7 @@ module Datadog
     module SuckerPunch
       # Patcher enables patching of 'sucker_punch' module.
       module Patcher
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
         include Contrib::Patcher
 
         module_function

data/lib/ddtrace/correlation.rb

@@ -1,5 +1,6 @@
+# typed: false
 require 'ddtrace/ext/correlation'
-require 'ddtrace/environment'
+require 'datadog/core/environment/variable_helpers'
 
 module Datadog
   # Contains behavior for managing correlations with tracing

data/lib/ddtrace/diagnostics/environment_logger.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'date'
 require 'json'
 require 'rbconfig'
@@ -22,7 +23,7 @@ module Datadog
           log_environment!(data.to_json)
           log_error!('Agent Error'.freeze, data[:agent_error]) if data[:agent_error]
         rescue => e
-          Datadog.logger.warn("Failed to collect environment information: #{e} location: #{e.backtrace.first}")
+          Datadog.logger.warn("Failed to collect environment information: #{e} Location: #{Array(e.backtrace).first}")
         end
 
         private
@@ -73,14 +74,14 @@ module Datadog
 
       # @return [String] "ruby"
       def lang
-        Ext::Runtime::LANG
+        Core::Environment::Ext::LANG
       end
 
       # Supported Ruby language version.
       # Will be distinct from VM version for non-MRI environments.
       # @return [String]
       def lang_version
-        Ext::Runtime::LANG_VERSION
+        Core::Environment::Ext::LANG_VERSION
       end
 
       # @return [String] configured application environment
@@ -259,7 +260,7 @@ module Datadog
 
       # Capture all active integration settings into "integrationName_settingName: value" entries.
       def instrumented_integrations_settings
-        Hash[instrumented_integrations.flat_map do |name, integration|
+        instrumented_integrations.flat_map do |name, integration|
           integration.configuration.to_h.flat_map do |setting, value|
             next [] if setting == :tracer # Skip internal Ruby objects
 
@@ -267,7 +268,7 @@ module Datadog
             # handlers possibly causing errors.
             [[:"integration_#{name}_#{setting}", value.to_s]]
           end
-        end]
+        end.to_h
       end
 
       # Outputs "k1:v1,k2:v2,..."

data/lib/ddtrace/diagnostics/health.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'ddtrace/ext/diagnostics'
 require 'ddtrace/metrics'
 

data/lib/ddtrace/distributed_tracing/headers/b3.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 require 'ddtrace/distributed_tracing/headers/helpers'

data/lib/ddtrace/distributed_tracing/headers/b3_single.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 require 'ddtrace/distributed_tracing/headers/helpers'

data/lib/ddtrace/distributed_tracing/headers/datadog.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 

data/lib/ddtrace/distributed_tracing/headers/headers.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/configuration'
 require 'ddtrace/span'
 require 'ddtrace/ext/distributed'

data/lib/ddtrace/distributed_tracing/headers/helpers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/configuration'
 require 'ddtrace/span'
 require 'ddtrace/ext/priority'

data/lib/ddtrace/encoding.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'json'
 require 'msgpack'
 
@@ -6,6 +7,8 @@ module Datadog
   module Encoding
     # Encoder interface that provides the logic to encode traces and service
     module Encoder
+      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
       def content_type
         raise NotImplementedError
       end

data/lib/ddtrace/error.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 # Datadog global namespace
@@ -19,75 +20,66 @@ module Datadog
 
       private
 
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
-        # Ruby 2.0 exceptions don't have `cause`.
-        # Only current exception stack trace is reported.
-        # This is the same behavior as before.
-        def full_backtrace(ex)
-          backtrace = ex.backtrace
-          backtrace.join("\n") if backtrace
-        end
-      else
-        # Returns a stack trace with nested error causes and details.
-        #
-        # This manually implements Ruby >= 2.6 error output for two reasons:
-        #
-        # 1. It is not available in Ruby < 2.6.
-        # 2. It's measurably faster to manually implement it in Ruby.
-        #
-        # This method mimics the exact output of
-        # `ex.full_message(highlight: false, order: :top)`
-        # but it's around 3x faster in our benchmark test
-        # at `error_spec.rb`.
-        def full_backtrace(ex)
-          backtrace = String.new
-          backtrace_for(ex, backtrace)
-
-          # Avoid circular causes
-          causes = {}
-          causes[ex] = true
+      # Returns a stack trace with nested error causes and details.
+      #
+      # This manually implements Ruby >= 2.6 error output for two reasons:
+      #
+      # 1. It is not available in Ruby < 2.6.
+      # 2. It's measurably faster to manually implement it in Ruby.
+      #
+      # This method mimics the exact output of
+      # `ex.full_message(highlight: false, order: :top)`
+      # but it's around 3x faster in our benchmark test
+      # at `error_spec.rb`.
+      def full_backtrace(ex)
+        backtrace = String.new
+        backtrace_for(ex, backtrace)
 
-          while (cause = ex.cause) && !causes.key?(cause)
-            backtrace_for(cause, backtrace)
-            causes[cause] = true
-          end
+        # Avoid circular causes
+        causes = {}
+        causes[ex] = true
 
-          backtrace
+        cause = ex
+        while (cause = cause.cause) && !causes.key?(cause)
+          backtrace_for(cause, backtrace)
+          causes[cause] = true
         end
 
-        # Outputs the following format for exceptions:
-        #
-        # ```
-        # error_spec.rb:55:in `wrapper': wrapper layer (RuntimeError)
-        # 	from error_spec.rb:40:in `wrapper'
-        # 	from error_spec.rb:61:in `caller'
-        #   ...
-        # ```
-        def backtrace_for(ex, backtrace)
-          trace = ex.backtrace
-          return unless trace
+        backtrace
+      end
 
-          if trace[0]
-            # Add Exception information to error line
-            backtrace << trace[0]
-            backtrace << ': '
-            backtrace << ex.message
-            backtrace << ' ('
-            backtrace << ex.class.to_s
-            backtrace << ')'
-          end
+      # Outputs the following format for exceptions:
+      #
+      # ```
+      # error_spec.rb:55:in `wrapper': wrapper layer (RuntimeError)
+      # 	from error_spec.rb:40:in `wrapper'
+      # 	from error_spec.rb:61:in `caller'
+      #   ...
+      # ```
+      def backtrace_for(ex, backtrace)
+        trace = ex.backtrace
+        return unless trace
 
-          if trace[1]
-            # Ident stack trace for caller lines, to separate
-            # them from the main error lines.
-            trace[1..-1].each do |line|
-              backtrace << "\n\tfrom "
-              backtrace << line
-            end
-          end
+        if trace[0]
+          # Add Exception information to error line
+          backtrace << trace[0]
+          backtrace << ': '
+          backtrace << ex.message.to_s
+          backtrace << ' ('
+          backtrace << ex.class.to_s
+          backtrace << ')'
+        end
 
-          backtrace << "\n"
+        if trace[1]
+          # Ident stack trace for caller lines, to separate
+          # them from the main error lines.
+          trace[1..-1].each do |line|
+            backtrace << "\n\tfrom "
+            backtrace << line
+          end
         end
+
+        backtrace << "\n"
       end
     end