ddtrace 0.11.0.beta2 → 0.11.0

data/gemfiles/contrib.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "elasticsearch-transport"
 gem "mongo"
 gem "grape"
@@ -16,7 +17,7 @@ gem "sidekiq"
 gem "aws-sdk"
 gem "sucker_punch"
 gem "dalli"
-gem "resque"
+gem "resque", "< 2.0"
 gem "racecar", ">= 0.3.5"
 
 gemspec path: "../"

data/gemfiles/contrib_old.gemfile

@@ -2,18 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "elasticsearch-transport"
 gem "mongo"
-gem "redis", "< 4.0.0"
+gem "redis", "< 4.0"
 gem "hiredis"
 gem "rack", "1.4.7"
-gem "rack-test"
+gem "rack-test", "0.7.0"
 gem "sinatra", "1.4.5"
 gem "sqlite3"
 gem "activerecord", "3.2.22.5"
 gem "sidekiq", "4.0.0"
 gem "aws-sdk", "~> 2.0"
 gem "sucker_punch"
-gem "resque"
+gem "dalli"
+gem "resque", "< 2.0"
 
 gemspec path: "../"

data/gemfiles/rails30_postgres.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.0.20"
 gem "pg", "0.15.1", platform: :ruby

data/gemfiles/rails30_postgres_sidekiq.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.0.20"
 gem "pg", "0.15.1", platform: :ruby

data/gemfiles/rails32_mysql2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.2.22.5"
 gem "mysql2", "0.3.21", platform: :ruby

data/gemfiles/rails32_postgres.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.2.22.5"
 gem "pg", "0.15.1", platform: :ruby

data/gemfiles/rails32_postgres_redis.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.2.22.5"
 gem "pg", "0.15.1", platform: :ruby

data/gemfiles/rails32_postgres_sidekiq.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "test-unit"
 gem "rails", "3.2.22.5"
 gem "pg", "0.15.1", platform: :ruby

data/gemfiles/rails4_mysql2.gemfile

@@ -2,6 +2,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 "activerecord-jdbcmysql-adapter", platform: :jruby

data/gemfiles/rails4_postgres.gemfile

@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "4.2.7.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
 gemspec path: "../"

data/gemfiles/rails4_postgres_redis.gemfile

@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "4.2.7.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "redis-rails"
 gem "redis", "< 4.0"

data/gemfiles/rails4_postgres_sidekiq.gemfile

@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "4.2.7.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "sidekiq"
 gem "activejob"

data/gemfiles/rails5_mysql2.gemfile

@@ -2,6 +2,7 @@
 
 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
 

data/gemfiles/rails5_postgres.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "5.0.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 
 gemspec path: "../"

data/gemfiles/rails5_postgres_redis.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "5.0.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 gem "redis-rails"
-gem "redis", "< 4.0"
+gem "redis"
 
 gemspec path: "../"

data/gemfiles/rails5_postgres_sidekiq.gemfile

@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
+gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
 gem "rails", "5.0.1"
-gem "pg", platform: :ruby
+gem "pg", "< 1.0", platform: :ruby
 gem "sidekiq"
 gem "activejob"
 

data/lib/ddtrace.rb

@@ -39,8 +39,12 @@ module Datadog
       @configuration ||= Configuration.new
     end
 
-    def configure
-      yield(configuration)
+    def configure(target = configuration, opts = {})
+      if target.is_a?(Configuration)
+        yield(target)
+      else
+        Configuration::PinSetup.new(target, opts).call
+      end
     end
   end
 end

data/lib/ddtrace/configuration.rb

@@ -1,5 +1,6 @@
 require_relative 'configuration/proxy'
 require_relative 'configuration/resolver'
+require_relative 'configuration/pin_setup'
 
 module Datadog
   # Configuration provides a unique access point for configurations
@@ -30,6 +31,7 @@ module Datadog
       instance = options.fetch(:instance, Datadog.tracer)
 
       instance.configure(options)
+      instance.class.log = options[:log] if options[:log]
       instance.set_tags(options[:tags]) if options[:tags]
       instance.set_tags(env: options[:env]) if options[:env]
       instance.class.debug_logging = options.fetch(:debug, false)

data/lib/ddtrace/configuration/pin_setup.rb

@@ -0,0 +1,30 @@
+module Datadog
+  class Configuration
+    # PinSetup translates a flat hash into a Pin configuration
+    # This class should be removed if we ever remove/refactor the Pin class
+    class PinSetup
+      def initialize(target, opts = {})
+        @pin = Pin.get_from(target)
+        @opts = opts
+      end
+
+      def call
+        return unless pin
+
+        ATTRS.each { |key| pin.public_send("#{key}=", opts[key]) if opts[key] }
+
+        pin.config = opts.reject { |key, _| ATTRS.include?(key) }
+
+        true
+      end
+
+      private
+
+      attr_reader :pin, :opts
+
+      ATTRS = [:app, :tags, :app_type, :name, :tracer, :service_name].freeze
+
+      private_constant :ATTRS
+    end
+  end
+end

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

@@ -80,12 +80,18 @@ module Datadog
             span_type: span_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.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.cached', cached) if cached
           span.set_tag('out.host', adapter_host)
           span.set_tag('out.port', adapter_port)
           span.start_time = start

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

@@ -23,7 +23,6 @@ module Datadog
 
             add_pin
             add_plugin(Seahorse::Client::Base, *loaded_constants)
-            Datadog.tracer.set_service_info(get_option(:service_name), 'aws', Ext::AppTypes::WEB)
 
             @patched = true
           rescue => e
@@ -38,9 +37,9 @@ module Datadog
           private
 
           def add_pin
-            Pin.new(get_option(:service_name), app_type: Ext::AppTypes::WEB).tap do |pin|
-              pin.onto(::Aws)
-            end
+            Pin
+              .new(get_option(:service_name), app: 'aws', app_type: Ext::AppTypes::WEB)
+              .onto(::Aws)
           end
 
           def add_plugin(*targets)

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

@@ -22,7 +22,6 @@ module Datadog
 
             add_pin!
             Instrumentation.patch!
-            Datadog.tracer.set_service_info(get_option(:service_name), 'dalli', Ext::AppTypes::CACHE)
 
             @patched = true
           rescue => e
@@ -43,9 +42,9 @@ module Datadog
           end
 
           def add_pin!
-            Pin.new(get_option(:service_name), app_type: Ext::AppTypes::CACHE).tap do |pin|
-              pin.onto(::Dalli)
-            end
+            Pin
+              .new(get_option(:service_name), app: 'dalli', app_type: Ext::AppTypes::CACHE)
+              .onto(::Dalli)
           end
         end
       end

data/lib/ddtrace/contrib/dalli/quantize.rb

@@ -8,10 +8,13 @@ module Datadog
         module_function
 
         def format_command(operation, args)
+          placeholder = "#{operation} BLOB (OMITTED)"
           command = [operation, *args].join(' ').strip
+          command = Utils.utf8_encode(command, binary: true, placeholder: placeholder)
           Utils.truncate(command, MAX_CMD_LENGTH)
-        rescue ::Encoding::CompatibilityError
-          "#{operation} BLOB (OMITTED)"
+        rescue => e
+          Tracer.log.debug("Error sanitizing Dalli operation: #{e}")
+          placeholder
         end
       end
     end

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

@@ -34,7 +34,6 @@ module Datadog
               require 'ddtrace/contrib/elasticsearch/quantize'
 
               patch_elasticsearch_transport_client()
-              Datadog.tracer.set_service_info(get_option(:service_name), 'elasticsearch', Ext::AppTypes::DB)
 
               @patched = true
             rescue StandardError => e

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

@@ -31,7 +31,6 @@ module Datadog
 
             add_pin
             add_middleware
-            register_service(get_option(:service_name))
 
             @patched = true
           rescue => e
@@ -56,10 +55,12 @@ module Datadog
           end
 
           def add_pin
-            Pin.new(get_option(:service_name), app_type: Ext::AppTypes::WEB).tap do |pin|
-              pin.onto(::Faraday)
-              pin.tracer = get_option(:tracer)
-            end
+            Pin.new(
+              get_option(:service_name),
+              app: 'faraday',
+              app_type: Ext::AppTypes::WEB,
+              tracer: get_option(:tracer)
+            ).onto(::Faraday)
           end
 
           def add_middleware

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

@@ -35,9 +35,6 @@ module Datadog
               service = get_option(:service_name)
               pin = Datadog::Pin.new(service, app: 'grape', app_type: Datadog::Ext::AppTypes::WEB)
               pin.onto(::Grape)
-              if pin.tracer && pin.service
-                pin.tracer.set_service_info(pin.service, 'grape', pin.app_type)
-              end
 
               # subscribe to ActiveSupport events
               Datadog::Contrib::Grape::Endpoint.subscribe()

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

@@ -67,9 +67,6 @@ module Datadog
               service = Datadog.configuration[:mongo][:service_name]
               pin = Datadog::Pin.new(service, app: APP, app_type: Datadog::Ext::AppTypes::DB)
               pin.onto(self)
-              if pin.tracer && pin.service
-                pin.tracer.set_service_info(pin.service, 'mongodb', pin.app_type)
-              end
             end
 
             def datadog_pin

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

@@ -22,16 +22,24 @@ module Datadog
           require_relative 'middlewares'
           @patched = true
 
-          return unless get_option(:middleware_names)
-
-          top = get_option(:application) || rails_app
-          retain_middleware_name(top)
+          enable_middleware_names if get_option(:middleware_names)
         end
 
         def patched?
           @patched ||= false
         end
 
+        def enable_middleware_names
+          root = get_option(:application) || rails_app
+          retain_middleware_name(root)
+        rescue => e
+          # We can safely ignore these exceptions since they happen only in the
+          # context of middleware patching outside a Rails server process (eg. a
+          # process that doesn't serve HTTP requests but has Rails environment
+          # loaded such as a Resque master process)
+          Tracer.log.debug("Error patching middleware stack: #{e}")
+        end
+
         def rails_app
           return unless Datadog.registry[:rails].compatible?
           ::Rails.application.app

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

@@ -33,13 +33,10 @@ module Datadog
             span_type: span_type
           )
 
-          # find out if the SQL query has been cached in this request. This meta is really
+          # 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.
-          # TODO[manu]: this feature has been merged into master but has not yet released.
-          # We're supporting this action as a best effort, but we should add a test after
-          # a new version of Rails is out.
-          cached = payload[:cached]
+          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

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

@@ -45,7 +45,8 @@ module Datadog
             # discard parameters from the cache_store configuration
             store, = *Array.wrap(::Rails.configuration.cache_store).flatten
             span.set_tag('rails.cache.backend', store)
-            span.set_tag('rails.cache.key', payload.fetch(:key))
+            cache_key = Datadog::Utils.truncate(payload.fetch(:key), Ext::CACHE::MAX_KEY_SIZE)
+            span.set_tag('rails.cache.key', cache_key)
             span.set_error(payload[:exception]) if payload[:exception]
           ensure
             span.finish()