raygun-apm 1.0.69-x86-linux → 1.0.70-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8fcd8ffc8006a1bb8ccb5b6874fd4827a1c9c66a259907f0917c9c94c98df1a
-  data.tar.gz: 68e5d34b1e3691c233b1e1b3ddc9f262a0e8d2ac2681ecb025f0c032cf806478
+  metadata.gz: 5e41ca011179dc8a724eef1e9095bc66e75426d3f0cefab3f14cd1492a36f440
+  data.tar.gz: f7203b8535560385785d8dc7cdb5a8149bdcf6dd31f3e22fee03b347242fc66f
 SHA512:
-  metadata.gz: 6c2a79e23b52225950e0dabc8001fb85c89f51ceae385bc222e39990d55052b7b6f7a312f6df84e151043dd8ef5b908fa4b18177dcf6311835e38141bff3b1c8
-  data.tar.gz: 88cdf56989e3c9b3fef4639c60ac73d3f91f07293bc553c9efd200ad9ce2d2a90ba82d8dd027d04e1d0cbda2e3ce13be95bf779e2082321b2f428613a75b386c
+  metadata.gz: 66f62afa1ea7070dae8005ecd4f0bebb59318bceb8686f80c5165bd78e90f2c8e31bebacbd5dcafadc8556983df354854897578fc8877fc341b0a3e1f2d41b1d
+  data.tar.gz: 0d3c2b4d3a465e083a70286001d58c57079eb0f30db38ac48a008d1e904460520c7808b7b4f784eb64825374905c9e9bb4b0f5cb087e8b7228e6f21f1324a3c1

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-linux
 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