ddtrace 0.13.0 → 0.14.0

data/lib/ddtrace/vendor/active_record/connection_specification.rb

@@ -0,0 +1,301 @@
+require 'uri'
+
+# NOTE: This code is copied directly from ActiveRecord.
+#       Its purpose is to resolve connection information.
+#       It exists here only because it doesn't exist in Rails 3.2.
+#       When support for Rails 3.2 is dropped, this can be removed.
+module Datadog
+  module Vendor
+    module ActiveRecord
+      # Copy/paste from:
+      # https://github.com/rails/rails/blob/5-2-stable/activerecord/lib/active_record/connection_handling.rb
+      module ConnectionHandling
+        RAILS_ENV = -> { (Rails.env if defined?(Rails) && defined?(Rails.env)) || ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence }
+      end
+
+      # Copy/paste from:
+      # https://github.com/rails/rails/blob/5-2-stable/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+      module ConnectionAdapters
+        class ConnectionSpecification
+          attr_reader :name, :config, :adapter_method
+
+          def initialize(name, config, adapter_method)
+            @name, @config, @adapter_method = name, config, adapter_method
+          end
+
+          def initialize_dup(original)
+            @config = original.config.dup
+          end
+
+          def to_hash
+            @config.merge(name: @name)
+          end
+
+          # Expands a connection string into a hash.
+          class ConnectionUrlResolver # :nodoc:
+            # == Example
+            #
+            #   url = "postgresql://foo:bar@localhost:9000/foo_test?pool=5&timeout=3000"
+            #   ConnectionUrlResolver.new(url).to_hash
+            #   # => {
+            #     "adapter"  => "postgresql",
+            #     "host"     => "localhost",
+            #     "port"     => 9000,
+            #     "database" => "foo_test",
+            #     "username" => "foo",
+            #     "password" => "bar",
+            #     "pool"     => "5",
+            #     "timeout"  => "3000"
+            #   }
+            def initialize(url)
+              raise "Database URL cannot be empty" if url.blank?
+              @uri     = uri_parser.parse(url)
+              @adapter = @uri.scheme && @uri.scheme.tr("-", "_")
+              @adapter = "postgresql" if @adapter == "postgres"
+
+              if @uri.opaque
+                @uri.opaque, @query = @uri.opaque.split("?", 2)
+              else
+                @query = @uri.query
+              end
+            end
+
+            # Converts the given URL to a full connection hash.
+            def to_hash
+              config = raw_config.reject { |_, value| value.blank? }
+              config.map { |key, value| config[key] = uri_parser.unescape(value) if value.is_a? String }
+              config
+            end
+
+            private
+
+              def uri
+                @uri
+              end
+
+              def uri_parser
+                @uri_parser ||= URI::Parser.new
+              end
+
+              # Converts the query parameters of the URI into a hash.
+              #
+              #   "localhost?pool=5&reaping_frequency=2"
+              #   # => { "pool" => "5", "reaping_frequency" => "2" }
+              #
+              # returns empty hash if no query present.
+              #
+              #   "localhost"
+              #   # => {}
+              def query_hash
+                Hash[(@query || "").split("&").map { |pair| pair.split("=") }]
+              end
+
+              def raw_config
+                if uri.opaque
+                  query_hash.merge(
+                    "adapter"  => @adapter,
+                    "database" => uri.opaque)
+                else
+                  query_hash.merge(
+                    "adapter"  => @adapter,
+                    "username" => uri.user,
+                    "password" => uri.password,
+                    "port"     => uri.port,
+                    "database" => database_from_path,
+                    "host"     => uri.hostname)
+                end
+              end
+
+              # Returns name of the database.
+              def database_from_path
+                if @adapter == "sqlite3"
+                  # 'sqlite3:/foo' is absolute, because that makes sense. The
+                  # corresponding relative version, 'sqlite3:foo', is handled
+                  # elsewhere, as an "opaque".
+
+                  uri.path
+                else
+                  # Only SQLite uses a filename as the "database" name; for
+                  # anything else, a leading slash would be silly.
+
+                  uri.path.sub(%r{^/}, "")
+                end
+              end
+          end
+
+          ##
+          # Builds a ConnectionSpecification from user input.
+          class Resolver # :nodoc:
+            attr_reader :configurations
+
+            # Accepts a hash two layers deep, keys on the first layer represent
+            # environments such as "production". Keys must be strings.
+            def initialize(configurations)
+              @configurations = configurations
+            end
+
+            # Returns a hash with database connection information.
+            #
+            # == Examples
+            #
+            # Full hash Configuration.
+            #
+            #   configurations = { "production" => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } }
+            #   Resolver.new(configurations).resolve(:production)
+            #   # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3"}
+            #
+            # Initialized with URL configuration strings.
+            #
+            #   configurations = { "production" => "postgresql://localhost/foo" }
+            #   Resolver.new(configurations).resolve(:production)
+            #   # => { "host" => "localhost", "database" => "foo", "adapter" => "postgresql" }
+            #
+            def resolve(config)
+              if config
+                resolve_connection config
+              elsif env = ConnectionHandling::RAILS_ENV.call
+                resolve_symbol_connection env.to_sym
+              else
+                raise AdapterNotSpecified
+              end
+            end
+
+            # Expands each key in @configurations hash into fully resolved hash
+            def resolve_all
+              config = configurations.dup
+
+              if env = ConnectionHandling::DEFAULT_ENV.call
+                env_config = config[env] if config[env].is_a?(Hash) && !(config[env].key?("adapter") || config[env].key?("url"))
+              end
+
+              config.reject! { |k, v| v.is_a?(Hash) && !(v.key?("adapter") || v.key?("url")) }
+              config.merge! env_config if env_config
+
+              config.each do |key, value|
+                config[key] = resolve(value) if value
+              end
+
+              config
+            end
+
+            # Returns an instance of ConnectionSpecification for a given adapter.
+            # Accepts a hash one layer deep that contains all connection information.
+            #
+            # == Example
+            #
+            #   config = { "production" => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } }
+            #   spec = Resolver.new(config).spec(:production)
+            #   spec.adapter_method
+            #   # => "sqlite3_connection"
+            #   spec.config
+            #   # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" }
+            #
+            def spec(config)
+              spec = resolve(config).symbolize_keys
+
+              raise(AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
+
+              # Require the adapter itself and give useful feedback about
+              #   1. Missing adapter gems and
+              #   2. Adapter gems' missing dependencies.
+              path_to_adapter = "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+              begin
+                require path_to_adapter
+              rescue LoadError => e
+                # We couldn't require the adapter itself. Raise an exception that
+                # points out config typos and missing gems.
+                if e.path == path_to_adapter
+                  # We can assume that a non-builtin adapter was specified, so it's
+                  # either misspelled or missing from Gemfile.
+                  raise e.class, "Could not load the '#{spec[:adapter]}' Active Record adapter. Ensure that the adapter is spelled correctly in config/database.yml and that you've added the necessary adapter gem to your Gemfile.", e.backtrace
+
+                # Bubbled up from the adapter require. Prefix the exception message
+                # with some guidance about how to address it and reraise.
+                else
+                  raise e.class, "Error loading the '#{spec[:adapter]}' Active Record adapter. Missing a gem it depends on? #{e.message}", e.backtrace
+                end
+              end
+
+              adapter_method = "#{spec[:adapter]}_connection"
+
+              unless ::ActiveRecord::Base.respond_to?(adapter_method)
+                raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
+              end
+
+              ConnectionSpecification.new(spec.delete(:name) || "primary", spec, adapter_method)
+            end
+
+            private
+
+              # Returns fully resolved connection, accepts hash, string or symbol.
+              # Always returns a hash.
+              #
+              # == Examples
+              #
+              # Symbol representing current environment.
+              #
+              #   Resolver.new("production" => {}).resolve_connection(:production)
+              #   # => {}
+              #
+              # One layer deep hash of connection values.
+              #
+              #   Resolver.new({}).resolve_connection("adapter" => "sqlite3")
+              #   # => { "adapter" => "sqlite3" }
+              #
+              # Connection URL.
+              #
+              #   Resolver.new({}).resolve_connection("postgresql://localhost/foo")
+              #   # => { "host" => "localhost", "database" => "foo", "adapter" => "postgresql" }
+              #
+              def resolve_connection(spec)
+                case spec
+                when Symbol
+                  resolve_symbol_connection spec
+                when String
+                  resolve_url_connection spec
+                when Hash
+                  resolve_hash_connection spec
+                end
+              end
+
+              # Takes the environment such as +:production+ or +:development+.
+              # This requires that the @configurations was initialized with a key that
+              # matches.
+              #
+              #   Resolver.new("production" => {}).resolve_symbol_connection(:production)
+              #   # => {}
+              #
+              def resolve_symbol_connection(spec)
+                if config = configurations[spec.to_s]
+                  resolve_connection(config).merge("name" => spec.to_s)
+                else
+                  raise(AdapterNotSpecified, "'#{spec}' database is not configured. Available: #{configurations.keys.inspect}")
+                end
+              end
+
+              # Accepts a hash. Expands the "url" key that contains a
+              # URL database connection to a full connection
+              # hash and merges with the rest of the hash.
+              # Connection details inside of the "url" key win any merge conflicts
+              def resolve_hash_connection(spec)
+                if spec["url"] && spec["url"] !~ /^jdbc:/
+                  connection_hash = resolve_url_connection(spec.delete("url"))
+                  spec.merge!(connection_hash)
+                end
+                spec
+              end
+
+              # Takes a connection URL.
+              #
+              #   Resolver.new({}).resolve_url_connection("postgresql://localhost/foo")
+              #   # => { "host" => "localhost", "database" => "foo", "adapter" => "postgresql" }
+              #
+              def resolve_url_connection(url)
+                ConnectionUrlResolver.new(url).to_hash
+              end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     PATCH = 0
     PRE = nil
 

data/lib/ddtrace/workers.rb

@@ -43,7 +43,7 @@ module Datadog
           # ensures that the thread will not die because of an exception.
           # TODO[manu]: findout the reason and reschedule the send if it's not
           # a fatal exception
-          Datadog::Tracer.log.error("Error during traces flush: dropped #{items.length} items. Cause: #{e}")
+          Datadog::Tracer.log.error("Error during traces flush: dropped #{traces.length} items. Cause: #{e}")
         end
       end
 
@@ -58,7 +58,7 @@ module Datadog
           # ensures that the thread will not die because of an exception.
           # TODO[manu]: findout the reason and reschedule the send if it's not
           # a fatal exception
-          Datadog::Tracer.log.error("Error during services flush: dropped #{items.length} items. Cause: #{e}")
+          Datadog::Tracer.log.error("Error during services flush: dropped #{services.length} items. Cause: #{e}")
         end
       end
 
@@ -106,15 +106,17 @@ module Datadog
 
       private
 
+      alias flush_data callback_traces
+
       def perform
         loop do
-          @back_off = callback_traces ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
+          @back_off = flush_data ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
 
           callback_services
 
           @mutex.synchronize do
             return if !@run && @trace_buffer.empty? && @service_buffer.empty?
-            @shutdown.wait(@mutex, @back_off)
+            @shutdown.wait(@mutex, @back_off) if @run # do not wait when shutting down
           end
         end
       end

data/lib/ddtrace/writer.rb

@@ -7,7 +7,7 @@ module Datadog
   class Writer
     attr_reader :transport, :worker, :priority_sampler
 
-    HOSTNAME = 'localhost'.freeze
+    HOSTNAME = '127.0.0.1'.freeze
     PORT = '8126'.freeze
 
     def initialize(options = {})
@@ -15,7 +15,6 @@ module Datadog
       @buff_size = options.fetch(:buffer_size, 100)
       @flush_interval = options.fetch(:flush_interval, 1)
       transport_options = options.fetch(:transport_options, {})
-
       # priority sampling
       if options[:priority_sampler]
         @priority_sampler = options[:priority_sampler]
@@ -95,10 +94,10 @@ module Datadog
       # This check ensures that if a process doesn't own the current +Writer+, async workers
       # will be initialized again (but only once for each process).
       pid = Process.pid
-      @mutex_after_fork.synchronize do
-        if pid != @pid
+      if pid != @pid # avoid using Mutex when pids are equal
+        @mutex_after_fork.synchronize do
           # we should start threads because the worker doesn't own this
-          start()
+          start if pid != @pid
         end
       end
 

data/lib/ddtrace.rb

@@ -14,6 +14,7 @@ require 'ddtrace/patcher'
 module Datadog
   @tracer = Tracer.new
   @registry = Registry.new
+  @configuration = Configuration.new(registry: @registry)
 
   # Default tracer that can be used as soon as +ddtrace+ is required:
   #
@@ -28,21 +29,9 @@ module Datadog
   #   tracer = Datadog::Tracer.new
   #   pin = Datadog::Pin.get_from(mypatchcomponent)
   #   pin.tracer = tracer
-
-  def self.tracer
-    @tracer
-  end
-
-  def self.registry
-    @registry
-  end
-
   class << self
-    attr_writer :configuration
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
+    attr_reader :tracer, :registry
+    attr_accessor :configuration
 
     def configure(target = configuration, opts = {})
       if target.is_a?(Configuration)
@@ -55,10 +44,11 @@ module Datadog
 end
 
 require 'ddtrace/contrib/base'
+require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/rack/patcher'
 require 'ddtrace/contrib/rails/patcher'
 require 'ddtrace/contrib/active_model_serializers/patcher'
-require 'ddtrace/contrib/active_record/patcher'
+require 'ddtrace/contrib/active_record/integration'
 require 'ddtrace/contrib/sequel/patcher'
 require 'ddtrace/contrib/elasticsearch/patcher'
 require 'ddtrace/contrib/faraday/patcher'
@@ -69,10 +59,12 @@ require 'ddtrace/contrib/redis/patcher'
 require 'ddtrace/contrib/http/patcher'
 require 'ddtrace/contrib/aws/patcher'
 require 'ddtrace/contrib/sucker_punch/patcher'
+require 'ddtrace/contrib/rest_client/integration'
 require 'ddtrace/contrib/mongodb/patcher'
 require 'ddtrace/contrib/dalli/patcher'
 require 'ddtrace/contrib/rake/patcher'
 require 'ddtrace/contrib/resque/patcher'
+require 'ddtrace/contrib/delayed_job/patcher'
 require 'ddtrace/contrib/racecar/patcher'
 require 'ddtrace/contrib/sidekiq/patcher'
 require 'ddtrace/contrib/excon/patcher'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +263,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- benchmarks/postgres_database.yml
+- benchmarks/sidekiq_test.rb
 - ddtrace.gemspec
 - docker-compose.yml
 - docs/GettingStarted.md
@@ -252,10 +282,13 @@ files:
 - lib/ddtrace/contrib/active_model_serializers/events/render.rb
 - lib/ddtrace/contrib/active_model_serializers/events/serialize.rb
 - lib/ddtrace/contrib/active_model_serializers/patcher.rb
+- lib/ddtrace/contrib/active_record/configuration/resolver.rb
+- lib/ddtrace/contrib/active_record/configuration/settings.rb
 - lib/ddtrace/contrib/active_record/event.rb
 - lib/ddtrace/contrib/active_record/events.rb
 - lib/ddtrace/contrib/active_record/events/instantiation.rb
 - lib/ddtrace/contrib/active_record/events/sql.rb
+- lib/ddtrace/contrib/active_record/integration.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
 - lib/ddtrace/contrib/active_record/utils.rb
 - lib/ddtrace/contrib/active_support/notifications/event.rb
@@ -266,9 +299,19 @@ files:
 - lib/ddtrace/contrib/aws/patcher.rb
 - lib/ddtrace/contrib/aws/services.rb
 - lib/ddtrace/contrib/base.rb
+- lib/ddtrace/contrib/configurable.rb
+- lib/ddtrace/contrib/configuration/option.rb
+- lib/ddtrace/contrib/configuration/option_definition.rb
+- lib/ddtrace/contrib/configuration/option_definition_set.rb
+- lib/ddtrace/contrib/configuration/option_set.rb
+- lib/ddtrace/contrib/configuration/options.rb
+- lib/ddtrace/contrib/configuration/resolver.rb
+- lib/ddtrace/contrib/configuration/settings.rb
 - lib/ddtrace/contrib/dalli/instrumentation.rb
 - lib/ddtrace/contrib/dalli/patcher.rb
 - lib/ddtrace/contrib/dalli/quantize.rb
+- lib/ddtrace/contrib/delayed_job/patcher.rb
+- lib/ddtrace/contrib/delayed_job/plugin.rb
 - lib/ddtrace/contrib/elasticsearch/patcher.rb
 - lib/ddtrace/contrib/elasticsearch/quantize.rb
 - lib/ddtrace/contrib/excon/middleware.rb
@@ -284,11 +327,14 @@ files:
 - lib/ddtrace/contrib/grpc/intercept_with_datadog.rb
 - lib/ddtrace/contrib/grpc/patcher.rb
 - lib/ddtrace/contrib/http/patcher.rb
+- lib/ddtrace/contrib/integration.rb
 - lib/ddtrace/contrib/mongodb/parsers.rb
 - lib/ddtrace/contrib/mongodb/patcher.rb
 - lib/ddtrace/contrib/mongodb/subscribers.rb
 - lib/ddtrace/contrib/mysql2/client.rb
 - lib/ddtrace/contrib/mysql2/patcher.rb
+- lib/ddtrace/contrib/patchable.rb
+- lib/ddtrace/contrib/patcher.rb
 - lib/ddtrace/contrib/racecar/event.rb
 - lib/ddtrace/contrib/racecar/events.rb
 - lib/ddtrace/contrib/racecar/events/batch.rb
@@ -312,10 +358,17 @@ files:
 - lib/ddtrace/contrib/redis/patcher.rb
 - lib/ddtrace/contrib/redis/quantize.rb
 - lib/ddtrace/contrib/redis/tags.rb
+- lib/ddtrace/contrib/registerable.rb
 - lib/ddtrace/contrib/resque/patcher.rb
 - lib/ddtrace/contrib/resque/resque_job.rb
+- lib/ddtrace/contrib/rest_client/configuration/settings.rb
+- lib/ddtrace/contrib/rest_client/integration.rb
+- lib/ddtrace/contrib/rest_client/patcher.rb
+- lib/ddtrace/contrib/rest_client/request_patch.rb
+- lib/ddtrace/contrib/sequel/configuration/settings.rb
 - lib/ddtrace/contrib/sequel/database.rb
 - lib/ddtrace/contrib/sequel/dataset.rb
+- lib/ddtrace/contrib/sequel/integration.rb
 - lib/ddtrace/contrib/sequel/patcher.rb
 - lib/ddtrace/contrib/sequel/utils.rb
 - lib/ddtrace/contrib/sidekiq/patcher.rb
@@ -362,6 +415,7 @@ files:
 - lib/ddtrace/transport.rb
 - lib/ddtrace/utils.rb
 - lib/ddtrace/utils/database.rb
+- lib/ddtrace/vendor/active_record/connection_specification.rb
 - lib/ddtrace/version.rb
 - lib/ddtrace/workers.rb
 - lib/ddtrace/writer.rb
@@ -386,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications