ddtrace 0.12.1 → 0.13.0.beta1

data/gemfiles/contrib.gemfile

@@ -3,10 +3,13 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
+gem "active_model_serializers", ">= 0.10.0"
 gem "elasticsearch-transport"
+gem "excon"
 gem "mongo", "< 2.5"
 gem "graphql"
 gem "grape"
+gem "grpc"
 gem "rack"
 gem "rack-test"
 gem "redis", "< 4.0"
@@ -14,10 +17,12 @@ gem "hiredis"
 gem "sinatra"
 gem "sqlite3"
 gem "activerecord", "< 5.1.5"
+gem "sequel"
 gem "sidekiq"
 gem "aws-sdk"
 gem "sucker_punch"
 gem "dalli"
+gem "rake"
 gem "resque", "< 2.0"
 gem "racecar", ">= 0.3.5"
 gem "mysql2", "< 0.5", platform: :ruby

data/gemfiles/contrib_old.gemfile

@@ -3,20 +3,23 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
+gem "active_model_serializers", "~> 0.9.0"
 gem "elasticsearch-transport"
+gem "excon"
 gem "mongo", "< 2.5"
 gem "redis", "< 4.0"
 gem "hiredis"
 gem "rack", "1.4.7"
 gem "rack-test", "0.7.0"
-gem "rack-cache", "1.7.1"
 gem "sinatra", "1.4.5"
 gem "sqlite3"
+gem "sequel", "~> 4.0", "< 4.37"
 gem "activerecord", "3.2.22.5"
 gem "sidekiq", "4.0.0"
 gem "aws-sdk", "~> 2.0"
 gem "sucker_punch"
 gem "dalli"
+gem "rake", "< 12.3"
 gem "resque", "< 2.0"
 gem "mysql2", "0.3.21", platform: :ruby
 gem "activerecord-mysql-adapter", platform: :ruby

data/gemfiles/rails30_postgres.gemfile

@@ -7,6 +7,5 @@ gem "test-unit"
 gem "rails", "3.0.20"
 gem "pg", "0.15.1", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails30_postgres_sidekiq.gemfile

@@ -8,6 +8,5 @@ gem "rails", "3.0.20"
 gem "pg", "0.15.1", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "sidekiq", "4.0.0"
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails32_mysql2.gemfile

@@ -8,6 +8,5 @@ gem "rails", "3.2.22.5"
 gem "mysql2", "0.3.21", platform: :ruby
 gem "activerecord-mysql-adapter", platform: :ruby
 gem "activerecord-jdbcmysql-adapter", platform: :jruby
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails32_postgres.gemfile

@@ -7,6 +7,5 @@ gem "test-unit"
 gem "rails", "3.2.22.5"
 gem "pg", "0.15.1", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails32_postgres_redis.gemfile

@@ -9,6 +9,5 @@ gem "pg", "0.15.1", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "redis-rails"
 gem "redis", "< 4.0"
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails32_postgres_sidekiq.gemfile

@@ -8,6 +8,5 @@ gem "rails", "3.2.22.5"
 gem "pg", "0.15.1", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "sidekiq", "4.0.0"
-gem "rack-cache", "1.7.1"
 
 gemspec path: "../"

data/gemfiles/rails5_mysql2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
-gem "rails", "~> 5.1.6"
+gem "rails", "5.1.5"
 gem "mysql2", "< 0.5", platform: :ruby
 
 gemspec path: "../"

data/gemfiles/rails5_postgres.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
-gem "rails", "~> 5.1.6"
+gem "rails", "5.1.5"
 gem "pg", "< 1.0", platform: :ruby
 
 gemspec path: "../"

data/gemfiles/rails5_postgres_redis.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
-gem "rails", "~> 5.1.6"
+gem "rails", "5.1.5"
 gem "pg", "< 1.0", platform: :ruby
 gem "redis-rails"
 gem "redis"

data/gemfiles/rails5_postgres_sidekiq.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "pry-nav", git: "https://github.com/nixme/pry-nav.git", branch: "master"
-gem "rails", "~> 5.1.6"
+gem "rails", "5.1.5"
 gem "pg", "< 1.0", platform: :ruby
 gem "sidekiq"
 gem "activejob"

data/lib/ddtrace.rb

@@ -4,6 +4,7 @@ require 'ddtrace/registry'
 require 'ddtrace/pin'
 require 'ddtrace/tracer'
 require 'ddtrace/error'
+require 'ddtrace/quantization/hash'
 require 'ddtrace/quantization/http'
 require 'ddtrace/pipeline'
 require 'ddtrace/configuration'
@@ -56,18 +57,23 @@ end
 require 'ddtrace/contrib/base'
 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/sequel/patcher'
 require 'ddtrace/contrib/elasticsearch/patcher'
 require 'ddtrace/contrib/faraday/patcher'
 require 'ddtrace/contrib/grape/patcher'
 require 'ddtrace/contrib/graphql/patcher'
+require 'ddtrace/contrib/grpc/patcher'
 require 'ddtrace/contrib/redis/patcher'
 require 'ddtrace/contrib/http/patcher'
 require 'ddtrace/contrib/aws/patcher'
 require 'ddtrace/contrib/sucker_punch/patcher'
 require 'ddtrace/contrib/mongodb/patcher'
 require 'ddtrace/contrib/dalli/patcher'
+require 'ddtrace/contrib/rake/patcher'
 require 'ddtrace/contrib/resque/patcher'
 require 'ddtrace/contrib/racecar/patcher'
 require 'ddtrace/contrib/sidekiq/patcher'
+require 'ddtrace/contrib/excon/patcher'
 require 'ddtrace/monkey'

data/lib/ddtrace/configuration.rb

@@ -9,11 +9,11 @@ module Datadog
 
     def initialize(options = {})
       @registry = options.fetch(:registry, Datadog.registry)
-      @wrapped_registry = {}
     end
 
     def [](integration_name)
-      @wrapped_registry[integration_name] ||= Proxy.new(fetch_integration(integration_name))
+      integration = fetch_integration(integration_name)
+      Proxy.new(integration)
     end
 
     def use(integration_name, options = {})

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

@@ -0,0 +1,57 @@
+require 'ddtrace/contrib/active_support/notifications/event'
+
+module Datadog
+  module Contrib
+    module ActiveModelSerializers
+      # Defines basic behaviors for an ActiveModelSerializers event.
+      module Event
+        def self.included(base)
+          base.send(:include, ActiveSupport::Notifications::Event)
+          base.send(:extend, ClassMethods)
+        end
+
+        # Class methods for ActiveModelSerializers events.
+        # Note, they share the same process method and before_trace method.
+        module ClassMethods
+          def span_options
+            { service: configuration[:service_name] }
+          end
+
+          def tracer
+            configuration[:tracer]
+          end
+
+          def configuration
+            Datadog.configuration[:active_model_serializers]
+          end
+
+          def process(span, event, _id, payload)
+            span.service = configuration[:service_name]
+
+            # Set the resource name and serializer name
+            res = resource(payload[:serializer])
+            span.resource = res
+            span.set_tag('active_model_serializers.serializer', res)
+
+            span.span_type = Datadog::Ext::HTTP::TEMPLATE
+
+            # Will be nil in 0.9
+            span.set_tag('active_model_serializers.adapter', payload[:adapter].class) unless payload[:adapter].nil?
+          end
+
+          private
+
+          def resource(serializer)
+            # Depending on the version of ActiveModelSerializers
+            # serializer will be a string or an object.
+            if serializer.respond_to?(:name)
+              serializer.name
+            else
+              serializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'ddtrace/contrib/active_model_serializers/events/render'
+require 'ddtrace/contrib/active_model_serializers/events/serialize'
+
+module Datadog
+  module Contrib
+    module ActiveModelSerializers
+      # Defines collection of instrumented ActiveModelSerializers events
+      module Events
+        ALL = [
+          Events::Render,
+          Events::Serialize
+        ].freeze
+
+        module_function
+
+        def all
+          self::ALL
+        end
+
+        def subscriptions
+          all.collect(&:subscriptions).collect(&:to_a).flatten
+        end
+
+        def subscribe!
+          all.each(&:subscribe!)
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/active_model_serializers/events/render.rb

@@ -0,0 +1,32 @@
+require 'ddtrace/contrib/active_model_serializers/event'
+
+module Datadog
+  module Contrib
+    module ActiveModelSerializers
+      module Events
+        # Defines instrumentation for render.active_model_serializers event
+        module Render
+          include ActiveModelSerializers::Event
+
+          EVENT_NAME = 'render.active_model_serializers'.freeze
+          SPAN_NAME = 'active_model_serializers.render'.freeze
+
+          module_function
+
+          def supported?
+            Gem.loaded_specs['active_model_serializers'] \
+              && Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.10')
+          end
+
+          def event_name
+            self::EVENT_NAME
+          end
+
+          def span_name
+            self::SPAN_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/active_model_serializers/events/serialize.rb

@@ -0,0 +1,35 @@
+require 'ddtrace/contrib/active_model_serializers/event'
+
+module Datadog
+  module Contrib
+    module ActiveModelSerializers
+      module Events
+        # Defines instrumentation for !serialize.active_model_serializers event
+        module Serialize
+          include ActiveModelSerializers::Event
+
+          EVENT_NAME = '!serialize.active_model_serializers'.freeze
+          SPAN_NAME = 'active_model_serializers.serialize'.freeze
+
+          module_function
+
+          def supported?
+            Gem.loaded_specs['active_model_serializers'] \
+              && ( \
+                Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.9') \
+                && Gem.loaded_specs['active_model_serializers'].version < Gem::Version.new('0.10') \
+              )
+          end
+
+          def event_name
+            self::EVENT_NAME
+          end
+
+          def span_name
+            self::SPAN_NAME
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+require 'ddtrace/ext/app_types'
+require 'ddtrace/ext/http'
+require 'ddtrace/contrib/active_model_serializers/events'
+
+module Datadog
+  module Contrib
+    module ActiveModelSerializers
+      # Provides instrumentation for ActiveModelSerializers through ActiveSupport instrumentation signals
+      module Patcher
+        include Base
+
+        VERSION_REQUIRED = Gem::Version.new('0.9.0')
+
+        register_as :active_model_serializers
+
+        option :service_name, default: 'active_model_serializers'
+        option :tracer, default: Datadog.tracer do |value|
+          (value || Datadog.tracer).tap do |v|
+            # Make sure to update tracers of all subscriptions
+            Events.subscriptions.each do |subscription|
+              subscription.tracer = v
+            end
+          end
+        end
+
+        class << self
+          def patch
+            return patched? if patched? || !compatible?
+
+            # Subscribe to ActiveModelSerializers events
+            Events.subscribe!
+
+            # Set service info
+            configuration[:tracer].set_service_info(
+              configuration[:service_name],
+              'active_model_serializers',
+              Ext::AppTypes::WEB
+            )
+
+            @patched = true
+          end
+
+          def patched?
+            return @patched if defined?(@patched)
+            @patched = false
+          end
+
+          private
+
+          def configuration
+            Datadog.configuration[:active_model_serializers]
+          end
+
+          def compatible?
+            Gem.loaded_specs['active_model_serializers'] && Gem.loaded_specs['activesupport'] \
+              && Gem.loaded_specs['active_model_serializers'].version >= VERSION_REQUIRED
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'ddtrace/contrib/active_support/notifications/event'
+
+module Datadog
+  module Contrib
+    module ActiveRecord
+      # Defines basic behaviors for an ActiveRecord event.
+      module Event
+        def self.included(base)
+          base.send(:include, ActiveSupport::Notifications::Event)
+          base.send(:extend, ClassMethods)
+        end
+
+        # Class methods for ActiveRecord events.
+        module ClassMethods
+          def span_options
+            { service: configuration[:service_name] }
+          end
+
+          def tracer
+            configuration[:tracer]
+          end
+
+          def configuration
+            Datadog.configuration[:active_record]
+          end
+        end
+      end
+    end
+  end
+end