ls-trace 0.1.2 → 0.2.0

data/lib/ddtrace/contrib/action_view/events/render_template.rb

@@ -0,0 +1,48 @@
+require 'ddtrace/ext/net'
+require 'ddtrace/contrib/analytics'
+require 'ddtrace/contrib/action_view/ext'
+require 'ddtrace/contrib/action_view/event'
+
+module Datadog
+  module Contrib
+    module ActionView
+      module Events
+        # Defines instrumentation for render_template.action_view event
+        module RenderTemplate
+          include ActionView::Event
+
+          EVENT_NAME = 'render_template.action_view'.freeze
+
+          module_function
+
+          def event_name
+            self::EVENT_NAME
+          end
+
+          def span_name
+            Ext::SPAN_RENDER_TEMPLATE
+          end
+
+          def process(span, _event, _id, payload)
+            span.span_type = Datadog::Ext::HTTP::TEMPLATE
+
+            if (template_name = Utils.normalize_template_name(payload[:identifier]))
+              span.resource = template_name
+              span.set_tag(Ext::TAG_TEMPLATE_NAME, template_name)
+            end
+
+            layout = payload[:layout]
+            span.set_tag(Ext::TAG_LAYOUT, layout) if layout
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
+            record_exception(span, payload)
+          rescue StandardError => e
+            Datadog.logger.debug(e.message)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,11 @@ module Datadog
       # ActionView integration constants
       module Ext
         APP = 'action_view'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ACTION_VIEW_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTION_VIEW_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ACTION_VIEW_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_VIEW_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ACTION_VIEW_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_VIEW_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ACTION_VIEW_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'action_view'.freeze
         SPAN_RENDER_PARTIAL = 'rails.render_partial'.freeze
         SPAN_RENDER_TEMPLATE = 'rails.render_template'.freeze

data/lib/ddtrace/contrib/action_view/instrumentation/partial_renderer.rb

@@ -4,7 +4,7 @@ module Datadog
   module Contrib
     module ActionView
       module Instrumentation
-        # Instrumentation for partial rendering
+        # Legacy instrumentation for partial rendering for Rails < 4
         module PartialRenderer
           def render(*args, &block)
             datadog_tracer.trace(
@@ -21,7 +21,7 @@ module Datadog
 
               datadog_render_partial(template)
             rescue StandardError => e
-              Datadog::Tracer.log.debug(e.message)
+              Datadog.logger.debug(e.message)
             end
 
             # execute the original function anyway
@@ -32,10 +32,14 @@ module Datadog
             template_name = Utils.normalize_template_name(template.try('identifier'))
 
             if template_name
+              active_datadog_span.resource = template_name
               active_datadog_span.set_tag(
                 Ext::TAG_TEMPLATE_NAME,
                 template_name
               )
+
+              # Measure service stats
+              Contrib::Analytics.set_measured(active_datadog_span)
             end
           end
 
@@ -54,23 +58,15 @@ module Datadog
             self.active_datadog_span = nil
           end
 
-          # Rails < 6 partial rendering
-          module RailsLessThan6
+          # Rails < 4 partial rendering
+          # ActiveSupport events are used instead for Rails >= 4
+          module RailsLessThan4
             include PartialRenderer
 
             def datadog_template(*args)
               @template
             end
           end
-
-          # Rails >= 6 partial rendering
-          module Rails6Plus
-            include PartialRenderer
-
-            def datadog_template(*args)
-              args[1]
-            end
-          end
         end
       end
     end

data/lib/ddtrace/contrib/action_view/instrumentation/template_renderer.rb

@@ -4,9 +4,9 @@ module Datadog
   module Contrib
     module ActionView
       module Instrumentation
-        # Instrumentation for template rendering
+        # Legacy instrumentation for template rendering for Rails < 4
         module TemplateRenderer
-          # Rails < 3.1 template rendering
+          # Legacy Rails < 3.1 template rendering
           module Rails30
             # rubocop:disable Metrics/MethodLength
             def self.prepended(base)
@@ -37,6 +37,7 @@ module Datadog
                     template_name = Utils.normalize_template_name(template_name)
 
                     if template_name
+                      active_datadog_span.resource = template_name
                       active_datadog_span.set_tag(
                         Ext::TAG_TEMPLATE_NAME,
                         template_name
@@ -49,8 +50,11 @@ module Datadog
                         layout_name
                       )
                     end
+
+                    # Measure service stats
+                    Contrib::Analytics.set_measured(active_datadog_span)
                   rescue StandardError => e
-                    Datadog::Tracer.log.debug(e.message)
+                    Datadog.logger.debug(e.message)
                   end
 
                   # execute the original function anyway
@@ -82,7 +86,7 @@ module Datadog
             end
           end
 
-          # Shared code for Rails >= 3.1 template rendering
+          # Legacy shared code for Rails >= 3.1 template rendering
           module Rails31Plus
             def render(*args, &block)
               datadog_tracer.trace(
@@ -99,7 +103,7 @@ module Datadog
 
                 datadog_render_template(template, layout_name)
               rescue StandardError => e
-                Datadog::Tracer.log.debug(e.message)
+                Datadog.logger.debug(e.message)
               end
 
               # execute the original function anyway
@@ -113,6 +117,7 @@ module Datadog
               layout = layout_name.try(:[], 'virtual_path') # Proc can be called without parameters since Rails 6
 
               if template_name
+                active_datadog_span.resource = template_name
                 active_datadog_span.set_tag(
                   Ext::TAG_TEMPLATE_NAME,
                   template_name
@@ -125,6 +130,9 @@ module Datadog
                   layout
                 )
               end
+
+              # Measure service stats
+              Contrib::Analytics.set_measured(active_datadog_span)
             end
 
             private
@@ -143,23 +151,15 @@ module Datadog
             end
           end
 
-          # Rails >= 3.1 && < 6 template rendering
-          module Rails31To5
+          # Rails >= 3.1, < 4 template rendering
+          # ActiveSupport events are used instead for Rails >= 4
+          module RailsLessThan4
             include Rails31Plus
 
             def datadog_parse_args(template, layout_name, *args)
               [template, layout_name]
             end
           end
-
-          # Rails >= 6 template rendering
-          module Rails6Plus
-            include Rails31Plus
-
-            def datadog_parse_args(view, template, layout_name, *args)
-              [template, layout_name]
-            end
-          end
         end
       end
     end

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

@@ -9,6 +9,8 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('3.0')
+
         register_as :action_view, auto_patch: false
 
         def self.version
@@ -22,12 +24,12 @@ module Datadog
           end
         end
 
-        def self.present?
-          super && defined?(::ActionView)
+        def self.loaded?
+          !defined?(::ActionView).nil?
         end
 
         def self.compatible?
-          super && version >= Gem::Version.new('3.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -1,5 +1,6 @@
 require 'ddtrace/ext/http'
 require 'ddtrace/contrib/patcher'
+require 'ddtrace/contrib/action_view/events'
 require 'ddtrace/contrib/action_view/ext'
 require 'ddtrace/contrib/action_view/instrumentation/partial_renderer'
 require 'ddtrace/contrib/action_view/instrumentation/template_renderer'
@@ -14,37 +15,30 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:action_view)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:action_view) do
-            begin
-              patch_renderer
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Action View integration: #{e} Location: #{e.backtrace.first}")
-            end
-          end
+          patch_renderer
         end
 
         def patch_renderer
-          do_once(:patch_renderer) do
-            if defined?(::ActionView::TemplateRenderer) && defined?(::ActionView::PartialRenderer)
-              if Integration.version < Gem::Version.new('6.0.0')
-                ::ActionView::TemplateRenderer.send(:prepend, Instrumentation::TemplateRenderer::Rails31To5)
-                ::ActionView::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::RailsLessThan6)
-              else
-                ::ActionView::TemplateRenderer.send(:prepend, Instrumentation::TemplateRenderer::Rails6Plus)
-                ::ActionView::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::Rails6Plus)
-              end
-            elsif defined?(::ActionView::Rendering) && defined?(::ActionView::Partials::PartialRenderer)
-              # NOTE: Rails < 3.1 compatibility: different classes are used
-              ::ActionView::Rendering.send(:prepend, Instrumentation::TemplateRenderer::Rails30)
-              ::ActionView::Partials::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::RailsLessThan6)
-            else
-              Datadog::Tracer.log.debug('Expected Template/Partial classes not found; template rendering disabled')
-            end
+          if target_version >= Gem::Version.new('4.0.0')
+            Events.subscribe!
+          elsif defined?(::ActionView::TemplateRenderer) && defined?(::ActionView::PartialRenderer)
+            # Rails < 4 compatibility:
+            #  Rendering events are not nested in this version, creating
+            #  render_partial spans outside of the parent render_template span.
+            #  We fall back to manual patching instead.
+            ::ActionView::TemplateRenderer.send(:prepend, Instrumentation::TemplateRenderer::RailsLessThan4)
+            ::ActionView::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::RailsLessThan4)
+          elsif defined?(::ActionView::Rendering) && defined?(::ActionView::Partials::PartialRenderer)
+            # NOTE: Rails < 3.1 compatibility: different classes are used
+            ::ActionView::Rendering.send(:prepend, Instrumentation::TemplateRenderer::Rails30)
+            ::ActionView::Partials::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::RailsLessThan4)
+          else
+            Datadog.logger.debug('Expected Template/Partial classes not found; template rendering disabled')
           end
         end
       end

data/lib/ddtrace/contrib/active_model_serializers/configuration/settings.rb

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveModelSerializers integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

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

@@ -36,6 +36,9 @@ module Datadog
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
 
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             # Set the resource name and serializer name
             res = resource(payload[:serializer])
             span.resource = res

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

@@ -4,8 +4,11 @@ module Datadog
       # ActiveModelSerializers integration constants
       module Ext
         APP = 'active_model_serializers'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'active_model_serializers'.freeze
         SPAN_RENDER = 'active_model_serializers.render'.freeze
         SPAN_SERIALIZE = 'active_model_serializers.serialize'.freeze

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

@@ -9,6 +9,8 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('0.9.0')
+
         register_as :active_model_serializers
 
         def self.version
@@ -16,14 +18,13 @@ module Datadog
             && Gem.loaded_specs['active_model_serializers'].version
         end
 
-        def self.present?
-          super && defined?(::ActiveModel::Serializer)
+        def self.loaded?
+          !defined?(::ActiveModel::Serializer).nil? \
+            && !defined?(::ActiveSupport::Notifications).nil?
         end
 
         def self.compatible?
-          super \
-            && defined?(::ActiveSupport::Notifications) \
-            && version >= Gem::Version.new('0.9.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -12,19 +12,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_model_serializers)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_model_serializers) do
-            begin
-              # Subscribe to ActiveModelSerializers events
-              Events.subscribe!
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply ActiveModelSerializers integration: #{e}")
-            end
-          end
+          Events.subscribe!
         end
 
         def get_option(option)

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],

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

@@ -8,13 +8,18 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveRecord integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end