plain_apm 0.9.7 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa551d3d06407550f5b0dcdb0290d00044097193060a3652314835d77de94880
-  data.tar.gz: 1f6240ab1462eecbbb9ddf83378a7eb02dc13d3e4daf9008150f94d5a312ae28
+  metadata.gz: f234cdb0d7afa540ac0ae06405ca89a2476bf4e18a44062aebe6fda4868b8b63
+  data.tar.gz: 1c3b2039cd4ce11b9d26d23a1dda6c9fba208fb2e3e8c50bccb0947e1f0161da
 SHA512:
-  metadata.gz: ee98c2b0f5d46042248423b8e3b8c57eeab8144ce3417b94483b63a03bc7fad694ce7cd4ee125f726a678a932a90311dbce7b39173fa458769a07d3c1ebe48f9
-  data.tar.gz: dbcdf5c2b5faf4bdd7e7b2c8a268b09cf726455b853d650d0e04717f0a90d519412c93da0e534448e8590e5a3e817208a893eb414a95a6013441ea3096ff6214
+  metadata.gz: 7695a907666719056596c427615ca736b39e19a09ee5de97d6999eaec49a55b0a41853e6796076e5acc5e6433f3b8378cab802eadd682b27070b7e3bfe260a51
+  data.tar.gz: d2ce1c8a4e12681f661c3b09307a32211cfcb3e65d449bb00f90b995bdb5ed4d9726db2edc6722e1d4a9c97a2035d3b6cc1f75d3e1767bf6f0baacdcfba71a36

data/lib/plain_apm/config.rb

@@ -19,11 +19,11 @@ module PlainApm
     end
 
     def key_present?
-      ENV["PLAIN_APM_APP_KEY"] != ""
+      ENV["PLAIN_APM_APP_KEY"].to_s != ""
     end
 
     def production?
-      (ENV["RAILS_ENV"] || ENV["RACK_ENV"]) == "production"
+      (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"]) == "production"
     end
 
     def interactive?

data/lib/plain_apm/deploy_tracking.rb

@@ -16,7 +16,7 @@ module PlainApm
       end
 
       def heroku_revision
-        rev = ENV["HEROKU_SLUG_COMMIT"].to_s[0..8]
+        rev = ENV.fetch("GIT_REV", ENV.fetch("HEROKU_SLUG_COMMIT", ""))[0...8]
         rev if !rev.empty?
       end
 

data/lib/plain_apm/event_attributes.rb

@@ -17,9 +17,9 @@ module PlainApm
     ].freeze
 
     def attributes_from_exception(e, context, error_source)
-      source = "exception"
+      name = "exception"
 
-      return [source, nil] if IGNORED_EXCEPTIONS.include?(e.class.name)
+      return [name, nil] if IGNORED_EXCEPTIONS.include?(e.class.name)
 
       attrs = context_attributes
 
@@ -31,8 +31,8 @@ module PlainApm
         attrs[:event_source] = error_source
       end
 
-      if context[:env]
-        attrs[:params] = context[:env]["action_dispatch.request.parameters"]
+      if context[:controller]&.is_a?(ActionController::Base)
+        attrs[:controller] = context[:controller].class.name
       end
 
       if context[:job]&.is_a?(ActiveJob::Base)
@@ -40,6 +40,12 @@ module PlainApm
         attrs[:queue_name] = context[:job].queue_name
       end
 
+      if context[:env]
+        attrs[:params] = context.dig(:env, "action_dispatch.request.parameters")
+        attrs[:action] = context.dig(:env, "action_dispatch.request.parameters", :action)
+        attrs[:controller] = context.dig(:env, "action_controller.instance")&.class.name
+      end
+
       # https://bugs.ruby-lang.org/issues/19197
       root_cause = e
       root_cause = root_cause.cause while root_cause.cause
@@ -61,7 +67,7 @@ module PlainApm
 
       add_trace_attributes(attrs)
 
-      [source, attrs]
+      [name, attrs]
     end
 
     def attributes_from_notification(event)
@@ -73,9 +79,22 @@ module PlainApm
       attrs[:source] = source
       attrs[:name] = name
       attrs[:allocations] = event.allocations
+      attrs[:thread_cpu_time] = event.cpu_time
       attrs[:event_time] = event.time
       attrs[:duration] = event.duration
 
+      if event.respond_to?(:gc_time)
+        attrs[:gc_time] = event.gc_time
+      end
+
+      if event.respond_to?(:gc_major_count)
+        attrs[:gc_major_count] = event.gc_major_count
+      end
+
+      if event.respond_to?(:gc_minor_count)
+        attrs[:gc_minor_count] = event.gc_minor_count
+      end
+
       if event.respond_to?(:thread_allocations)
         attrs[:thread_allocations] = event.thread_allocations
       end

data/lib/plain_apm/extensions/active_support/event.rb

@@ -0,0 +1,77 @@
+module PlainApm
+  module Extensions
+    module ActiveSupport
+      module Event
+        def start!
+          super
+          @thread_allocation_count_start = now_thread_allocations
+          @gc_time_start = now_gc_time
+          @gc_major_count_start = now_gc_major_count
+          @gc_minor_count_start = now_gc_minor_count
+        end
+
+        def finish!
+          super
+          @thread_allocation_count_finish = now_thread_allocations
+          @gc_time_finish = now_gc_time
+          @gc_major_count_finish = now_gc_major_count
+          @gc_minor_count_finish = now_gc_minor_count
+        end
+
+        def thread_allocations
+          @thread_allocation_count_finish - @thread_allocation_count_start
+        end
+
+        def gc_time
+          @gc_time_finish - @gc_time_start
+        end
+
+        def gc_major_count
+          @gc_major_count_finish - @gc_major_count_start
+        end
+
+        def gc_minor_count
+          @gc_minor_count_finish - @gc_minor_count_start
+        end
+
+        private
+
+        # Per thread GC counter
+        def now_thread_allocations
+          PlainApm::ObjectTracing.total_thread_allocated_objects
+        end
+
+        if GC.stat.key?(:major_gc_count)
+          def now_gc_major_count
+            GC.stat(:major_gc_count)
+          end
+        else
+          def now_gc_major_count
+            0
+          end
+        end
+
+        if GC.stat.key?(:minor_gc_count)
+          def now_gc_minor_count
+            GC.stat(:minor_gc_count)
+          end
+        else
+          def now_gc_minor_count
+            0
+          end
+        end
+
+        # Time in ms spent in GC
+        if GC.stat.key?(:time)
+          def now_gc_time
+            GC.stat(:time)
+          end
+        else
+          def now_gc_time
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plain_apm/extensions/active_support/railtie.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module PlainApm
+  module Extensions
+    module ActiveSupport
+      class Railtie < Rails::Railtie
+        initializer(:plain_apm_thread_allocations, after: :plain_apm_agent_start) do
+          next if !PlainApm.agent.enabled?
+
+          require "object_tracing"
+
+          ::ActiveSupport::Notifications::Event.prepend(
+            PlainApm::Extensions::ActiveSupport::Event
+          )
+        end
+      end
+    end
+  end
+end

data/lib/plain_apm/extensions/active_support.rb

@@ -0,0 +1,2 @@
+require_relative "active_support/event"
+require_relative "active_support/railtie" if defined?(Rails::Railtie)

data/lib/plain_apm/extensions/context/railtie.rb

@@ -14,7 +14,7 @@ module PlainApm
         initializer(:plain_apm_thread_context, after: :plain_apm_agent_start) do |app|
           next if !PlainApm.agent.enabled?
 
-          ActiveSupport.on_load(:active_job, run_once: true) do |klass|
+          ::ActiveSupport.on_load(:active_job, run_once: true) do |klass|
             klass.prepend(PlainApm::Extensions::Context::ActiveJob)
           end
 

data/lib/plain_apm/extensions/exceptions/rack.rb

@@ -25,12 +25,12 @@ module PlainApm
         private
 
         def report_exception(e, env)
-          source, event = attributes_from_exception(e, {env: env}, nil)
+          name, event = attributes_from_exception(e, {env: env}, nil)
 
           return if event.nil?
 
-          event[:source] = source
-          event[:name] = "rack_middleware"
+          event[:source] = "rack_middleware"
+          event[:name] = name
 
           PlainApm.agent.collect(event)
         end

data/lib/plain_apm/hooks/active_record.rb

@@ -25,6 +25,7 @@ module PlainApm
           base.tap do |o|
             o[:sql] = payload[:sql]
             o[:sql_name] = payload[:name]
+            o[:async] = payload[:async]
           end
         when "instantiation"
           base.tap do |o|

data/lib/plain_apm/hooks/error_reporter.rb

@@ -23,12 +23,12 @@ module PlainApm
       end
 
       def collect(e, handled:, severity:, context: {}, source: nil)
-        event_source, event = attributes_from_exception(e, context, source)
+        name, event = attributes_from_exception(e, context, source)
 
         return if event.nil?
 
-        event[:source] = event_source
-        event[:name] = "error_reporter"
+        event[:source] = "error_reporter"
+        event[:name] = name
 
         ::PlainApm.agent.collect(event)
       end

data/lib/plain_apm/transport.rb

@@ -92,7 +92,7 @@ module PlainApm
 
       {
         "Content-Type" => "application/json, charset=UTF-8",
-        "Content-Encoding" => "gzip",
+        "Content-Encoding" => "deflate",
         "X-PlainApm-Key" => app_key
       }.merge(meta_headers)
     end

data/lib/plain_apm/version.rb

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

data/lib/plain_apm.rb

@@ -24,8 +24,8 @@ require_relative "plain_apm/extensions/context"
 # Rack exceptions. Activate the middleware if in Rails.
 require_relative "plain_apm/extensions/exceptions"
 
-# Per thread allocations in ASN events
-require_relative "plain_apm/extensions/thread_allocations"
+# Extra stats in ASN events
+require_relative "plain_apm/extensions/active_support"
 
 # Rails instrumentation. The hooks won't install unless
 # ActiveSupport::Notifications is loaded.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -101,6 +101,9 @@ files:
 - lib/plain_apm/config.rb
 - lib/plain_apm/deploy_tracking.rb
 - lib/plain_apm/event_attributes.rb
+- lib/plain_apm/extensions/active_support.rb
+- lib/plain_apm/extensions/active_support/event.rb
+- lib/plain_apm/extensions/active_support/railtie.rb
 - lib/plain_apm/extensions/context.rb
 - lib/plain_apm/extensions/context/LICENSE.txt
 - lib/plain_apm/extensions/context/active_job.rb
@@ -108,12 +111,8 @@ files:
 - lib/plain_apm/extensions/context/rack.rb
 - lib/plain_apm/extensions/context/railtie.rb
 - lib/plain_apm/extensions/exceptions.rb
-- lib/plain_apm/extensions/exceptions/active_job.rb
 - lib/plain_apm/extensions/exceptions/rack.rb
 - lib/plain_apm/extensions/exceptions/railtie.rb
-- lib/plain_apm/extensions/thread_allocations.rb
-- lib/plain_apm/extensions/thread_allocations/active_support_event.rb
-- lib/plain_apm/extensions/thread_allocations/railtie.rb
 - lib/plain_apm/helpers.rb
 - lib/plain_apm/hooks/action_mailer.rb
 - lib/plain_apm/hooks/action_pack.rb

data/lib/plain_apm/extensions/exceptions/active_job.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module PlainApm
-  module Extensions
-    module TraceId
-      module ActiveJob
-        attr_accessor :trace_id
-
-        def initialize(*arguments)
-          super(*arguments)
-
-          # Either from request headers / a previous job, or a new trace.
-          @trace_id = PlainApm::Extensions::TraceId.current || SecureRandom.uuid
-        end
-
-        def serialize
-          super.update("trace_id" => trace_id)
-        end
-
-        def deserialize(job)
-          PlainApm::Extensions::TraceId.current = job["trace_id"]
-
-          super(job)
-        end
-      end
-
-      ##
-      # Allow tracing request ID through jobs
-      ActiveSupport.on_load(:active_job, run_once: true) do |klass|
-        klass.prepend(ActiveJob)
-      end
-    end
-  end
-end

data/lib/plain_apm/extensions/thread_allocations/active_support_event.rb

@@ -1,25 +0,0 @@
-module PlainApm
-  module Extensions
-    module ThreadAllocations
-      module ActiveSupportEvent
-        def start!
-          super
-          @thread_allocation_count_start = now_thread_allocations
-        end
-
-        def finish!
-          super
-          @thread_allocation_count_finish = now_thread_allocations
-        end
-
-        def thread_allocations
-          @thread_allocation_count_finish - @thread_allocation_count_start
-        end
-
-        def now_thread_allocations
-          PlainApm::ObjectTracing.total_thread_allocated_objects
-        end
-      end
-    end
-  end
-end

data/lib/plain_apm/extensions/thread_allocations/railtie.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module PlainApm
-  module Extensions
-    module ThreadAllocations
-      class Railtie < Rails::Railtie
-        initializer(:plain_apm_thread_allocationss, after: :plain_apm_agent_start) do
-          next if !PlainApm.agent.enabled?
-
-          require "object_tracing"
-
-          ActiveSupport::Notifications::Event.prepend(
-            PlainApm::Extensions::ThreadAllocations::ActiveSupportEvent
-          )
-        end
-      end
-    end
-  end
-end

data/lib/plain_apm/extensions/thread_allocations.rb

@@ -1,2 +0,0 @@
-require_relative "thread_allocations/active_support_event"
-require_relative "thread_allocations/railtie" if defined?(Rails::Railtie)