raygun-apm-rails 1.0.37 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e67b0bcb91d871a5391736b9ce6d957cf024b74b7e107aecdaef46656cc59a0
-  data.tar.gz: 72777711d1ca49c42f1fbdb578f3ba0142fba0fc423df4e2b838de360e56e060
+  metadata.gz: 2dfaff24a1cfbf7086523b4160e290a73940a5bab447f4eef934135eb47bd0fa
+  data.tar.gz: 33324df0e40b95fbd2a9075f629ef8807574a39e9bd6142c04a10e488900803e
 SHA512:
-  metadata.gz: 0a8d7b51f640b98c49a7158296c164de52c91902f55ef513ef28d7f591d37f41472cd99c2a4aebe7652f13707c5a2a313c6df686e70086ed8e841f1cb7e9d327
-  data.tar.gz: 57f3f14013a6014dc86763cd75e8a74e6301d6cfe8bc9a3f9bd5603d511a68b6e79e420b739da68f9ec6e407f6f4a2c2c05e583320ed3ba61fa7a65eaf2b0967
+  metadata.gz: 702ed81b592564035bb2b6ca85fd972dc838070398f2e311c2f25f4f24129fc63c49150e44182b2343fd064945796e9119a2f1840031dd5edaa36c090f2e65ad
+  data.tar.gz: 0ce40e5fa2a9d91ca3a32fee680e1a16baed537ee3ee2a134a5ed0dd404aa5cf706cc71281b43d6f73fefe75c3b17a6f9615893054c43bbdcb4b9f7db5c854b8

data/lib/raygun/apm/rails/middleware.rb

@@ -4,6 +4,7 @@ module Raygun
         class Middleware
           def initialize(app)
             @app = app
+            @mutex = Mutex.new
             @tracer = nil
           end
 
@@ -15,9 +16,14 @@ module Raygun
           private
   
           def instrument(env)
-            res = nil
-            # Can be nil if we had a fatal error
-            @tracer = Raygun::Apm::Tracer.instance || init_tracer
+            # Ignore asset requests
+            if env['REQUEST_PATH'].match(/^\/assets\//)
+              return @app.call(env)
+            end
+            @mutex.synchronize do
+              # Can be nil if we had a fatal error
+              @tracer = Raygun::Apm::Tracer.instance || init_tracer
+            end
             if @tracer
               # For the exceptional HTTP IN handler
               @request_started = @tracer.now
@@ -28,18 +34,9 @@ module Raygun
             Ruby_APM_profiler_trace do
               begin
                 res = @app.call(env)
-                if res && (status = res.first) >= 400 && status < 600
-                  message = Rack::Utils::HTTP_STATUS_CODES[status]
-                  begin
-                    raise "HTTP #{status} #{message}"
-                  rescue => e
-                    crash_report_exception(e)
-                  end
-                  exceptional_http_in_handler(env, status) if @tracer
-                end
               rescue => e
                 crash_report_exception(e)
-                exceptional_http_in_handler(env, 500) if @tracer
+                exceptional_http_in_handler(env) if @tracer
                 exception = e
               end
             end
@@ -82,6 +79,7 @@ module Raygun
             ActiveSupport::Notifications.unsubscribe(@http_in_subscriber)
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
             warn "[Raygun APM] notification hooks unsubscribed"
+            @tracer.end_trace
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = Raygun::Apm::Tracer.instance = nil
             raise(exception) unless (Raygun::Apm::FatalError === exception)
@@ -104,7 +102,7 @@ module Raygun
             event[:pid] = Process.pid
             event[:url] = url
             event[:verb] = verb
-            event[:status] = notification.payload[:status]
+            event[:status] = notification.payload[:status] || notification.payload[:headers]["action_controller.instance"].status
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
             event[:timestamp] = @tracer.now
@@ -116,13 +114,13 @@ module Raygun
           end
 
           # For middleware chain halts that does not trigger 'process_action.action_controller'
-          def exceptional_http_in_handler(env, status)
+          def exceptional_http_in_handler(env)
             req = Rack::Request.new env
             event = http_in_event
             event[:pid] = Process.pid
             event[:url] = req.url
             event[:verb] = req.request_method
-            event[:status] = status
+            event[:status] = 500
             event[:duration] = @tracer.now - @request_started
             event[:timestamp] = @tracer.now
             event[:tid] = @tracer.get_thread_id(Thread.current)

data/lib/raygun/apm/rails/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.0.37"
+      VERSION = "1.0.43"
     end
   end
 end

data/raygun-apm-rails.gemspec

@@ -13,14 +13,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://raygun.com/platform/apm"
   #spec.license       = "MIT"
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files         = Dir['README.rdoc', 'raygun-apm-rails.gemspec', 'lib/**/*', 'bin/**/*']
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "raygun-apm", "~> 1.0.44"
+  spec.add_dependency "raygun-apm", "~> 1.0.53"
   spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.43
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.44
+        version: 1.0.53
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.44
+        version: 1.0.53
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,12 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- CHANGELOG.rdoc
-- Gemfile
-- Gemfile.lock
 - README.rdoc
-- Rakefile
 - bin/console
 - bin/setup
 - lib/raygun/apm/rails.rb
@@ -106,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.gem

data/CHANGELOG.rdoc

@@ -1,88 +0,0 @@
-= Changelog
-
-== 1.0.37 (June 28, 2020)
-
-* Oust Raygun::Apm::Rails::Middleware#Ruby_APM_request_error as the Agent now allows empty body requests for specific error conditions
-
-== 1.0.36 (June 27, 2020)
-
-* Some blacklist cleanups and ambiguity removal
-
-== 1.0.35 (June 27, 2020)
-
-* Whitelist key ActiveStorage APIs
-
-== 1.0.34 (June 17, 2020)
-
-* Align with rubyesque blacklist syntax support from profiler version 1.0.44
-
-== 1.0.33 (June 7, 2020)
-
-* Integrate exception correlation with rayrun4ruby
-
-== 1.0.32 (June 6, 2020)
-
-* Move raygun4ruby whitelisting and blacklisting out to profiler core
-
-== 1.0.31 (May 17, 2020)
-
-* Remove the Tracer#process_started callback (set on begin transaction command now)
-
-== 1.0.30 (May 15, 2020)
-
-* Introduce support for Redis as client adapter
-
-== 1.0.29 (May 3, 2020)
-
-* Blacklist a new set of methods injected at runtime by Rails which leads to messy traces
-
-== 1.0.28 (April 11, 2020)
-
-* Prefer local variables to Rack::Request methods for event value assignment (Rails 4)
-
-== 1.0.27 (April 11, 2020)
-
-* Restore Rails 4 support with caveat that HTTP IN paths are not fully qualified with protocol, host and port
-
-== 1.0.26 (April 11, 2020)
-
-* Remove Rails 4 support (no headers element in the notifications hash for HTTP in)
-
-== 1.0.25 (April 11, 2020)
-
-* Only ever attempt to emit extended events if a tracer instance is alive
-
-== 1.0.24 (April 1, 2020)
-
-* Blacklist Enumeration
-* Unsubscribe from previously registered AS::Notifications subscribers as child processes emit double HTTP IN and SQL events otherwise
-
-== 1.0.23 (March 25, 2020)
-
-* Do not cache PID on HTTP IN and SQL event initializers
-
-== 1.0.22 (March 24, 2020)
-
-* Fix local variable typo in the Rails middleware
-* Blacklist TZInfo
-
-== 1.0.21 (March 19, 2020)
-
-* Further improvements of emitting exceptions and other error status codes for apps with and without raygun4ruby installed
-
-== 1.0.20 (March 18, 2020)
-
-* Introduce support for detecting the presence of raygun4ruby and integrate better with the exception tracker
-
-== 1.0.19 (March 16, 2020)
-
-* Improve trace emission of unhandled exceptions in a request context
-
-== 1.0.18 (March 15, 2020)
-
-* Ensure a better experience with raygun4ruby with only Raygun::track_exception whitelisted
-* Remove the warning on a HTTP IN event with an exception payload - spams STDOUT and already confused some testers
-* Ensure errors raised during request exception always result in a fully wrapped trace with a 500 status
-* Wrap the exceptional HTTP IN error handler in a fake user code method too to get past the agent gate for that
-* Prefer the singleton interface on the Tracer
-* Blacklist HTTParty

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Gemfile.lock

@@ -1,24 +0,0 @@
-PATH
-  remote: .
-  specs:
-    raygun-apm-rails (1.0.37)
-      raygun-apm (~> 1.0.44)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.13.0)
-    rake (10.5.0)
-    raygun-apm (1.0.46-x86-linux)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.1.4)
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  raygun-apm-rails!
-
-BUNDLED WITH
-   2.1.4

data/Rakefile

@@ -1,16 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-require 'rdoc/task'
-
-RDoc::Task.new do |rdoc|
-  rdoc.main = "README.rdoc"
-  rdoc.rdoc_files.include("README.rdoc", "lib/raygun/apm/*.rb", "lib/raygun/apm/rails/*.rb")
-end
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test