ddtrace 0.49.0 → 0.50.0

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

@@ -24,7 +24,7 @@ module Datadog
 
         def prepend_interceptor
           ::GRPC::InterceptionContext
-            .send(:prepend, Datadog::Contrib::GRPC::InterceptWithDatadog)
+            .prepend(Datadog::Contrib::GRPC::InterceptWithDatadog)
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Datadog
       # Instrumentation for Net::HTTP
       module Instrumentation
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Span hook invoked after request is completed.

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

@@ -18,7 +18,7 @@ module Datadog
 
         # patch applies our patch if needed
         def patch
-          ::Net::HTTP.send(:include, Instrumentation)
+          ::Net::HTTP.include(Instrumentation)
         end
       end
     end

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

@@ -12,7 +12,7 @@ module Datadog
       # Instrumentation for Httpclient
       module Instrumentation
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Instance methods for configuration

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

@@ -26,7 +26,7 @@ module Datadog
         def patch
           PATCH_ONLY_ONCE.run do
             begin
-              ::HTTPClient.send(:include, Instrumentation)
+              ::HTTPClient.include(Instrumentation)
             rescue StandardError => e
               Datadog::Logger.error("Unable to apply httpclient integration: #{e}")
             end

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

@@ -12,7 +12,7 @@ module Datadog
       # Instrumentation for Httprb
       module Instrumentation
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Instance methods for configuration

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

@@ -26,7 +26,7 @@ module Datadog
         def patch
           PATCH_ONLY_ONCE.run do
             begin
-              ::HTTP::Client.send(:include, Instrumentation)
+              ::HTTP::Client.include(Instrumentation)
             rescue StandardError => e
               Datadog::Logger.error("Unable to apply httprb integration: #{e}")
             end

data/lib/ddtrace/contrib/integration.rb

@@ -7,9 +7,9 @@ module Datadog
     # Base provides features that are shared across all integrations
     module Integration
       def self.included(base)
-        base.send(:include, Configurable)
-        base.send(:include, Patchable)
-        base.send(:include, Registerable)
+        base.include(Configurable)
+        base.include(Patchable)
+        base.include(Registerable)
       end
     end
   end

data/lib/ddtrace/contrib/kafka/event.rb

@@ -8,8 +8,8 @@ module Datadog
       # Defines basic behaviors for an ActiveSupport event.
       module Event
         def self.included(base)
-          base.send(:include, ActiveSupport::Notifications::Event)
-          base.send(:extend, ClassMethods)
+          base.include(ActiveSupport::Notifications::Event)
+          base.extend(ClassMethods)
         end
 
         # Class methods for Kafka events.

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

@@ -13,7 +13,7 @@ module Datadog
         # Instrumentation for Mongo::Client
         module Client
           def self.included(base)
-            base.send(:include, InstanceMethods)
+            base.include(InstanceMethods)
           end
 
           # Instance methods for Mongo::Client
@@ -44,7 +44,7 @@ module Datadog
         # Instrumentation for Mongo::Address
         module Address
           def self.included(base)
-            base.send(:include, InstanceMethods)
+            base.include(InstanceMethods)
           end
 
           # Instance methods for Mongo::Address

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

@@ -16,8 +16,8 @@ module Datadog
         end
 
         def patch
-          ::Mongo::Address.send(:include, Instrumentation::Address)
-          ::Mongo::Client.send(:include, Instrumentation::Client)
+          ::Mongo::Address.include(Instrumentation::Address)
+          ::Mongo::Client.include(Instrumentation::Client)
           add_mongo_monitoring
         end
 

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

@@ -11,7 +11,7 @@ module Datadog
       # Mysql2::Client patch module
       module Instrumentation
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Mysql2::Client patch instance methods

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

@@ -19,7 +19,7 @@ module Datadog
         end
 
         def patch_mysql2_client
-          ::Mysql2::Client.send(:include, Instrumentation)
+          ::Mysql2::Client.include(Instrumentation)
         end
       end
     end

data/lib/ddtrace/contrib/patchable.rb

@@ -3,8 +3,8 @@ module Datadog
     # Base provides features that are shared across all integrations
     module Patchable
       def self.included(base)
-        base.send(:extend, ClassMethods)
-        base.send(:include, InstanceMethods)
+        base.extend(ClassMethods)
+        base.include(InstanceMethods)
       end
 
       # Class methods for integrations

data/lib/ddtrace/contrib/patcher.rb

@@ -5,8 +5,8 @@ module Datadog
     # Common behavior for patcher modules
     module Patcher
       def self.included(base)
-        base.singleton_class.send(:prepend, CommonMethods)
-        base.send(:prepend, CommonMethods) if base.instance_of?(Class)
+        base.singleton_class.prepend(CommonMethods)
+        base.prepend(CommonMethods) if base.instance_of?(Class)
       end
 
       # Prepended instance methods for all patchers

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

@@ -11,7 +11,7 @@ module Datadog
         # Instrumentation for Presto::Client::Client
         module Client
           def self.included(base)
-            base.send(:prepend, InstanceMethods)
+            base.prepend(InstanceMethods)
           end
 
           # Instance methods for Presto::Client

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

@@ -21,7 +21,7 @@ module Datadog
         def patch
           PATCH_ONLY_ONCE.run do
             begin
-              ::Presto::Client::Client.send(:include, Instrumentation::Client)
+              ::Presto::Client::Client.include(Instrumentation::Client)
             rescue StandardError => e
               Datadog.logger.error("Unable to apply Presto integration: #{e}")
             end

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

@@ -19,11 +19,9 @@ module Datadog
           require_relative 'tracer_cleaner'
 
           # Instrument all Qless Workers
-          ::Qless::Workers::BaseWorker.class_eval do
-            # These are executed in inverse order of listing here
-            include QlessJob
-            include TracerCleaner
-          end
+          # These are executed in inverse order of listing here
+          ::Qless::Workers::BaseWorker.include(QlessJob)
+          ::Qless::Workers::BaseWorker.include(TracerCleaner)
         end
 
         def get_option(option)

data/lib/ddtrace/contrib/racecar/event.rb

@@ -9,8 +9,8 @@ module Datadog
       # Defines basic behaviors for an ActiveRecord event.
       module Event
         def self.included(base)
-          base.send(:include, ActiveSupport::Notifications::Event)
-          base.send(:extend, ClassMethods)
+          base.include(ActiveSupport::Notifications::Event)
+          base.extend(ClassMethods)
         end
 
         # Class methods for Racecar events.

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

@@ -7,7 +7,7 @@ module Datadog
       # Instrumentation for Rake tasks
       module Instrumentation
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Instance methods for Rake instrumentation

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

@@ -18,7 +18,7 @@ module Datadog
 
         def patch
           # Add instrumentation patch to Rake task
-          ::Rake::Task.send(:include, Instrumentation)
+          ::Rake::Task.include(Instrumentation)
         end
 
         def get_option(option)

data/lib/ddtrace/contrib/registerable.rb

@@ -5,8 +5,8 @@ module Datadog
     # Defines registerable behavior for integrations
     module Registerable
       def self.included(base)
-        base.send(:extend, ClassMethods)
-        base.send(:include, InstanceMethods)
+        base.extend(ClassMethods)
+        base.include(InstanceMethods)
       end
 
       # Class methods for registerable behavior

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

@@ -18,7 +18,7 @@ module Datadog
         def patch
           require_relative 'resque_job'
 
-          ::Resque::Job.send(:prepend, Resque::Job)
+          ::Resque::Job.prepend(Resque::Job)
 
           workers = Datadog.configuration[:resque][:workers] || []
           workers.each { |worker| worker.extend(ResqueJob) }

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

@@ -15,7 +15,7 @@ module Datadog
           require 'ddtrace/ext/app_types'
           require 'ddtrace/contrib/rest_client/request_patch'
 
-          ::RestClient::Request.send(:include, RequestPatch)
+          ::RestClient::Request.include(RequestPatch)
         end
       end
     end

data/lib/ddtrace/contrib/rest_client/request_patch.rb

@@ -10,7 +10,7 @@ module Datadog
       # RestClient RequestPatch
       module RequestPatch
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # InstanceMethods - implementing instrumentation

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

@@ -10,7 +10,7 @@ module Datadog
       # Adds instrumentation to Sequel::Database
       module Database
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Instance methods for instrumenting Sequel::Database

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

@@ -10,7 +10,7 @@ module Datadog
       # Adds instrumentation to Sequel::Dataset
       module Dataset
         def self.included(base)
-          base.send(:prepend, InstanceMethods)
+          base.prepend(InstanceMethods)
         end
 
         # Instance methods for instrumenting Sequel::Dataset

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

@@ -21,11 +21,11 @@ module Datadog
         end
 
         def patch_sequel_database
-          ::Sequel::Database.send(:include, Database)
+          ::Sequel::Database.include(Database)
         end
 
         def patch_sequel_dataset
-          ::Sequel::Dataset.send(:include, Dataset)
+          ::Sequel::Dataset.include(Dataset)
         end
       end
     end

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

@@ -20,7 +20,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/sucker_punch/exception_handler.rb

@@ -10,13 +10,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/diagnostics/environment_logger.rb

@@ -259,7 +259,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 +267,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/error.rb

@@ -19,75 +19,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