plain_apm 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9d484b8cae829dc9a8159030fb3075493b7a164fc007c2f7a4688e5f0e7657
-  data.tar.gz: 5c0e75c7ed7c549c13de43d44e8ff3733bda46d38994b77af93d48782a2855a3
+  metadata.gz: 127051af59250da7ce13cfc7c819caff29fb954d20399398e72eaf02ae3fecc4
+  data.tar.gz: 3c3f321becb4e79da27c6a09194c44fc5ec11a73f9e70a9ff55ce7833984fb73
 SHA512:
-  metadata.gz: 74432ea0610f7d525e77aa2173de4adba0f723d713b5870d4a5dfdda1bf3fdb8e812b4b7b08b55d7c3729415d98890d2dd491bb0e94922cb8e8fa6d8a98916a1
-  data.tar.gz: b5d84121648c14f64dbb76c4c7a9e040283465f0d9a9263dcf48292e6c2e3a604714e00a480f323b40fce13e80047890b4c6f7c7b269e0edaac7b3c0645f0fd9
+  metadata.gz: 752b27ebb2ab36147e85af199e939a25a666a738a772077a23ea3033577e966d0afbc773c1bd3f5614c1815deb7ca32395b49628de6b487a4bd214ad96955b27
+  data.tar.gz: 40d0f21220a4e118abcb767951730c743ac89787d9cfa6b2d421cad597c2e38ab5fae56ccc0fb9dd6b707d2344343660680440d6df089241fb2b8e579e0709fb

data/lib/plain_apm/agent.rb

@@ -73,6 +73,7 @@ module PlainApm
         Hooks::ActionView,
         Hooks::ActiveJob,
         Hooks::ActiveRecord,
+        Hooks::ActiveSupport,
         Hooks::ErrorReporter,
         Hooks::Manual
       ].map(&:new).each(&:install)

data/lib/plain_apm/hooks/active_support.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module PlainApm
+  module Hooks
+    class ActiveSupport < ActiveSupportSubscriber
+      NOTIFICATION_PATTERN = /\Acache_[\w\?]+\.active_support\Z/.freeze
+
+      private
+
+      def notification_pattern
+        NOTIFICATION_PATTERN
+      end
+
+      def payload(event)
+        name, source = *event.name.split(".")
+        payload = event.payload
+
+        base = {
+          "source" => source,
+          "name" => name,
+          "backtrace" => filtered_backtrace,
+          "started_at" => event.time,
+          "finished_at" => event.end,
+          "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
+          "store" => payload[:store]
+        }
+
+        case name
+        when "cache_read"
+          base.merge({
+            "key" => payload[:key],
+            "hit" => payload[:hit],
+            "trigger" => payload[:super_operation],
+          })
+        when "cache_read_multi"
+          base.merge({
+            "keys" => payload[:key],
+            "hits" => payload[:hits]
+          })
+        when "cache_fetch_hit"
+          base.merge({
+            "key" => payload[:key],
+            "hit" => true
+          })
+        when "cache_write", "cache_write_multi", "cache_generate", "cache_delete", "cache_delete_matched", "cache_exist?"
+          base.merge({
+            "key" => payload[:key]
+          })
+        when "cache_increment", "cache_decrement"
+          base.merge({
+            "key" => payload[:key],
+            "amount" => payload[:amount]
+          })
+        end
+      end
+    end
+  end
+end

data/lib/plain_apm/hooks/active_support_subscriber.rb

@@ -10,7 +10,7 @@ module PlainApm
           return
         end
 
-        asn = ActiveSupport::Notifications
+        asn = ::ActiveSupport::Notifications
 
         # Rails >= 6.1
         if asn.respond_to?(:monotonic_subscribe)

data/lib/plain_apm/hooks/error_reporter.rb

@@ -17,7 +17,7 @@ module PlainApm
 
         # Install the hook when the app is up. This might miss errors that
         # happen before that, but that's OK.
-        ActiveSupport.on_load(:after_initialize, yield: self, run_once: true) do
+        ::ActiveSupport.on_load(:after_initialize, yield: self, run_once: true) do
           ::Rails.error.subscribe(self)
         end
       end
@@ -36,6 +36,13 @@ module PlainApm
           "context" => context
         }
 
+        if context[:job] && context[:job].is_a?(ActiveJob::Base)
+          event.merge!({
+            "job_class" => context[:job].class.name,
+            "queue_name" => context[:job].queue_name
+          })
+        end
+
         if e.cause
           event.merge!({
             "cause_class" => e.cause.class.name,

data/lib/plain_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainApm
-  VERSION = "0.5.6"
+  VERSION = "0.6.1"
 end

data/lib/plain_apm.rb

@@ -34,6 +34,7 @@ require_relative "plain_apm/hooks/action_pack"
 require_relative "plain_apm/hooks/action_view"
 require_relative "plain_apm/hooks/active_job"
 require_relative "plain_apm/hooks/active_record"
+require_relative "plain_apm/hooks/active_support"
 require_relative "plain_apm/hooks/manual"
 require_relative "plain_apm/hooks/error_reporter"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -114,6 +114,7 @@ files:
 - lib/plain_apm/hooks/action_view.rb
 - lib/plain_apm/hooks/active_job.rb
 - lib/plain_apm/hooks/active_record.rb
+- lib/plain_apm/hooks/active_support.rb
 - lib/plain_apm/hooks/active_support_subscriber.rb
 - lib/plain_apm/hooks/deploy.rb
 - lib/plain_apm/hooks/error_reporter.rb