app_perf_rpm 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f065cc5f296439517408c180ce05d242779eea18
-  data.tar.gz: 1374db5e7858a9f27429991423a868d2a368b448
+  metadata.gz: a27d3cb17a8dcdda4da96bee836a98a525a4cf93
+  data.tar.gz: 3673b87c11d693760e87182b703b6162edd658cf
 SHA512:
-  metadata.gz: 3ab367ea7fee124725663f840d07af9097d20f8925ebb859c622aa13df507137d46678221c574545906c18e5c6bf996424461384bf6728d1fd71e3392139b5f4
-  data.tar.gz: 8215c2f06106fe47e08629c72aebf8577c544848b1a6dcd10b69510694c20919a0a6b191ae1721591096124e0878cf35f61643b59227188c4a4de0e4361c97d9
+  metadata.gz: c40d2afc87b15d14c37302a9de5e75bb4f5f7bbacdd8b8261f14defcd0603a59e8aa200625096bd2b1c8004555300cca135483b710ee0a62ca502077494655d1
+  data.tar.gz: 7ebc862f72bf8766b0be9557c6f26dda69c34f63e318be766defdf722f16ee5783f33a35ea3bea74950de4b8e832208436ff80dd2e3637c80850550760eecdfb

data/lib/app_perf_rpm/instruments/action_controller.rb

@@ -15,6 +15,8 @@ module AppPerfRpm
 
         process_action_without_trace(method_name, *args)
       rescue Exception => e
+        puts e.message.inspect
+        puts e.backtrace.join("\n")
         if span
           span.set_tag('error', true)
           span.log_error(e)

data/lib/app_perf_rpm/instruments/action_view.rb

@@ -1,218 +1,10 @@
 # frozen_string_literal: true
 
-if ::AppPerfRpm.config.instrumentation[:action_view][:enabled] && defined?(::ActionView)
-  if defined?(Rails) && Rails::VERSION::MAJOR == 2
-    ActionView::Partials.module_eval do
-      alias :render_partial_without_trace :render_partial
-      def render_partial(options = {})
-        if ::AppPerfRpm::Tracer.tracing? && options.key?(:partial) && options[:partial].is_a?(String)
-          span = AppPerfRpm.tracer.start_span("render_partial", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.controller" => @_request.path_parameters['controller'],
-            "view.action" => @_request.path_parameters['action'],
-            "view.template" => options[:partial]
-          })
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_partial_without_trace(options)
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-
-      alias :render_partial_collection_without_trace :render_partial_collection
-      def render_partial_collection(options = {})
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_partial_collection", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.controller" => @_request.path_parameters['controller'],
-            "view.action" => @_request.path_parameters['action'],
-            "view.template" => @path
-          })
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_partial_collection_without_trace(options)
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-    end
-  end
-
-  if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
-    ::ActionView::Partials::PartialRenderer.class_eval do
-      alias :render_partial_without_trace :render_partial
-      def render_partial
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_partial", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.template" => @options[:partial]
-          })
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_partial_without_trace
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-
-      alias :render_collection_without_trace :render_collection
-      def render_collection
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_collection", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.template" => @path
-          })
-          if @_request
-            span.set_tag('view.controller', @_request.path_parameters['controller'])
-            span.set_tag('view.action', @_request.path_parameters['action'])
-          end
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_collection_without_trace
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-    end
-
-    ::ActionView::Rendering.class_eval do
-      alias :_render_template_without_trace _render_template
-
-      def _render_template(template, layout = nil, options = {})
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_template")
-          span.set_tag "view.template", template
-          span.set_tag "view.layout", layout.to_s
-          span.set_tag "component", "ActionView"
-          span.set_tag "span.kind", "client"
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        _render_template_without_trace(template, layout, options)
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-    end
-  end
-
-  if defined?(Rails) && Rails.version >= '3.1.0'
-    ActionView::PartialRenderer.class_eval do
-      alias :render_partial_without_trace :render_partial
-      def render_partial
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_partial", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.template" => @options[:partial]
-          })
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_partial_without_trace
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-
-      alias :render_collection_without_trace :render_collection
-      def render_collection
-        if ::AppPerfRpm::Tracer.tracing?
-          span = AppPerfRpm.tracer.start_span("render_collection", tags: {
-            "component" => "ActionView",
-            "span.kind" => "client",
-            "view.template" => @path
-          })
-          if @_request
-            span.set_tag('view.controller', @_request.path_parameters['controller'])
-            span.set_tag('view.action', @_request.path_parameters['action'])
-          end
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_collection_without_trace
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-    end
-
-    ::ActionView::TemplateRenderer.class_eval do
-      alias :render_template_without_trace :render_template
-
-      def render_template(template, layout_name = nil, locals = {})
-        if ::AppPerfRpm::Tracer.tracing?
-          layout = if layout_name.is_a?(String)
-                     layout_name
-                   elsif method(:find_layout).arity == 3
-                     find_layout(layout_name, locals, [formats.first])
-                   elsif locals
-                     find_layout(layout_name, locals)
-                   end
-          span = AppPerfRpm.tracer.start_span("render_template")
-          span.set_tag "view.layout", layout.inspect
-          span.set_tag "view.template", template.identifier
-          span.set_tag "component", "ActionView"
-          span.set_tag "span.kind", "client"
-          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
-        end
-
-        render_template_without_trace(template, layout_name, locals)
-      rescue Exception => e
-        if span
-          span.set_tag('error', true)
-          span.log_error(e)
-        end
-        raise
-      ensure
-        span.finish if span
-      end
-    end
-  end
-
+if ::AppPerfRpm.config.instrumentation[:action_view][:enabled] && defined?(::ActionView) && defined?(Rails)
+  require 'app_perf_rpm/instruments/action_view/action_view_rails_2'
+  require 'app_perf_rpm/instruments/action_view/action_view_rails_3_0'
+  require 'app_perf_rpm/instruments/action_view/action_view_rails_3_1_to_5'
+  require 'app_perf_rpm/instruments/action_view/action_view_rails_6'
+  
   AppPerfRpm.logger.info "Initializing actionview tracer."
 end

data/lib/app_perf_rpm/instruments/action_view/action_view_rails_2.rb

@@ -0,0 +1,51 @@
+if Rails::VERSION::MAJOR == 2
+  ActionView::Partials.module_eval do
+    alias :render_partial_without_trace :render_partial
+    def render_partial(options = {})
+      if ::AppPerfRpm::Tracer.tracing? && options.key?(:partial) && options[:partial].is_a?(String)
+        span = AppPerfRpm.tracer.start_span("render_partial", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.controller" => @_request.path_parameters['controller'],
+          "view.action" => @_request.path_parameters['action'],
+          "view.template" => options[:partial]
+        })
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_partial_without_trace(options)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+
+    alias :render_partial_collection_without_trace :render_partial_collection
+    def render_partial_collection(options = {})
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_partial_collection", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.controller" => @_request.path_parameters['controller'],
+          "view.action" => @_request.path_parameters['action'],
+          "view.template" => @path
+        })
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_partial_collection_without_trace(options)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+end

data/lib/app_perf_rpm/instruments/action_view/action_view_rails_3_0.rb

@@ -0,0 +1,76 @@
+if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
+  ::ActionView::Partials::PartialRenderer.class_eval do
+    alias :render_partial_without_trace :render_partial
+    def render_partial
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_partial", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @options[:partial]
+        })
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_partial_without_trace
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+
+    alias :render_collection_without_trace :render_collection
+    def render_collection
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_collection", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @path
+        })
+        if @_request
+          span.set_tag('view.controller', @_request.path_parameters['controller'])
+          span.set_tag('view.action', @_request.path_parameters['action'])
+        end
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_collection_without_trace
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+
+  ::ActionView::Rendering.class_eval do
+    alias :_render_template_without_trace _render_template
+
+    def _render_template(template, layout = nil, options = {})
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_template")
+        span.set_tag "view.template", template
+        span.set_tag "view.layout", layout
+        span.set_tag "component", "ActionView"
+        span.set_tag "span.kind", "client"
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      _render_template_without_trace(template, layout, options)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+end

data/lib/app_perf_rpm/instruments/action_view/action_view_rails_3_1_to_5.rb

@@ -0,0 +1,87 @@
+if Rails.version >= '3.1.0' && Rails.version < '6.0.0'
+  ActionView::PartialRenderer.class_eval do
+    alias :render_partial_without_trace :render_partial
+    def render_partial
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_partial", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @options[:partial]
+        })
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_partial_without_trace
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+
+    alias :render_collection_without_trace :render_collection
+    def render_collection
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_collection", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @path
+        })
+        if @_request
+          span.set_tag('view.controller', @_request.path_parameters['controller'])
+          span.set_tag('view.action', @_request.path_parameters['action'])
+        end
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_collection_without_trace
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+
+  ::ActionView::TemplateRenderer.class_eval do
+    alias :render_template_without_trace :render_template
+
+    def render_template(template, layout_name = nil, locals = {})
+      if ::AppPerfRpm::Tracer.tracing?
+        layout = if layout_name
+                   if layout_name.is_a?(String)
+                     layout_name
+                   elsif layout_name.is_a?(Proc)
+                     layout_name.call
+                   elsif method(:find_layout).arity == 3
+                     find_layout(layout_name, locals, [formats.first])
+                   elsif locals
+                     find_layout(layout_name, locals)
+                   end
+                 end
+        span = AppPerfRpm.tracer.start_span("render_template")
+        span.set_tag "view.layout", layout ? layout.inspect : ""
+        span.set_tag "view.template", template.inspect
+        span.set_tag "component", "ActionView"
+        span.set_tag "span.kind", "client"
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_template_without_trace(template, layout_name, locals)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+end

data/lib/app_perf_rpm/instruments/action_view/action_view_rails_6.rb

@@ -0,0 +1,87 @@
+if Rails.version >= '6.0.0'
+  ActionView::PartialRenderer.class_eval do
+    alias :render_partial_without_trace :render_partial
+    def render_partial(context, template)
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_partial", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @options[:partial]
+        })
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_partial_without_trace(context, template)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+
+    alias :render_collection_without_trace :render_collection
+    def render_collection(context, template)
+      if ::AppPerfRpm::Tracer.tracing?
+        span = AppPerfRpm.tracer.start_span("render_collection", tags: {
+          "component" => "ActionView",
+          "span.kind" => "client",
+          "view.template" => @path
+        })
+        if @_request
+          span.set_tag('view.controller', @_request.path_parameters['controller'])
+          span.set_tag('view.action', @_request.path_parameters['action'])
+        end
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_collection_without_trace(context, template)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+
+  ::ActionView::TemplateRenderer.class_eval do
+    alias :render_template_without_trace :render_template
+
+    def render_template(view, template, layout_name = nil, locals = {})
+      if ::AppPerfRpm::Tracer.tracing?
+        layout = if layout_name
+                   if layout_name.is_a?(String)
+                     layout_name
+                   elsif layout_name.is_a?(Proc)
+                     layout_name.call
+                   elsif method(:find_layout).arity == 3
+                     find_layout(layout_name, locals, [formats.first])
+                   elsif locals
+                     find_layout(layout_name, locals)
+                   end
+                 end
+        span = AppPerfRpm.tracer.start_span("render_template")
+        span.set_tag "view.layout", layout ? layout.inspect : ""
+        span.set_tag "view.template", template.inspect
+        span.set_tag "component", "ActionView"
+        span.set_tag "span.kind", "client"
+        AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+      end
+
+      render_template_without_trace(view, template, layout_name, locals)
+    rescue Exception => e
+      if span
+        span.set_tag('error', true)
+        span.log_error(e)
+      end
+      raise
+    ensure
+      span.finish if span
+    end
+  end
+end

data/lib/app_perf_rpm/instruments/redis.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module AppPerf
+module AppPerfRpm
   module Instruments
     module Redis
       include AppPerfRpm::Utils
@@ -64,7 +64,7 @@ if ::AppPerfRpm.config.instrumentation[:redis][:enabled] &&
   defined?(::Redis)
   ::AppPerfRpm.logger.info "Initializing redis tracer."
 
-  ::Redis::Client.send(:include, ::AppPerf::Instruments::Redis)
+  ::Redis::Client.send(:include, ::AppPerfRpm::Instruments::Redis)
 
   ::Redis::Client.class_eval do
     alias_method :call_without_trace, :call

data/lib/app_perf_rpm/instruments/roda.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module AppPerf
+module AppPerfRpm
   module Instruments
     module Roda
       def call_with_trace(&block)
@@ -40,7 +40,7 @@ end
 if defined?(::Roda) && ::AppPerfRpm.config.instrumentation[:roda][:enabled]
   ::AppPerfRpm.logger.info "Initializing roda tracer."
 
-  ::Roda::RodaPlugins::Base::InstanceMethods.send(:include, AppPerf::Instruments::Roda)
+  ::Roda::RodaPlugins::Base::InstanceMethods.send(:include, AppPerfRpm::Instruments::Roda)
   ::Roda::RodaPlugins::Base::InstanceMethods.class_eval do
     alias_method :call_without_trace, :call
     alias_method :call, :call_with_trace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_perf_rpm
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Randy Girard
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +134,10 @@ files:
 - lib/app_perf_rpm/instrumentation.rb
 - lib/app_perf_rpm/instruments/action_controller.rb
 - lib/app_perf_rpm/instruments/action_view.rb
+- lib/app_perf_rpm/instruments/action_view/action_view_rails_2.rb
+- lib/app_perf_rpm/instruments/action_view/action_view_rails_3_0.rb
+- lib/app_perf_rpm/instruments/action_view/action_view_rails_3_1_to_5.rb
+- lib/app_perf_rpm/instruments/action_view/action_view_rails_6.rb
 - lib/app_perf_rpm/instruments/active_model_serializer.rb
 - lib/app_perf_rpm/instruments/active_record.rb
 - lib/app_perf_rpm/instruments/active_record/adapters/mysql2.rb