raygun-apm-rails 1.0.43 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dfaff24a1cfbf7086523b4160e290a73940a5bab447f4eef934135eb47bd0fa
-  data.tar.gz: 33324df0e40b95fbd2a9075f629ef8807574a39e9bd6142c04a10e488900803e
+  metadata.gz: 6fd600a0cf6ff91eb1811e1e5fc347abdc035f87bd7d56ca637dd26d5713382d
+  data.tar.gz: 72a599e8f61a4a44dea61f7184e2ccaad2c623367544052fc754592baa2d4218
 SHA512:
-  metadata.gz: 702ed81b592564035bb2b6ca85fd972dc838070398f2e311c2f25f4f24129fc63c49150e44182b2343fd064945796e9119a2f1840031dd5edaa36c090f2e65ad
-  data.tar.gz: 0ce40e5fa2a9d91ca3a32fee680e1a16baed537ee3ee2a134a5ed0dd404aa5cf706cc71281b43d6f73fefe75c3b17a6f9615893054c43bbdcb4b9f7db5c854b8
+  metadata.gz: beac4f57fedaa8760d871a589a3e4105a99327cf138c9a5c13047525b58cb7bebfc66cf9c07fa65d36e9c26aabe54f87cc8ece6fa6ea1d9b5816122ca48913fa
+  data.tar.gz: 164a0948df7229af3a2555608328174affac04eca80336e528bfaf5dc102fcc9917023501bf1987bc82c294ed60e0b980cbc093644c8d9de857569fb1bc82a0a

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Raygun Limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -2,6 +2,7 @@ module Raygun
     module Apm
       module Rails
         class Middleware
+          POSTGRESQLSTRING = "postgresql"
           def initialize(app)
             @app = app
             @mutex = Mutex.new
@@ -17,7 +18,7 @@ module Raygun
   
           def instrument(env)
             # Ignore asset requests
-            if env['REQUEST_PATH'].match(/^\/assets\//)
+            if (env['REQUEST_PATH'] || env['REQUEST_URI']).match(/^\/assets\//)
               return @app.call(env)
             end
             @mutex.synchronize do
@@ -35,15 +36,15 @@ module Raygun
               begin
                 res = @app.call(env)
               rescue => e
-                crash_report_exception(e)
+                crash_report_exception(e, env)
                 exceptional_http_in_handler(env) if @tracer
                 exception = e
               end
             end
             # Can be nil if we had a fatal error
             if @tracer
-              @tracer.end_trace
               @tracer.diagnostics if ENV['PROTON_DIAGNOSTICS']
+              @tracer.end_trace
             end
             raise exception if exception
             res
@@ -147,7 +148,7 @@ module Raygun
   
             # XXX this is hacky
             if config = connection.instance_variable_get('@config')
-              event[:provider] = config[:adapter]
+              event[:provider] = get_sql_provider_name(config)
               event[:host] = config[:host]
               event[:database] = config[:database]
             end
@@ -162,6 +163,14 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
+          #This function adjusts the provider name for PostgreSQL to Postgres because all other Raygun profilers use Postgres and this will keep the UI consistent across supported languages
+          def get_sql_provider_name(config)
+            if config[:adapter] == POSTGRESQLSTRING 
+              return "postgres"
+            end
+            config[:adapter]
+          end
+
           def sql_event
             @sql_event ||= Raygun::Apm::Event::Sql.new
           end
@@ -174,9 +183,10 @@ module Raygun
             yield
           end
 
-          def crash_report_exception(exception)
+          def crash_report_exception(exception, env = {})
             if Raygun::Apm::Rails.raygun4ruby?
-              Raygun.track_exception(exception, correlation_id: exception.instance_variable_get(:@__raygun_correlation_id))
+              env.merge!(correlation_id: exception.instance_variable_get(:@__raygun_correlation_id))
+              Raygun.track_exception(exception, env)
             end
           end
 

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

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

data/raygun-apm-rails.gemspec

@@ -6,19 +6,19 @@ require "raygun/apm/rails/version"
 Gem::Specification.new do |spec|
   spec.name          = "raygun-apm-rails"
   spec.version       = Raygun::Apm::Rails::VERSION
-  spec.authors       = ["Raygun", "Erkki Eilonen"]
-  spec.email         = ["support@raygun.com", "info@bearmetal.eu"]
+  spec.authors       = ["Raygun Limited"]
+  spec.email         = ["ruby-apm@raygun.io", "support@raygun.com"]
 
   spec.summary       = %q{Raygun application performance monitoring for Rails}
   spec.homepage      = "https://raygun.com/platform/apm"
-  #spec.license       = "MIT"
+  spec.license       = "MIT"
 
-  spec.files         = Dir['README.rdoc', 'raygun-apm-rails.gemspec', 'lib/**/*', 'bin/**/*']
+  spec.files         = Dir['README.rdoc', 'LICENSE', '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.53"
+  spec.add_dependency "raygun-apm"
   spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.1.1
 platform: ruby
 authors:
-- Raygun
-- Erkki Eilonen
+- Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.53
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.53
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,12 +68,13 @@ dependencies:
         version: '5.0'
 description: 
 email:
+- ruby-apm@raygun.io
 - support@raygun.com
-- info@bearmetal.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.rdoc
 - bin/console
 - bin/setup
@@ -84,7 +84,8 @@ files:
 - lib/raygun/apm/rails/version.rb
 - raygun-apm-rails.gemspec
 homepage: https://raygun.com/platform/apm
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []