plain_apm 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97309c08d5896a6a0895f5d30197f0f8e2514af8f3da6e5d33e67f4e6e69b81c
-  data.tar.gz: 1d33ae2fdcfdb10af6be0f083c5ff73d3a48ecf75d8ed6af0155172fad002b7d
+  metadata.gz: d86c0595be8ac7a6b538a81136b6c5c17baa0d32c975cd51866f189d0b19f6ca
+  data.tar.gz: e28e7b234659abaa0e0659f7b55dc5acdaa561ecafbdddb65b403eb392411363
 SHA512:
-  metadata.gz: 5f06b1daa81825e5ebae65154cb747b1bd040c72113e252427d6949db1e69c14c2cf7bb3abfc281a81245591821be1aeeb838519ca937e2214259e65d66d5fed
-  data.tar.gz: 80cf433e7853ec654c7a127705c6a5d68c8a366cc3e0b542f4343279f343517a5d0e5a410233a55ec8bff4dba0a138c4c08b02f1b873b3f0fc9a046390013497
+  metadata.gz: 32422cfac6f7d9bd3fc73c5720be2e6ec0f85c34c5c4a1a6b4b073cd203fc387c472b1c9a17ae217a4fa0046665dcf73835ec0c9ae92a523bab6a162190a48df
+  data.tar.gz: 30181e92f6df8e2717f6a0265504ccf5db16eb34c0c6d061b7682e437434b4338edf145f9d8dd8a334f6528a13d5fdc175c14c3c1798c42730ca204800b27603

data/lib/plain_apm/event_attributes.rb

@@ -31,7 +31,7 @@ module PlainApm
       [tool, attrs]
     end
 
-    def attributes_from_exception(e, context)
+    def attributes_from_exception(e, context, error_source)
       source = "exception"
 
       return [source, nil] if IGNORED_EXCEPTIONS.include?(e.class.name)
@@ -42,6 +42,10 @@ module PlainApm
         "backtrace" => e.backtrace
       }
 
+      if error_source
+        attrs["event_source"] = error_source
+      end
+
       if context[:env]
         attrs["params"] = context[:env]["action_dispatch.request.parameters"]
       end
@@ -114,7 +118,7 @@ module PlainApm
       # or is generated by the trace_id middleware).
       # It can also carry user inserted app data.
       if defined?(PlainApm::Extensions::Context)
-        PlainApm::Extensions::Context.current
+        PlainApm::Extensions::Context.current.transform_keys(&:to_s)
       else
         {}
       end

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

@@ -12,7 +12,7 @@ module PlainApm
         def serialize
           trace_id = PlainApm::Extensions::Context.trace_id || SecureRandom.uuid
           # Rails wasn't preserving the nano-time, this has now been fixed
-          # upstream in #39698 and scheduled for Rails 7.1.
+          # upstream in #39698 and fixed in Rails 7.1.
           super.update("trace_id" => trace_id, "enqueued_at" => Time.now.utc.iso8601(9))
         end
 

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

@@ -22,12 +22,12 @@ module PlainApm
           status, headers, body = @app.call(env)
 
           body = if defined?(::Rack::BodyProxy)
-                   ::Rack::BodyProxy.new(body) do
-                     Context.clear!
-                   end
-                 else
-                   body
-                 end
+            ::Rack::BodyProxy.new(body) do
+              Context.clear!
+            end
+          else
+            body
+          end
 
           processed = true
 

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

@@ -6,6 +6,13 @@
 # https://github.com/steveklabnik/request_store/
 #
 # See LICENSE.txt in the current directory for the license.
+
+begin
+  require "rails/railtie"
+rescue LoadError
+  nil
+end
+
 module PlainApm
   module Extensions
     module Context

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

@@ -25,7 +25,7 @@ module PlainApm
         private
 
         def report_exception(e, env)
-          source, event = attributes_from_exception(e, {env: env})
+          source, event = attributes_from_exception(e, {env: env}, nil)
 
           return if event.nil?
 

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

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+begin
+  require "rails/railtie"
+rescue LoadError
+  nil
+end
+
 module PlainApm
   module Extensions
     module Exceptions

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

@@ -1,3 +1,11 @@
+# frozen_string_literal: true
+
+begin
+  require "rails/railtie"
+rescue LoadError
+  nil
+end
+
 module PlainApm
   module Extensions
     module ThreadAllocations

data/lib/plain_apm/hooks/active_job.rb

@@ -49,11 +49,19 @@ module PlainApm
       private
 
       def enqueued_at(job)
-        Time.parse(job.enqueued_at).to_f if job.enqueued_at
+        if job.enqueued_at
+          if job.enqueued_at.is_a?(Time)
+            job.enqueued_at.iso8601(9)
+          else
+            Time.parse(job.enqueued_at).iso8601(9)
+          end
+        end
       end
 
       def dequeued_at(job)
-        Time.parse(job.dequeued_at).to_f if job.respond_to?(:dequeued_at) && job.dequeued_at
+        if job.respond_to?(:dequeued_at) && job.dequeued_at
+          Time.parse(job.dequeued_at).iso8601(9)
+        end
       end
     end
   end

data/lib/plain_apm/hooks/active_support_subscriber.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+begin
+  require "active_support"
+  require "active_support/notifications"
+rescue LoadError
+  nil
+end
+
 module PlainApm
   module Hooks
     class ActiveSupportSubscriber

data/lib/plain_apm/hooks/error_reporter.rb

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

data/lib/plain_apm/version.rb

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

data/lib/plain_apm.rb

@@ -51,6 +51,12 @@ module PlainApm
     @@agent ||= Agent.instance
   end
 
+  begin
+    require "rails/railtie"
+  rescue LoadError
+    nil
+  end
+
   # after_initialize allows reading settings from ENV on app start.
   if defined?(Rails::Railtie)
     class Railtie < Rails::Railtie

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest