plain_apm 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01732eb28831a79bda84629911827630f98d10e7650de6c19c99c652e86c7841
-  data.tar.gz: b6823be6751d685b6b3d8669d6eba23581586bcbfe1957a5d0b169bacea130b3
+  metadata.gz: 73fd2b68ac333b85c9447cf1bfab720a5c292a325dc13eb4ba5775c2381aa9b3
+  data.tar.gz: 3cdd0a76f806988f0687e121087837fdf91d4743858c322a8e18501908434a5f
 SHA512:
-  metadata.gz: d1167958c799e9df78f1d906773cba2b63a17f07ed7a4412bbc27f4aaf65a594868cc76dde86e704311d312efb3ee4b68338ca8c4ee107e2a96a00a445ece115
-  data.tar.gz: '0857d37547502f6db950edbde4d1b3c10855cfaaa02bab04c17e2cde9a904f2f9df4bb22e85fb0a23aef8b52925df98e1a9eef88a86d7b9ce761005b12fe874f'
+  metadata.gz: b6de14e0c3e97da869110bf7e56daac8c7b25beeb54c862c33a99f98007d887964eaa4e435d284ecb095c972d2be028905235429ab20d02074872600545ecf8d
+  data.tar.gz: dc49c1a0d76013fe00dd66b12db07558fc86b06904846d7b138ab79721d1ccc5925af4da72d009140d98d8f4ad2569cb3f41ee038dc0d5292d79efa5d4038fb0

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

@@ -4,6 +4,12 @@ module PlainApm
   module Extensions
     module Exceptions
       class Rack
+        # FIXME: This is duplicated for ErrorReporter
+        IGNORED_EXCEPTIONS = [
+          "Sidekiq::JobRetry::Skip",          # Sidekiq uses exceptions for control flow.
+          "ActionController::RoutingError"    # Rails unmapped route, raised before the request hits the app.
+        ].freeze
+
         def initialize(app)
           @app = app
         end
@@ -23,6 +29,8 @@ module PlainApm
         private
 
         def report_exception(e, env)
+          return if IGNORED_EXCEPTIONS.include?(e.class.name)
+
           event = {
             "source" => "rack_exceptions",
             "name" => "exception",
@@ -32,6 +40,14 @@ module PlainApm
             "params" => env["action_dispatch.request.parameters"]
           }
 
+          if e.cause
+            event.merge!({
+              "cause_class" => e.cause.class.name,
+              "cause_message" => e.cause.message,
+              "cause_backtrace" => e.cause.backtrace
+            })
+          end
+
           PlainApm::Agent.collect(event)
         end
       end

data/lib/plain_apm/hooks/deploy.rb

@@ -34,17 +34,25 @@ module PlainApm
       #
       # Also, we might not be in the app root.
       def git_revision
-        return nil unless File.exist?(".git")
+        return unless File.exist?(".git")
 
-        ["git", `git rev-parse --short HEAD`.strip]
+        rev = `git rev-parse --short=8 HEAD`.strip
+
+        return if rev.empty?
+
+        ["git", rev]
       rescue Error::ENOENT # No git installed
         nil
       end
 
       def hg_revision
-        return nil unless File.exist?(".hg")
+        return unless File.exist?(".hg")
+
+        rev = `hg log -l 1 -r . -T '{node}'`.strip
+
+        return if rev.empty?
 
-        ["hg", `hg log -l 1 -r . -T '{node}'`]
+        ["hg", rev]
       rescue Error::ENOENT # No mercurial installed
         nil
       end

data/lib/plain_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest