raygun-apm 1.0.69-x86-mingw32 → 1.0.70-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38aef88ce7a02a1b3b42f202a320444adc08a8a283f41d95ae866ba9e985f6e
-  data.tar.gz: dcb7d7689816428a0a4208f93a149c15bb6c9788dc405fbd341ce47077d583fc
+  metadata.gz: 172e028274817e42e8d7ca65401a0757f8c530d773a0953e5cf40d02819627c7
+  data.tar.gz: 4029b4e6e27dfe61c4a700b03b84909bd0c013f441a20122ca6b977b4b9fb74f
 SHA512:
-  metadata.gz: d104377d1f5fac31e8311edbed4296dee47eb31773901ba94a8f77ad6edf4f047f9a67cdb660ab8c6fc010222f7c0b0a9037fa9facd1f538e4c534c2e88eb284
-  data.tar.gz: dfb10bdb0b8f7fe6a2b538e33159f2ac5e21341cbd1f41c0c07a9b8f72dd5ce3e37809a1f0eefa6c28a9e9024bf895ba71868f3f8b4d320441c0d5d355628427
+  metadata.gz: 99ef3ff3727f830ff2c5b2147d8642c73fc12cdfeacbf89f3e03794f1af78aaf5c99a7ec5ea27f0e342f552043cc0331d54b1c2afb420860491a9ddc5f1a1dbf
+  data.tar.gz: cafec25dde7ee42eb05084b0e9e0f8ddbfec3f0c5d224860c02be23b873776e885499a30ad3b3411f81c9a954ab359cef9869ae0997ec84dcbd8c0939dae05e7

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: x86-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