ddtrace 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4e552c5952c4dfa4cd7889db389bf87c06e400
-  data.tar.gz: 635dc26f996a8cf9c424dacf85a3e48ae6ca7517
+  metadata.gz: 40d91156b9aa968ec8412ffaea02b727deb47660
+  data.tar.gz: f45dd35b50a8f8b9db17a0421d88ae5b50e4fbd5
 SHA512:
-  metadata.gz: 16d01f87e058e4d0d77936c39d9115075dfdcff3cfdc1a2ba74c668c5b27e6d8376d2b5327b18ae0f2d2fe6587254d5328d409b8e7ea0b82430b63d3e7a36cb7
-  data.tar.gz: e5897d2d6756d99465d8bcbbd2169997d6e5f30f791eece446c8b56c112f3f22ef3c5f5d7b38621fde1bd1cdc2d65c3746f147dfba78f8497cdaf803423e616f
+  metadata.gz: f122ec820458d5fd1f0fe4502846a9ce84f725a24d749118e63d67f16aae5a0408c2101eab79c5f30e97850e7530a15fd4af384c4ebcdd170704a501fd24ac09
+  data.tar.gz: a5e0d439791bca6b6c48caeb54db0bc113875e97dc3a2c7c4c9ee3e05041578b204cc0fae21b4e8ea7cc71ca117d9b877417d9f4d732d8fa265b23f26437e9a8

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased (beta)]
 
+## [0.18.1] - 2018-12-20
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...v0.18.1
+
+### Fixed
+
+- ActiveRecord `SystemStackError` with some 3rd party libraries. (@EpiFouloux, @tjgrathwell, @guizmaii)
+
 ## [0.18.0] - 2018-12-18
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.0
@@ -594,8 +604,9 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...0.19-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...0.19-dev
+[0.18.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.3...v0.18.0
 [0.17.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.2...v0.17.3
 [0.17.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.1...v0.17.2

data/lib/ddtrace/contrib/active_record/events/sql.rb

@@ -24,7 +24,7 @@ module Datadog
           end
 
           def process(span, event, _id, payload)
-            config = Utils.connection_config(payload[:connection])
+            config = Utils.connection_config(payload[:connection], payload[:connection_id])
             settings = Datadog.configuration[:active_record, config]
             adapter_name = Datadog::Utils::Database.normalize_vendor(config[:adapter])
             service_name = if settings.service_name != Datadog::Utils::Database::VENDOR_DEFAULT

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

@@ -1,5 +1,4 @@
 require 'ddtrace/contrib/patcher'
-require 'ddtrace/contrib/active_record/patches/abstract_adapter'
 require 'ddtrace/contrib/active_record/events'
 
 module Datadog
@@ -18,7 +17,6 @@ module Datadog
         def patch
           do_once(:active_record) do
             begin
-              ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Patches::AbstractAdapter)
               Events.subscribe!
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Active Record integration: #{e}")

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

@@ -21,14 +21,37 @@ module Datadog
           connection_config[:port]
         end
 
-        def self.connection_config(connection = nil)
-          connection.nil? ? default_connection_config : connection_config_from_connection(connection)
-        end
+        # In newer Rails versions, the `payload` contains both the `connection` and its `object_id` named `connection_id`.
+        #
+        # So, if rails is recent we'll have a direct access to the connection.
+        # Else, we'll find it thanks to the passed `connection_id`.
+        #
+        # See this PR for more details: https://github.com/rails/rails/pull/34602
+        #
+        def self.connection_config(connection = nil, connection_id = nil)
+          return default_connection_config if connection.nil? && connection_id.nil?
+
+          conn = if !connection.nil?
+                   connection
+                 # Rails 3.0 - 3.2
+                 elsif Gem.loaded_specs['activerecord'].version < Gem::Version.new('4.0')
+                   ::ActiveRecord::Base
+                     .connection_handler
+                     .connection_pools
+                     .values
+                     .flat_map(&:connections)
+                     .find { |c| c.object_id == connection_id }
+                 # Rails 4.2+
+                 else
+                   ::ActiveRecord::Base
+                     .connection_handler
+                     .connection_pool_list
+                     .flat_map(&:connections)
+                     .find { |c| c.object_id == connection_id }
+                 end
 
-        # Typical of ActiveSupport::Notifications `sql.active_record`
-        def self.connection_config_from_connection(connection)
-          if connection.instance_variable_defined?(:@config)
-            connection.instance_variable_get(:@config)
+          if conn.instance_variable_defined?(:@config)
+            conn.instance_variable_get(:@config)
           else
             EMPTY_CONFIG
           end

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 18
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -312,7 +312,6 @@ files:
 - lib/ddtrace/contrib/active_record/ext.rb
 - lib/ddtrace/contrib/active_record/integration.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
-- lib/ddtrace/contrib/active_record/patches/abstract_adapter.rb
 - lib/ddtrace/contrib/active_record/utils.rb
 - lib/ddtrace/contrib/active_support/notifications/event.rb
 - lib/ddtrace/contrib/active_support/notifications/subscriber.rb

data/lib/ddtrace/contrib/active_record/patches/abstract_adapter.rb

@@ -1,72 +0,0 @@
-require 'set'
-require 'ddtrace/augmentation/shim'
-
-module Datadog
-  module Contrib
-    module ActiveRecord
-      # Defines basic behaviors for an ActiveRecord event.
-      module Patches
-        # Adds patch to AbstractAdapter to make it pass more information through
-        # ActiveSupport notifications, for better instrumentation.
-        module AbstractAdapter
-          def self.included(base)
-            if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-              base.class_eval do
-                alias_method :log_without_datadog, :log
-                remove_method :log
-                include InstanceMethods
-              end
-            else
-              base.send(:prepend, InstanceMethods)
-            end
-          end
-
-          # Compatibility shim for Rubies not supporting `.prepend`
-          module InstanceMethodsCompatibility
-            def log(*args, &block)
-              log_without_datadog(*args, &block)
-            end
-          end
-
-          # InstanceMethods - implementing instrumentation
-          module InstanceMethods
-            include InstanceMethodsCompatibility unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
-
-            EVENT_ACTIVERECORD_SQL = 'sql.active_record'.freeze
-
-            # Override #log since sometimes connections are initialized prior
-            # to when the patch is applied; this will allow existing connections
-            # to receive the Shim as well.
-            def log(*args, &block)
-              insert_shim! unless shim_inserted?
-              super
-            end
-
-            private
-
-            def shim_inserted?
-              instance_variable_defined?(:@instrumenter) \
-                && Datadog::Shim.shim?(@instrumenter)
-            end
-
-            def insert_shim!
-              @instrumenter = Datadog::Shim.new(@instrumenter) do |shim|
-                connection = self
-
-                shim.override_method!(:instrument) do |*args, &block|
-                  # Inject connection into arguments
-                  if args[0] == EVENT_ACTIVERECORD_SQL && args[1].is_a?(Hash)
-                    args[1][:connection] ||= connection
-                  end
-
-                  # Call original
-                  shim_target.instrument(*args, &block)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end