ddtrace 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ef2a4e166761426cd1fa60d735bd1c84bba183251754a83686feada009e00e97
-  data.tar.gz: c95a0b8677b653d13cde489eba691aff3867ef5fbebfad8323cc2a46fe75a102
+SHA1:
+  metadata.gz: 378dbfa934d235e1fef7eec26aded395a1663f50
+  data.tar.gz: 66f5d0aa2f1f92a0ca34c5db63e1050abb6d064d
 SHA512:
-  metadata.gz: 8c2aadf454ea6acec93c7f25a1ebac84ee8e2f63ea6c9620b6c4623a9ba5e9412faf76240e72a2eaf18b946159600128369e539eb775c1e00274ec96df0567bd
-  data.tar.gz: 1094c5c97487b21d69aaf62858f5d9fb40d587678f92c0fa133d9f73b5db8f8d0d4675ca1ddb4b137a58805130617ccbd9de7e1621b8f0338c3136b1f47eaec9
+  metadata.gz: a9e34459216332d23f79bc78c6b2bec203f8e86a486853afb9844db587395c237a84bd4242feb41354d726130bd30701c6f6db60638b2f06ed60db7cad87b386
+  data.tar.gz: 10da81ee9b31d0125fb94ab6451e1e244183a352d042312264a0989496a4c87daeaefb9c5b802a96557075807f2168a6e23767d5e7c429f38fb4e040d5ebc48d

data/.env

@@ -20,5 +20,7 @@ TEST_POSTGRES_HOST=127.0.0.1
 TEST_POSTGRES_PASSWORD=postgres
 TEST_POSTGRES_PORT=5432
 TEST_POSTGRES_USER=postgres
+TEST_PRESTO_HOST=localhost
+TEST_PRESTO_PORT=8080
 TEST_REDIS_HOST=127.0.0.1
 TEST_REDIS_PORT=6379

data/Appraisals

@@ -345,7 +345,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
@@ -502,8 +502,9 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
@@ -576,7 +577,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
@@ -683,7 +684,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
@@ -789,8 +790,9 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'hiredis'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
@@ -898,8 +900,9 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'hiredis'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
-      gem 'rack', '< 2.1.0' # Remove when grape bug is fixed: https://github.com/ruby-grape/grape/issues/1966
+      gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## [Unreleased]
 
+## [0.33.0] - 2020-03-05
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.33.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.32.0...v0.33.0
+
+### Added
+
+- Instrumentation for [Presto](https://github.com/treasure-data/presto-client-ruby) (#775, #920, #961) (@ahammel, @ericmustin)
+- Sidekiq job argument tagging (#933) (@mantrala)
+- Support for multiple Redis services (#861, #937, #940) (@mberlanda)
+- Support for Sidekiq w/ Delayed extensions (#798, #942) (@joeyAghion)
+- Setter/reset behavior for configuration options (#957)
+- Priority sampling rate tag (#891)
+
+### Changed
+
+- Enforced minimum version requirements for instrumentation (#944)
+- RubyGems minimum version requirement 2.0.0 (#954) (@Joas1988)
+- Relaxed Rack minimum version to 1.1.0 (#952)
+
+### Fixed
+
+- AWS instrumentation patching when AWS is partially loaded (#938, #945) (@letiesperon, @illdelph)
+- NoMethodError for RuleSampler with priority sampling (#949, #950) (@BabyGroot)
+- Runtime metrics accumulating service names when disabled (#956)
+- Sidekiq instrumentation incompatibility with Rails 6.0.2 (#943, #947) (@pj0tr)
+- Documentation tweaks (#948, #955) (@mstruve, @link04)
+- Various test suite issues (#930, #932, #951, #960)
+
 ## [0.32.0] - 2020-01-22
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.32.0
@@ -1079,7 +1109,8 @@ 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]: https://github.com/DataDog/dd-trace-rb/compare/v0.32.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.33.0...master
+[0.33.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.32.0...v0.33.0
 [0.32.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.31.1...v0.32.0
 [0.31.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...v0.31.1
 [0.31.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.30.1...v0.31.0

data/Rakefile

@@ -74,6 +74,7 @@ namespace :spec do
     :http,
     :mongodb,
     :mysql2,
+    :presto,
     :racecar,
     :rack,
     :rake,
@@ -523,7 +524,7 @@ task :ci do
       sh 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
-      sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
+      # sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable' # TODO: Hangs CI jobs... fix and re-enable.
       sh 'bundle exec appraisal rails6-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails6-postgres rake spec:rails'
     end
@@ -588,7 +589,7 @@ task :ci do
       sh 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
-      sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
+      # sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable' # TODO: Hangs CI jobs... fix and re-enable.
       sh 'bundle exec appraisal rails6-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails6-postgres rake spec:rails'
     end

data/ddtrace.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.name                  = 'ddtrace'
   spec.version               = Datadog::VERSION::STRING
   spec.required_ruby_version = ">= #{Datadog::VERSION::MINIMUM_RUBY_VERSION}"
+  spec.required_rubygems_version = '>= 2.0.0'
   spec.authors               = ['Datadog, Inc.']
   spec.email                 = ['dev@datadoghq.com']
 
@@ -59,5 +60,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'
   spec.add_development_dependency 'pry', '~> 0.10.4'
   spec.add_development_dependency 'pry-stack_explorer', '~> 0.4.9.2'
-  spec.add_development_dependency 'warning' if RUBY_VERSION >= '2.5.0'
+  spec.add_development_dependency 'warning', '~> 1' if RUBY_VERSION >= '2.5.0'
 end

data/docker-compose.yml

@@ -150,6 +150,7 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
@@ -161,6 +162,8 @@ services:
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
@@ -281,6 +284,12 @@ services:
       - "5432"
     ports:
       - "${TEST_POSTGRES_PORT}:5432"
+  presto:
+    image:  prestosql/presto
+    expose:
+      - "8080"
+    ports:
+      - "${TEST_PRESTO_PORT}:8080"
   redis:
     image: redis:3.0
     expose:

data/docs/GettingStarted.md

@@ -36,7 +36,7 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d
      - [Concurrent Ruby](#concurrent-ruby)
      - [Dalli](#dalli)
      - [DelayedJob](#delayedjob)
-     - [Elastic Search](#elastic-search)
+     - [Elasticsearch](#elasticsearch)
      - [Ethon & Typhoeus](#ethon)
      - [Excon](#excon)
      - [Faraday](#faraday)
@@ -45,7 +45,8 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d
      - [gRPC](#grpc)
      - [MongoDB](#mongodb)
      - [MySQL2](#mysql2)
-     - [Net/HTTP](#nethttp)
+     - [Net/HTTP](#net-http)
+     - [Presto](#presto)
      - [Racecar](#racecar)
      - [Rack](#rack)
      - [Rails](#rails)
@@ -336,7 +337,7 @@ For a list of available integrations, and their configuration options, please re
 | Concurrent Ruby          | `concurrent_ruby`          | `>= 0.9`                 | *[Link](#concurrent-ruby)*          | *[Link](https://github.com/ruby-concurrency/concurrent-ruby)*                  |
 | Dalli                    | `dalli`                    | `>= 2.7`                 | *[Link](#dalli)*                    | *[Link](https://github.com/petergoldstein/dalli)*                              |
 | DelayedJob               | `delayed_job`              | `>= 4.1`                 | *[Link](#delayedjob)*               | *[Link](https://github.com/collectiveidea/delayed_job)*                        |
-| Elastic Search           | `elasticsearch`            | `>= 6.0`                 | *[Link](#elastic-search)*           | *[Link](https://github.com/elastic/elasticsearch-ruby)*                        |
+| Elasticsearch           | `elasticsearch`            | `>= 6.0`                 | *[Link](#elasticsearch)*           | *[Link](https://github.com/elastic/elasticsearch-ruby)*                        |
 | Ethon                    | `ethon`                    | `>= 0.11.0`              | *[Link](#ethon)*                    | *[Link](https://github.com/typhoeus/ethon)*                                    |
 | Excon                    | `excon`                    | `>= 0.62`                | *[Link](#excon)*                    | *[Link](https://github.com/excon/excon)*                                       |
 | Faraday                  | `faraday`                  | `>= 0.14`                | *[Link](#faraday)*                  | *[Link](https://github.com/lostisland/faraday)*                                |
@@ -346,8 +347,9 @@ For a list of available integrations, and their configuration options, please re
 | MongoDB                  | `mongo`                    | `>= 2.0`                 | *[Link](#mongodb)*                  | *[Link](https://github.com/mongodb/mongo-ruby-driver)*                         |
 | MySQL2                   | `mysql2`                   | `>= 0.3.21`              | *[Link](#mysql2)*                   | *[Link](https://github.com/brianmario/mysql2)*                                 |
 | Net/HTTP                 | `http`                     | *(Any supported Ruby)*   | *[Link](#nethttp)*                  | *[Link](https://ruby-doc.org/stdlib-2.4.0/libdoc/net/http/rdoc/Net/HTTP.html)* |
+| Presto                   | `presto`                   | `>= 0.5.14`              | *[Link](#presto)*                   | *[Link](https://github.com/treasure-data/presto-client-ruby)*                  |
 | Racecar                  | `racecar`                  | `>= 0.3.5`               | *[Link](#racecar)*                  | *[Link](https://github.com/zendesk/racecar)*                                   |
-| Rack                     | `rack`                     | `>= 1.4.7`               | *[Link](#rack)*                     | *[Link](https://github.com/rack/rack)*                                         |
+| Rack                     | `rack`                     | `>= 1.1.0`               | *[Link](#rack)*                     | *[Link](https://github.com/rack/rack)*                                         |
 | Rails                    | `rails`                    | `>= 3.2`                 | *[Link](#rails)*                    | *[Link](https://github.com/rails/rails)*                                       |
 | Rake                     | `rake`                     | `>= 12.0`                | *[Link](#rake)*                     | *[Link](https://github.com/ruby/rake)*                                         |
 | Redis                    | `redis`                    | `>= 3.2`                 | *[Link](#redis)*                    | *[Link](https://github.com/redis/redis-rb)*                                    |
@@ -637,7 +639,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `DelayedJob` instrumentation | `'delayed_job'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-### Elastic Search
+### Elasticsearch
 
 The Elasticsearch integration will trace any call to `perform_request` in the `Client` object:
 
@@ -649,7 +651,7 @@ Datadog.configure do |c|
   c.use :elasticsearch, options
 end
 
-# Perform a query to ElasticSearch
+# Perform a query to Elasticsearch
 client = Elasticsearch::Client.new url: 'http://127.0.0.1:9200'
 response = client.perform_request 'GET', '_cluster/health'
 ```
@@ -1015,6 +1017,39 @@ client = Net::HTTP.new(host, port)
 Datadog.configure(client, options)
 ```
 
+### Presto
+
+The Presto integration traces any SQL command sent through `presto-client` gem.
+
+```ruby
+require 'presto-client'
+require 'ddtrace'
+
+Datadog.configure do |c|
+  c.use :presto, options
+end
+
+client = Presto::Client.new(
+  server: "localhost:8880",
+  ssl: {verify: false},
+  catalog: "native",
+  schema: "default",
+  time_zone: "US/Pacific",
+  language: "English",
+  http_debug: true,
+)
+
+client.run("select * from system.nodes")
+```
+
+Where `options` is an optional `Hash` that accepts the following parameters:
+
+| Key | Description | Default |
+| --- | ----------- | ------- |
+| `analytics_enabled` | Enable analytics for spans produced by this integration. `true` for on, `nil` to defer to global setting, `false` for off. | `false` |
+| `service_name` | Service name used for `presto` instrumentation | `'presto'` |
+| `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
+
 ### Racecar
 
 The Racecar integration provides tracing for Racecar jobs.
@@ -1258,6 +1293,33 @@ customer_cache.get(...)
 invoice_cache.get(...)
 ```
 
+**Configuring trace settings per connection**
+
+You can configure trace settings per connection by using the `describes` option:
+
+```ruby
+# Provide a `:describes` option with a connection key.
+# Any of the following keys are acceptable and equivalent to one another.
+# If a block is provided, it yields a Settings object that
+# accepts any of the configuration options listed above.
+
+Datadog.configure do |c|
+  # The default configuration for any redis client
+  c.use :redis, service_name: 'redis-default'
+
+  # The configuration matching a given unix socket
+  c.use :redis, describes: { url: 'unix://path/to/file' }, service_name: 'redis-unix'
+
+  # Connection string
+  c.use :redis, describes: { url: 'redis://127.0.0.1:6379/0' }, service_name: 'redis-connection-string'
+  # Client host, port, db, scheme
+  c.use :redis, describes: { host: 'my-host.com', port: 6379, db: 1, scheme: 'redis' }, service_name: 'redis-connection-hash'
+  # Only a subset of the connection hash
+  c.use :redis, describes: { host: ENV['APP_CACHE_HOST'], port: ENV['APP_CACHE_PORT'] }, service_name: 'redis-cache'
+  c.use :redis, describes: { host: ENV['SIDEKIQ_CACHE_HOST'] }, service_name: 'redis-sidekiq'
+end
+```
+
 ### Resque
 
 The Resque integration uses Resque hooks that wraps the `perform` method.
@@ -1401,6 +1463,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `analytics_enabled` | Enable analytics for spans produced by this integration. `true` for on, `nil` to defer to global setting, `false` for off. | `false` |
 | `client_service_name` | Service name used for client-side `sidekiq` instrumentation | `'sidekiq-client'` |
 | `service_name` | Service name used for server-side `sidekiq` instrumentation | `'sidekiq'` |
+| `tag_args` | Enable tagging of job arguments. `true` for on, `false` for off. | `false` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
 ### Sinatra

data/lib/ddtrace.rb

@@ -52,6 +52,7 @@ require 'ddtrace/contrib/graphql/integration'
 require 'ddtrace/contrib/grpc/integration'
 require 'ddtrace/contrib/http/integration'
 require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/presto/integration'
 require 'ddtrace/contrib/mysql2/integration'
 require 'ddtrace/contrib/mongodb/integration'
 require 'ddtrace/contrib/racecar/integration'

data/lib/ddtrace/configuration/option.rb

@@ -13,9 +13,10 @@ module Datadog
       end
 
       def set(value)
-        (@value = context_exec(value, &definition.setter)).tap do |v|
+        old_value = @value
+        (@value = context_exec(value, old_value, &definition.setter)).tap do |v|
           @is_set = true
-          context_exec(v, &definition.on_set) if definition.on_set
+          context_exec(v, old_value, &definition.on_set) if definition.on_set
         end
       end
 

data/lib/ddtrace/configuration/option_definition.rb

@@ -4,7 +4,7 @@ module Datadog
   module Configuration
     # Represents a definition for an integration configuration option
     class OptionDefinition
-      IDENTITY = ->(x) { x }
+      IDENTITY = ->(new_value, _old_value) { new_value }
 
       attr_reader \
         :default,

data/lib/ddtrace/configuration/options.rb

@@ -70,6 +70,11 @@ module Datadog
           options[name].get
         end
 
+        def reset_option(name)
+          assert_valid_option!(name)
+          options[name].reset if options.key?(name)
+        end
+
         def option_defined?(name)
           self.class.options.key?(name)
         end

data/lib/ddtrace/contrib/action_cable/integration.rb

@@ -15,8 +15,8 @@ module Datadog
           Gem.loaded_specs['actioncable'] && Gem.loaded_specs['actioncable'].version
         end
 
-        def self.present?
-          super && defined?(::ActionCable)
+        def self.loaded?
+          defined?(::ActionCable)
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/action_pack/integration.rb

@@ -15,8 +15,8 @@ module Datadog
           Gem.loaded_specs['actionpack'] && Gem.loaded_specs['actionpack'].version
         end
 
-        def self.present?
-          super && defined?(::ActionPack)
+        def self.loaded?
+          defined?(::ActionPack)
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/action_view/integration.rb

@@ -22,8 +22,8 @@ module Datadog
           end
         end
 
-        def self.present?
-          super && defined?(::ActionView)
+        def self.loaded?
+          defined?(::ActionView)
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/active_model_serializers/integration.rb

@@ -16,14 +16,12 @@ module Datadog
             && Gem.loaded_specs['active_model_serializers'].version
         end
 
-        def self.present?
-          super && defined?(::ActiveModel::Serializer)
+        def self.loaded?
+          defined?(::ActiveModel::Serializer) && defined?(::ActiveSupport::Notifications)
         end
 
         def self.compatible?
-          super \
-            && defined?(::ActiveSupport::Notifications) \
-            && version >= Gem::Version.new('0.9.0')
+          super && version >= Gem::Version.new('0.9.0')
         end
 
         def default_configuration

data/lib/ddtrace/contrib/active_record/configuration/resolver.rb

@@ -11,6 +11,10 @@ module Datadog
             @configurations = configurations
           end
 
+          def resolve(key)
+            normalize(connection_resolver.resolve(key).symbolize_keys)
+          end
+
           def configurations
             @configurations || ::ActiveRecord::Base.configurations
           end
@@ -25,11 +29,6 @@ module Datadog
             end
           end
 
-          def resolve(spec)
-            return :default if spec == :default
-            normalize(connection_resolver.resolve(spec).symbolize_keys)
-          end
-
           def normalize(hash)
             {
               adapter:  hash[:adapter],