raygun-apm 1.0.69-x64-mingw32 → 1.0.70-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f844dbd9c6b712c2fd8c97765a60a217a58150a220ab6521f9f1ca1099c6b3ec
-  data.tar.gz: d1e8343b4c3e483c01c1ca3c66150af815715a6c3c168d51ebec0a2bf63fb4c3
+  metadata.gz: 40a56168723e4666502c3e22514a0dba97cd26557e33d79579434c1f0ebb78c6
+  data.tar.gz: 86a86fb6d57182f5afa0e7b4b91e376fcc31653497ee779084aa4b8553a7e8e8
 SHA512:
-  metadata.gz: 361cf026c3a67c77939e315fea526c2a4eef35851520efdd8e4f429c5db8cfbe9c9c61b76a40fda7cb6eb5564b5c03420051b566f03bc4d3a42765f71ec0d46f
-  data.tar.gz: ee699b17b00ba5ccc9e3d129e2879571904c9b60225fd70bc89895720c22e6f04c2fed4cce7543e3f5de0ae06c2ca3d4fca924b9ce0b31f14501c6f19660e44c
+  metadata.gz: 637eeb5a2e852a57e93d9b6480b2004a78a6abf70566a1883ae8ee48a65286c8c8e66fcb77056e323e9e2d19ba18903fff72061fae3f7ea06cc127f5fb1b8f8c
+  data.tar.gz: b2e1cd85a1a4eb4bc3741b376b04520b2db89e9c29918ce70be3f0f6e935e1650d434905544f8bc5f083b72a83a1a7fb837117c4f48bddd6574fd4e72378139c

data/lib/raygun/apm/config.rb

@@ -18,6 +18,9 @@ module Raygun
         "production" => Tracer::ENV_PRODUCTION
       }
 
+      DEFAULT_BLACKLIST_PATH_UNIX = "/usr/share/Raygun/Blacklist"
+      DEFAULT_BLACKLIST_PATH_WINDOWS = "C:\\ProgramData\\Raygun\\Blacklist"
+
       attr_accessor :env
       def initialize(env=ENV)
         @env = env
@@ -82,6 +85,13 @@ module Raygun
         environment = env['RACK_ENV'] || env['RAILS_ENV'] || 'production'
         ENVIRONMENTS[environment] || Tracer::ENV_PRODUCTION
       end
+
+      # Prefer what is set by PROTON_USER_OVERRIDES_FILE env
+      def blacklist_file
+        return proton_user_overrides_file if proton_user_overrides_file
+        path = Gem.win_platform? ? DEFAULT_BLACKLIST_PATH_WINDOWS : DEFAULT_BLACKLIST_PATH_UNIX
+        "#{File.join(path, proton_api_key)}.txt"
+      end
     end
   end
 end

data/lib/raygun/apm/tracer.rb

@@ -57,15 +57,16 @@ module Raygun
 
       def initialize_blacklist
         @blacklist_parser = Raygun::Apm::Blacklist::Parser.new(self)
-        @blacklist = if @config.proton_user_overrides_file && File.exists?(@config.proton_user_overrides_file)
-          File.readlines(@config.proton_user_overrides_file)
+        file = @config.blacklist_file
+        @blacklist = if file && File.exist?(file)
+          File.readlines(file)
         else
           []
         end
-        # From file
-        @blacklist_parser.add_filters @blacklist
         # Defaults
         @blacklist_parser.add_filters Raygun::Apm::Blacklist.resolve_entries
+        # From file
+        @blacklist_parser.add_filters @blacklist
       end
 
       def register_known_library_paths

data/lib/raygun/apm/version.rb

@@ -1,6 +1,6 @@
 module Raygun
   module Apm
-    VERSION = "1.0.69"
+    VERSION = "1.0.70"
     MINIMUM_AGENT_VERSION = "1.0.1190.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.69
+  version: 1.0.70
 platform: x64-mingw32
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source