raygun-apm 1.0.69-universal-darwin → 1.0.70-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 467cfc5e69c346ccfea0d7b12eb863c98bb5307d4c0d92b5f9622c2d811cd94f
-  data.tar.gz: c0d6e47c0739d233d4b9b0d8bf636e8a6485cb03fa24ebb636af93d8b2eacd65
+  metadata.gz: 5e167305687a418af671c61378fa1e9d40d0a6e127aedd3e5ca3e5bd1a76ff83
+  data.tar.gz: d50c2865b5b1063bbcc0bb1650ae72ae39377eb3017d6df601cbb57d175ae82e
 SHA512:
-  metadata.gz: a320b50e2e8b01bee29a8adae851810dbbb43d09c3d44ea9aed707ef84d4d12c509db3b6b5675bd5de843927f52c72528e56c89a6f281dbb2bedfe994b090e84
-  data.tar.gz: 8f87203a4ee8a05a18ddbd88f26fa60b13d4dd8268ba3df47172fa9ccedb0e5a8b30bc804091b23d8b30423f0a53b7ef50f12fe8440c096f1dd35d2bb3f26ced
+  metadata.gz: dc9dd638e66f1fa4b7e54e889e85b61b82ea23dae655f2c9f49881677fba835d1b9aea21e5d3ddee4bbf6f6f8fa80efc96f8d751f2d663dc246f0729e85717e7
+  data.tar.gz: dea526e88e90b93d6c08b422552c8c5e34a66d5fa9516e2719c82f37d52727437aca9be53116ab52843bfc235d56f55692198ee935d3ce031faafdd2c9ed906f

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: universal-darwin
 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