ddtrace 0.12.0.beta2 → 0.12.0.rc1

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@ module Datadog
     MAJOR = 0
     MINOR = 12
     PATCH = 0
-    PRE = 'beta2'.freeze
+    PRE = 'rc1'.freeze
 
     STRING = [MAJOR, MINOR, PATCH, PRE].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.12.0.beta2
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -222,6 +222,7 @@ files:
 - ".rubocop.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -254,7 +255,11 @@ files:
 - lib/ddtrace/configuration/proxy.rb
 - lib/ddtrace/configuration/resolver.rb
 - lib/ddtrace/context.rb
+- lib/ddtrace/context_flush.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
+- lib/ddtrace/contrib/active_record/utils.rb
+- lib/ddtrace/contrib/active_support/notifications/subscriber.rb
+- lib/ddtrace/contrib/active_support/notifications/subscription.rb
 - lib/ddtrace/contrib/aws/instrumentation.rb
 - lib/ddtrace/contrib/aws/parsed_context.rb
 - lib/ddtrace/contrib/aws/patcher.rb
@@ -279,7 +284,6 @@ files:
 - lib/ddtrace/contrib/rack/patcher.rb
 - lib/ddtrace/contrib/rails/action_controller.rb
 - lib/ddtrace/contrib/rails/action_view.rb
-- lib/ddtrace/contrib/rails/active_record.rb
 - lib/ddtrace/contrib/rails/active_support.rb
 - lib/ddtrace/contrib/rails/core_extensions.rb
 - lib/ddtrace/contrib/rails/framework.rb
@@ -320,6 +324,7 @@ files:
 - lib/ddtrace/propagation/distributed_headers.rb
 - lib/ddtrace/propagation/http_propagator.rb
 - lib/ddtrace/provider.rb
+- lib/ddtrace/quantization/http.rb
 - lib/ddtrace/registry.rb
 - lib/ddtrace/registry/registerable.rb
 - lib/ddtrace/sampler.rb

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

@@ -1,80 +0,0 @@
-require 'ddtrace/ext/sql'
-require 'ddtrace/contrib/rails/utils'
-
-module Datadog
-  module Contrib
-    module Rails
-      # Code used to create and handle 'mysql.query', 'postgres.query', ... spans.
-      module ActiveRecord
-        def self.instrument
-          # ActiveRecord is instrumented only if it's available
-          return unless defined?(::ActiveRecord)
-
-          # subscribe when the active record query has been processed
-          ::ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-            sql(*args)
-          end
-
-          if Datadog::Contrib::Rails::Patcher.active_record_instantiation_tracing_supported?
-            # subscribe when the active record instantiates objects
-            ::ActiveSupport::Notifications.subscribe('instantiation.active_record') do |*args|
-              instantiation(*args)
-            end
-          end
-        end
-
-        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
-
-          span = tracer.trace(
-            "#{adapter_name}.query",
-            resource: payload.fetch(:sql),
-            service: database_service,
-            span_type: Datadog::Ext::SQL::TYPE
-          )
-
-          # Find out if the SQL query has been cached in this request. This meta is really
-          # helpful to users because some spans may have 0ns of duration because the query
-          # is simply cached from memory, so the notification is fired with start == finish.
-          cached = payload[:cached] || (payload[:name] == 'CACHE')
-
-          # the span should have the query ONLY in the Resource attribute,
-          # so that the ``sql.query`` tag will be set in the agent with an
-          # obfuscated version
-          span.set_tag('rails.db.vendor', adapter_name)
-          span.set_tag('rails.db.name', 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.start_time = start
-          span.finish(finish)
-        rescue StandardError => e
-          Datadog::Tracer.log.debug(e.message)
-        end
-
-        def self.instantiation(_name, start, finish, _id, payload)
-          tracer = Datadog.configuration[:rails][:tracer]
-
-          span = tracer.trace(
-            'active_record.instantiation',
-            resource: payload.fetch(:class_name),
-            span_type: 'custom'
-          )
-
-          span.service = span.parent ? span.parent.service : Datadog.configuration[:rails][:service_name]
-          span.set_tag('active_record.instantiation.class_name', payload.fetch(:class_name))
-          span.set_tag('active_record.instantiation.record_count', payload.fetch(:record_count))
-          span.start_time = start
-          span.finish(finish)
-        rescue StandardError => e
-          Datadog::Tracer.log.debug(e.message)
-        end
-      end
-    end
-  end
-end