ddtrace 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f346610fe35749be53eaf03db7fc190790e39e7a
-  data.tar.gz: c4ec02969569dd14ddde32e0018e870872efd491
+  metadata.gz: 31d6da2597a1d5479adcaf45268088c482e72d30
+  data.tar.gz: e36b2dcb51d0f780ab15f365c9e5ad3989509e81
 SHA512:
-  metadata.gz: 7ef4b64aca16574394a2cb94b2c601a69e01f81563b2ca3db981714e19635dbfba3457827747a1f88ccba2b215ef3c891172f6e12a1d4f0075288401a460018e
-  data.tar.gz: 232e89d0f09f137fbdef9ee286526a73d92bb2294cb0909d705cae20eddeaa0da1e04b2ae6cc6f4db8f22949e5d263c6972149bedcb2fca3171409ce830a674b
+  metadata.gz: 91cae89a7b193e57861cbb78bc456bae57c1edfe5d3e65869245be105e826fabe604477c34f21c95846f1173b3df80de4889da780b91854c9dd69589766eb1a7
+  data.tar.gz: 2323a8f95dd92228c607f92550dccf30268369444f2595dcb52673da74cb4a548c363ab46b631a81ddd3d812f2ed0e8f4abafe91d63fb90caca64ea91cde55ef

data/Appraisals

@@ -57,7 +57,7 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
   if RUBY_VERSION >= '2.1.10'
     appraise 'rails4-mysql2' do
       gem 'rails', '4.2.7.1'
-      gem 'mysql2', platform: :ruby
+      gem 'mysql2', '< 0.5', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
     end
 
@@ -79,7 +79,7 @@ if RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
   if RUBY_VERSION >= '2.2.2'
     appraise 'rails5-mysql2' do
       gem 'rails', '5.0.1'
-      gem 'mysql2', platform: :ruby
+      gem 'mysql2', '< 0.5', platform: :ruby
     end
 
     appraise 'rails5-postgres' do
@@ -129,7 +129,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
     gem 'dalli'
     gem 'resque', '< 2.0'
     gem 'racecar', '>= 0.3.5'
-    gem 'mysql2', platform: :ruby
+    gem 'mysql2', '< 0.5', platform: :ruby
   end
 else
   appraise 'contrib-old' do

data/CHANGELOG.md

@@ -24,6 +24,17 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.11.2...v0.12.0.beta1
 - ActiveRecord object instantiation tracing (#311, #334)
 - `http.request_id` tag to Rack spans (#335)
 
+## [0.11.4] - 2018-03-29
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.11.4
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.11.3...v0.11.4
+
+### Fixed
+- Transport body parsing when downgrading (#369)
+- Transport incorrectly attempting to apply sampling to service metadata (#370)
+- `sql.active_record` traces showing incorrect adapter settings when non-default adapter used (#383)
+
 ## [0.11.3] - 2018-03-06
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.11.3
@@ -214,6 +225,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0.beta2...0.12-dev
 [0.12.0.beta2]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0.beta1...v0.12.0.beta2
 [0.12.0.beta1]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.2...v0.12.0.beta1
+[0.11.4]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.3...v0.11.4
 [0.11.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.2...v0.11.3
 [0.11.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.1...v0.11.2
 [0.11.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.0...v0.11.1

data/gemfiles/contrib.gemfile

@@ -19,6 +19,6 @@ gem "sucker_punch"
 gem "dalli"
 gem "resque", "< 2.0"
 gem "racecar", ">= 0.3.5"
-gem "mysql2", platform: :ruby
+gem "mysql2", "< 0.5", platform: :ruby
 
 gemspec path: "../"

data/gemfiles/rails4_mysql2.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "4.2.7.1"
-gem "mysql2", platform: :ruby
+gem "mysql2", "< 0.5", platform: :ruby
 gem "activerecord-jdbcmysql-adapter", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails5_mysql2.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "5.0.1"
-gem "mysql2", platform: :ruby
+gem "mysql2", "< 0.5", platform: :ruby
 
 gemspec path: "../"

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

@@ -42,35 +42,20 @@ module Datadog
           end
         end
 
-        def self.adapter_name
-          @adapter_name ||= Datadog::Contrib::Rails::Utils.adapter_name
-        end
-
-        def self.database_name
-          @database_name ||= Datadog::Contrib::Rails::Utils.database_name
-        end
-
-        def self.adapter_host
-          @adapter_host ||= Datadog::Contrib::Rails::Utils.adapter_host
-        end
-
-        def self.adapter_port
-          @adapter_port ||= Datadog::Contrib::Rails::Utils.adapter_port
-        end
-
         def self.database_service
           return @database_service if defined?(@database_service)
 
-          @database_service = get_option(:service_name) || adapter_name
+          @database_service = get_option(:service_name) || Datadog::Contrib::Rails::Utils.adapter_name
           get_option(:tracer).set_service_info(@database_service, 'active_record', Ext::AppTypes::DB)
           @database_service
         end
 
         def self.sql(_name, start, finish, _id, payload)
           span_type = Datadog::Ext::SQL::TYPE
+          connection_config = Datadog::Contrib::Rails::Utils.connection_config(payload[:connection_id])
 
           span = get_option(:tracer).trace(
-            "#{adapter_name}.query",
+            "#{connection_config[:adapter_name]}.query",
             resource: payload.fetch(:sql),
             service: database_service,
             span_type: span_type
@@ -85,11 +70,11 @@ module Datadog
           # so that the ``sql.query`` tag will be set in the agent with an
           # obfuscated version
           span.span_type = Datadog::Ext::SQL::TYPE
-          span.set_tag('active_record.db.vendor', adapter_name)
-          span.set_tag('active_record.db.name', database_name)
+          span.set_tag('active_record.db.vendor', connection_config[:adapter_name])
+          span.set_tag('active_record.db.name', connection_config[:database_name])
           span.set_tag('active_record.db.cached', cached) if cached
-          span.set_tag('out.host', adapter_host)
-          span.set_tag('out.port', adapter_port)
+          span.set_tag('out.host', connection_config[:adapter_host])
+          span.set_tag('out.port', connection_config[:adapter_port])
           span.start_time = start
           span.finish(finish)
         rescue StandardError => e

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

@@ -24,14 +24,11 @@ module Datadog
         def self.sql(_name, start, finish, _id, payload)
           tracer = Datadog.configuration[:rails][:tracer]
           database_service = Datadog.configuration[:rails][:database_service]
-          adapter_name = Datadog::Contrib::Rails::Utils.adapter_name
-          database_name = Datadog::Contrib::Rails::Utils.database_name
-          adapter_host = Datadog::Contrib::Rails::Utils.adapter_host
-          adapter_port = Datadog::Contrib::Rails::Utils.adapter_port
+          connection_config = Datadog::Contrib::Rails::Utils.connection_config(payload[:connection_id])
           span_type = Datadog::Ext::SQL::TYPE
 
           span = tracer.trace(
-            "#{adapter_name}.query",
+            "#{connection_config[:adapter_name]}.query",
             resource: payload.fetch(:sql),
             service: database_service,
             span_type: span_type
@@ -46,11 +43,11 @@ module Datadog
           # so that the ``sql.query`` tag will be set in the agent with an
           # obfuscated version
           span.span_type = Datadog::Ext::SQL::TYPE
-          span.set_tag('rails.db.vendor', adapter_name)
-          span.set_tag('rails.db.name', database_name)
+          span.set_tag('rails.db.vendor', connection_config[:adapter_name])
+          span.set_tag('rails.db.name', connection_config[:database_name])
           span.set_tag('rails.db.cached', cached) if cached
-          span.set_tag('out.host', adapter_host)
-          span.set_tag('out.port', adapter_port)
+          span.set_tag('out.host', connection_config[:adapter_host])
+          span.set_tag('out.port', connection_config[:adapter_port])
           span.start_time = start
           span.finish(finish)
         rescue StandardError => e

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

@@ -47,31 +47,66 @@ module Datadog
         end
 
         def self.adapter_name
-          normalize_vendor(connection_config[:adapter])
+          connection_config[:adapter_name]
         end
 
         def self.database_name
-          connection_config[:database]
+          connection_config[:database_name]
         end
 
         def self.adapter_host
-          connection_config[:host]
+          connection_config[:adapter_host]
         end
 
         def self.adapter_port
-          connection_config[:port]
+          connection_config[:adapter_port]
         end
 
-        def self.connection_config
-          @connection_config ||= begin
-            if defined?(::ActiveRecord::Base.connection_config)
-              ::ActiveRecord::Base.connection_config
-            else
-              ::ActiveRecord::Base.connection_pool.spec.config
-            end
+        def self.connection_config(object_id = nil)
+          config = object_id.nil? ? default_connection_config : connection_config_by_id(object_id)
+          {
+            adapter_name: normalize_vendor(config[:adapter]),
+            adapter_host: config[:host],
+            adapter_port: config[:port],
+            database_name: config[:database]
+          }
+        end
+
+        # Attempt to retrieve the connection from an object ID.
+        def self.connection_by_id(object_id)
+          return nil if object_id.nil?
+          ObjectSpace._id2ref(object_id)
+        rescue StandardError
+          nil
+        end
+
+        # Attempt to retrieve the connection config from an object ID.
+        # Typical of ActiveSupport::Notifications `sql.active_record`
+        def self.connection_config_by_id(object_id)
+          connection = connection_by_id(object_id)
+          return {} if connection.nil?
+
+          if connection.instance_variable_defined?(:@config)
+            connection.instance_variable_get(:@config)
+          else
+            {}
           end
         end
 
+        def self.default_connection_config
+          return @default_connection_config unless @default_connection_config.nil?
+          current_connection_name = if ::ActiveRecord::Base.respond_to?(:connection_specification_name)
+                                      ::ActiveRecord::Base.connection_specification_name
+                                    else
+                                      ::ActiveRecord::Base
+                                    end
+
+          connection_pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(current_connection_name)
+          connection_pool.nil? ? {} : (@default_connection_config = connection_pool.spec.config)
+        rescue StandardError
+          {}
+        end
+
         def self.exception_is_error?(exception)
           if defined?(::ActionDispatch::ExceptionWrapper)
             # Gets the equivalent status code for the exception (not all are 5XX)
@@ -83,8 +118,6 @@ module Datadog
             true
           end
         end
-
-        private_class_method :connection_config
       end
     end
   end

data/lib/ddtrace/transport.rb

@@ -8,6 +8,7 @@ module Datadog
   # Transport class that handles the spans delivery to the
   # local trace-agent. The class wraps a Net:HTTP instance
   # so that the Transport is thread-safe.
+  # rubocop:disable Metrics/ClassLength
   class HTTPTransport
     attr_accessor :hostname, :port
     attr_reader :traces_endpoint, :services_endpoint
@@ -21,18 +22,21 @@ module Datadog
 
     API = {
       V4 = 'v0.4'.freeze => {
+        version: V4,
         traces_endpoint: '/v0.4/traces'.freeze,
         services_endpoint: '/v0.4/services'.freeze,
         encoder: Encoding::MsgpackEncoder,
         fallback: 'v0.3'.freeze
       }.freeze,
       V3 = 'v0.3'.freeze => {
+        version: V3,
         traces_endpoint: '/v0.3/traces'.freeze,
         services_endpoint: '/v0.3/services'.freeze,
         encoder: Encoding::MsgpackEncoder,
         fallback: 'v0.2'.freeze
       }.freeze,
       V2 = 'v0.2'.freeze => {
+        version: V2,
         traces_endpoint: '/v0.2/traces'.freeze,
         services_endpoint: '/v0.2/services'.freeze,
         encoder: Encoding::JSONEncoder
@@ -71,34 +75,45 @@ module Datadog
       case endpoint
       when :services
         payload = @encoder.encode_services(data)
-        status_code = post(@api[:services_endpoint], payload)
+        status_code = post(@api[:services_endpoint], payload) do |response|
+          process_callback(:services, response)
+        end
       when :traces
         count = data.length
         payload = @encoder.encode_traces(data)
-        status_code = post(@api[:traces_endpoint], payload, count)
+        status_code = post(@api[:traces_endpoint], payload, count) do |response|
+          process_callback(:traces, response)
+        end
       else
         Datadog::Tracer.log.error("Unsupported endpoint: #{endpoint}")
         return nil
       end
 
-      downgrade! && send(endpoint, data) if downgrade?(status_code)
-
-      status_code
+      if downgrade?(status_code)
+        downgrade!
+        send(endpoint, data)
+      else
+        status_code
+      end
     end
 
     # send data to the trace-agent; the method is thread-safe
     def post(url, data, count = nil)
-      Datadog::Tracer.log.debug("Sending data from process: #{Process.pid}")
-      headers = count.nil? ? {} : { TRACE_COUNT_HEADER => count.to_s }
-      headers = headers.merge(@headers)
-      request = Net::HTTP::Post.new(url, headers)
-      request.body = data
-
-      response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }
-      handle_response(response)
-    rescue StandardError => e
-      Datadog::Tracer.log.error(e.message)
-      500
+      begin
+        Datadog::Tracer.log.debug("Sending data from process: #{Process.pid}")
+        headers = count.nil? ? {} : { TRACE_COUNT_HEADER => count.to_s }
+        headers = headers.merge(@headers)
+        request = Net::HTTP::Post.new(url, headers)
+        request.body = data
+
+        response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }
+        handle_response(response)
+      rescue StandardError => e
+        Datadog::Tracer.log.error(e.message)
+        500
+      end.tap do
+        yield(response) if block_given?
+      end
     end
 
     # Downgrade the connection to a compatibility version of the HTTPTransport;
@@ -166,8 +181,6 @@ module Datadog
         @mutex.synchronize { @count_server_error += 1 }
       end
 
-      process_callback(response)
-
       status_code
     rescue StandardError => e
       Datadog::Tracer.log.error(e.message)
@@ -188,10 +201,10 @@ module Datadog
 
     private
 
-    def process_callback(response)
+    def process_callback(action, response)
       return unless @response_callback && @response_callback.respond_to?(:call)
 
-      @response_callback.call(response)
+      @response_callback.call(action, response, @api)
     rescue => e
       Tracer.log.debug("Error processing callback: #{e}")
     end

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 11
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/ddtrace/writer.rb

@@ -5,7 +5,7 @@ require 'ddtrace/workers'
 module Datadog
   # Traces and services writer that periodically sends data to the trace-agent
   class Writer
-    attr_reader :transport, :worker
+    attr_reader :transport, :worker, :priority_sampler
 
     HOSTNAME = 'localhost'.freeze
     PORT = '8126'.freeze
@@ -117,10 +117,16 @@ module Datadog
 
     private
 
-    def sampling_updater(response)
-      return unless response.is_a?(Net::HTTPOK)
-      service_rates = JSON.parse(response.body)
-      @priority_sampler.update(service_rates)
+    def sampling_updater(action, response, api)
+      return unless action == :traces && response.is_a?(Net::HTTPOK)
+
+      if api[:version] == HTTPTransport::V4
+        service_rates = JSON.parse(response.body)
+        @priority_sampler.update(service_rates)
+        true
+      else
+        false
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack