plain_apm 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879ff27ef73e4399d72ad122f873b1c7330bab98e2b239a990874f929bb9bc52
-  data.tar.gz: ad80bd5875bf2773cbbb82e233349ee79292095aa7c472d5280642517b9deae1
+  metadata.gz: da1f9aa5f6ef59cc4dfafb04888453d4bb1b498f4a741812ff3da2024b948980
+  data.tar.gz: 8e103d3aadd8ccca146f6783739ea2b3d7303b3bec82f433567af73a447074f5
 SHA512:
-  metadata.gz: 32e1d94aea4a68fea4a4c20a00d0b38b00c386933610a8c88f7654279491327c89849ed8900f41fc1ea85f9482c6aeaa9934fe89ed2ebaf622a67073fc4cd84a
-  data.tar.gz: 1126345cfb64fc29afaa06229eb5c411343116b4b91c0038e782a54bf04d64102e236bcee4ee235a144fb5d768692be869b5140ad7e9c2795c3833b8d99e0c4f
+  metadata.gz: 440081dc334c342649b6375b857c129d4e47c8bbd47fb2d60b199c58f1156dcc2539593305e509de5a9bbe6ad48d9a07bb645b61cc8ad7a8380fc4e1f4181dad
+  data.tar.gz: 9569d0b13c04e3c1630bd00f1af3f68d0573a798c82a2d6643585da7baf9a69c8b5376d6e72f34750c07cda4ebb2607fe955ff4873d8264c080454447d6e8795

data/lib/plain_apm/hooks/action_mailer.rb

@@ -12,19 +12,9 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         payload = event.payload
 
-        base = {
-          "source" => source,
-          "name" => name,
-          "backtrace" => filtered_backtrace,
-          "allocations" => event.allocations,
-          "thread_allocations" => event.thread_allocations,
-          "started_at" => event.time,
-          "finished_at" => event.end
-        }
-
         case name
         when "deliver"
           base.merge({

data/lib/plain_apm/hooks/action_pack.rb

@@ -12,19 +12,9 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         payload = event.payload
 
-        base = {
-          "source" => source,
-          "name" => name,
-          "backtrace" => filtered_backtrace,
-          "allocations" => event.allocations,
-          "thread_allocations" => event.thread_allocations,
-          "started_at" => event.time,
-          "finished_at" => event.end
-        }
-
         case name
         when "process_action"
           base.merge({

data/lib/plain_apm/hooks/action_view.rb

@@ -12,19 +12,9 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         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
-        }
-
         case name
         when "render_collection"
           base.merge({

data/lib/plain_apm/hooks/active_job.rb

@@ -12,18 +12,11 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         payload = event.payload
         job = payload[:job]
 
-        base = {
-          "source" => source,
-          "name" => name,
-          "backtrace" => filtered_backtrace,
-          "started_at" => event.time,
-          "finished_at" => event.end,
-          "allocations" => event.allocations,
-          "thread_allocations" => event.thread_allocations,
+        base.merge!({
           "queue_name" => job.queue_name,
           "job_id" => job.job_id,
           "job_class" => job.class.name,
@@ -34,7 +27,7 @@ module PlainApm
           "scheduled_at" => job.scheduled_at,
           "adapter" => payload[:adapter].class.name,
           "aborted" => payload[:aborted]
-        }
+        })
 
         case name
         when "enqueue", "enqueue_at", "perform"

data/lib/plain_apm/hooks/active_record.rb

@@ -6,6 +6,7 @@ module PlainApm
   module Hooks
     class ActiveRecord < ActiveSupportSubscriber
       NOTIFICATION_PATTERN = /\A[^!]\w+\.active_record\Z/.freeze
+      IGNORED_SQL_NAMES = %w(SCHEMA CACHE).freeze
 
       private
 
@@ -14,25 +15,14 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         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
-        }
+        return if IGNORED_SQL_NAMES.include?(payload[:name])
 
         case name
         when "sql"
-          base.merge({
-            "sql_name" => payload[:name],
-            "sql" => payload[:sql]
-          })
+          base.merge({ "sql" => payload[:sql] })
         end
       end
     end

data/lib/plain_apm/hooks/active_support.rb

@@ -12,19 +12,10 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
         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]
-        }
+        base.merge!({ "store" => payload[:store] })
 
         case name
         when "cache_read"

data/lib/plain_apm/hooks/active_support_subscriber.rb

@@ -39,6 +39,24 @@ module PlainApm
         raise "Not implemented"
       end
 
+      def common_attributes(event)
+        name, source = *event.name.split(".")
+        bt = filtered_backtrace
+
+        attrs = {
+          "source" => source,
+          "name" => name,
+          "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
+          "started_at" => event.time,
+          "finished_at" => event.end
+        }
+
+        attrs.merge!("backtrace" => bt) if bt && !bt.empty?
+
+        [name, attrs]
+      end
+
       def filtered_backtrace
         if defined?(Rails) && defined?(Rails::BacktraceCleaner)
           @cleaner ||= Rails::BacktraceCleaner.new

data/lib/plain_apm/hooks/manual.rb

@@ -12,19 +12,14 @@ module PlainApm
       end
 
       def payload(event)
-        name, source = *event.name.split(".")
+        name, base = common_attributes(event)
 
-        {
-          "source" => "plain_apm",
+        base.merge({
+          "source" => "user",
           "name" => "manual",
-          "backtrace" => filtered_backtrace,
-          "started_at" => event.time,
-          "finished_at" => event.end,
-          "allocations" => event.allocations,
-          "thread_allocations" => event.thread_allocations,
           "payload_name" => name,
           "payload" => event.payload
-        }
+        })
       end
     end
   end

data/lib/plain_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest