app_perf_rpm 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885a1e6e276e46db0483fb90e0609f8da8056cdd
-  data.tar.gz: d3f66d03b834f3cd9ecdb65962e645b7a8be6a13
+  metadata.gz: dd7a40e56d4bc00dea5bbf67099f5862b663deb8
+  data.tar.gz: 762bb7394394c6ce50103cb56c88d8f43138d32a
 SHA512:
-  metadata.gz: 8909cc4d1fabc5b1ed3e563c3e56fc98fd6c4d58a12ed9d42dc9ea59c1e5c2d47b6a14379ebe0592505a2dd8e251b135fbe12d61e3cd796d0dfd1b46647c9315
-  data.tar.gz: d9307dc6b1dfe4bd802d42bce75cff3a23c4f50202b272e6df9c6d38d9a27ad74560b443f1070b97718fc6cd70bdd1251bad99a977288f9c2b52b6a87903d7fa
+  metadata.gz: 189ce83378fa35221a932dd21af383028c9ecd2e816adcde76731f79e4997010ee0ea551d0885804eedd127a91942ec5c077f338fa6d39e4bf32f0db44d3cf8a
+  data.tar.gz: b23c2c35e107c08c813ef5397ed4ec9b51a34ee5d90b17f83bde2b524aaaa3bff6bb6ce63b1997ef8173628e5a1c22c8359c2aaee32bf2691087111579a1d7b1

data/lib/app_perf_rpm/configuration.rb

@@ -32,19 +32,20 @@ module AppPerfRpm
         self.agent_disabled ||= default_if_blank(ENV["APP_PERF_AGENT_DISABLED"], false)
         self.ignore_paths ||= /\/assets/
         self.instrumentation = {
-          :rack                 => { :enabled => true, :backtrace => :app, :source => true, :trace_middleware => false },
-          :active_record        => { :enabled => true, :backtrace => :app, :source => true },
-          :active_record_import => { :enabled => true, :backtrace => :app, :source => true },
-          :action_view          => { :enabled => true, :backtrace => :app, :source => true },
-          :action_controller    => { :enabled => true, :backtrace => :app, :source => true },
-          :emque_consuming      => { :enabled => true, :backtrace => :app, :source => true },
-          :redis                => { :enabled => true, :backtrace => :app, :source => true },
-          :sequel               => { :enabled => true, :backtrace => :app, :source => true },
-          :sidekiq              => { :enabled => true, :backtrace => :app, :source => true },
-          :sinatra              => { :enabled => true, :backtrace => :app, :source => true },
-          :net_http             => { :enabled => true, :backtrace => :app, :source => true },
-          :typhoeus             => { :enabled => true, :backtrace => :app, :source => true },
-          :faraday              => { :enabled => true, :backtrace => :app, :source => true }
+          :rack                    => { :enabled => true, :backtrace => :app, :source => true, :trace_middleware => false },
+          :active_record           => { :enabled => true, :backtrace => :app, :source => true },
+          :active_record_import    => { :enabled => true, :backtrace => :app, :source => true },
+          :active_model_serializer => { :enabled => true, :backtrace => :app, :source => true },
+          :action_view             => { :enabled => true, :backtrace => :app, :source => true },
+          :action_controller       => { :enabled => true, :backtrace => :app, :source => true },
+          :emque_consuming         => { :enabled => true, :backtrace => :app, :source => true },
+          :redis                   => { :enabled => true, :backtrace => :app, :source => true },
+          :sequel                  => { :enabled => true, :backtrace => :app, :source => true },
+          :sidekiq                 => { :enabled => true, :backtrace => :app, :source => true },
+          :sinatra                 => { :enabled => true, :backtrace => :app, :source => true },
+          :net_http                => { :enabled => true, :backtrace => :app, :source => true },
+          :typhoeus                => { :enabled => true, :backtrace => :app, :source => true },
+          :faraday                 => { :enabled => true, :backtrace => :app, :source => true }
         }
       end
     end

data/lib/app_perf_rpm/instruments/active_model_serializer.rb

@@ -0,0 +1,35 @@
+if ::AppPerfRpm.config.instrumentation[:action_view][:enabled] &&
+  defined?(::ActiveModel) &&
+  defined?(::ActiveModel::Serializer) &&
+  defined?(::ActiveModel::Serializer::CollectionSerializer) &&
+  defined?(::ActiveModel::Serializer::ArraySerializer)
+  [
+    ::ActiveModel::Serializer,
+    ::ActiveModel::Serializer::CollectionSerializer,
+    ::ActiveModel::Serializer::ArraySerializer
+  ].each do |klass|
+    klass.class_eval do
+      alias :as_json_without_trace :as_json
+      def as_json(*args)
+        if ::AppPerfRpm::Tracer.tracing?
+          span = AppPerfRpm.tracer.start_span("ActiveModel::Serializer", tags: {
+            "serializer" => self.class.to_s
+          })
+          AppPerfRpm::Utils.log_source_and_backtrace(span, :active_model_serializer)
+        end
+
+        as_json_without_trace(*args)
+      rescue Exception => e
+        if span
+          span.set_tag('error', true)
+          span.log_error(e)
+        end
+        raise
+      ensure
+        span.finish if span
+      end
+    end
+  end
+
+  AppPerfRpm.logger.info "Initializing activemodel/serializer tracer."
+end

data/lib/app_perf_rpm/instruments/rack.rb

@@ -90,6 +90,7 @@ if ::AppPerfRpm.config.instrumentation[:rack][:enabled]
           raise
         ensure
           span.finish if span
+          AppPerfRpm::Tracer.sample_off!
         end
 
         def ignore_path?(path)

data/lib/app_perf_rpm/instruments/sidekiq.rb

@@ -28,6 +28,7 @@ module AppPerfRpm
       raise
     ensure
       span.finish if span
+      AppPerfRpm::Tracer.sample_off!
     end
 
     private

data/lib/app_perf_rpm/tracer.rb

@@ -10,7 +10,7 @@ module AppPerfRpm
         # Since we keep track of the active span, meaning we have entered into
         # tracing at some point, and we no longer have an active span,
         # reset tracing.
-        Thread.current[:sample] = false if !AppPerfRpm.tracer.active_span
+        sample_off! if !AppPerfRpm.tracer.active_span
 
         # Now determine if we want to trace, either by an incoming
         # trace or meeting the sample rate.
@@ -18,6 +18,10 @@ module AppPerfRpm
         Thread.current[:sample]
       end
 
+      def sample_off!
+        Thread.current[:sample] = false
+      end
+
       def sampled?
         !!Thread.current[:sample]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_perf_rpm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Randy Girard
@@ -162,6 +162,7 @@ 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/active_model_serializer.rb
 - lib/app_perf_rpm/instruments/active_record.rb
 - lib/app_perf_rpm/instruments/active_record/adapters/mysql2.rb
 - lib/app_perf_rpm/instruments/active_record/adapters/postgresql.rb