airbrake-ruby 4.9.0 → 4.10.0

data/lib/airbrake-ruby/query.rb

@@ -44,7 +44,7 @@ module Airbrake
         'time' => @start_time_utc,
         'function' => func,
         'file' => file,
-        'line' => line
+        'line' => line,
       }.delete_if { |_key, val| val.nil? }
     end
     # rubocop:enable Metrics/ParameterLists, Metrics/BlockLength

data/lib/airbrake-ruby/queue.rb

@@ -33,14 +33,14 @@ module Airbrake
       {
         'queue' => queue,
         'errorCount' => error_count,
-        'time' => @start_time_utc
+        'time' => @start_time_utc,
       }
     end
 
     def hash
       {
         'queue' => queue,
-        'time' => @start_time_utc
+        'time' => @start_time_utc,
       }.hash
     end
 

data/lib/airbrake-ruby/request.rb

@@ -36,7 +36,7 @@ module Airbrake
         'method' => method,
         'route' => route,
         'statusCode' => status_code,
-        'time' => @start_time_utc
+        'time' => @start_time_utc,
       }.delete_if { |_key, val| val.nil? }
     end
   end

data/lib/airbrake-ruby/stat.rb

@@ -32,7 +32,7 @@ module Airbrake
         'count' => count,
         'sum' => sum,
         'sumsq' => sumsq,
-        'tdigest' => Base64.strict_encode64(tdigest.as_small_bytes)
+        'tdigest' => Base64.strict_encode64(tdigest.as_small_bytes),
       }
     end
 

data/lib/airbrake-ruby/version.rb

@@ -2,5 +2,5 @@
 # More information: http://semver.org/
 module Airbrake
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '4.9.0'.freeze
+  AIRBRAKE_RUBY_VERSION = '4.10.0'.freeze
 end

data/spec/airbrake_spec.rb

@@ -51,28 +51,6 @@ RSpec.describe Airbrake do
       expect(described_class).to be_configured
     end
 
-    context "when a notifier was configured" do
-      before do
-        expect(described_class).to receive(:configured?).and_return(true)
-      end
-
-      it "closes previously configured notice notifier" do
-        expect(described_class).to receive(:close)
-        described_class.configure {}
-      end
-    end
-
-    context "when a notifier wasn't configured" do
-      before do
-        expect(described_class).to receive(:configured?).and_return(false)
-      end
-
-      it "doesn't close previously configured notice notifier" do
-        expect(described_class).not_to receive(:close)
-        described_class.configure {}
-      end
-    end
-
     context "when called multiple times" do
       it "doesn't overwrite performance notifier" do
         described_class.configure {}
@@ -182,19 +160,6 @@ RSpec.describe Airbrake do
     end
   end
 
-  describe "#reset" do
-    context "when Airbrake was previously configured" do
-      before do
-        expect(described_class).to receive(:configured?).and_return(true)
-      end
-
-      it "closes notice notifier" do
-        expect(described_class).to receive(:close)
-        subject.reset
-      end
-    end
-  end
-
   describe "#notify_request" do
     context "when :stash key is not provided" do
       it "doesn't add anything to the stash of the request" do
@@ -206,7 +171,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           status_code: 200,
-          start_time: Time.now
+          start_time: Time.now,
         )
       end
     end
@@ -222,14 +187,30 @@ RSpec.describe Airbrake do
             method: 'GET',
             route: '/',
             status_code: 200,
-            start_time: Time.now
+            start_time: Time.now,
           },
-          request_id: 1
+          request_id: 1,
         )
       end
     end
   end
 
+  describe "#notify_request_sync" do
+    it "notifies request synchronously" do
+      expect(described_class.performance_notifier).to receive(:notify_sync)
+
+      described_class.notify_request_sync(
+        {
+          method: 'GET',
+          route: '/',
+          status_code: 200,
+          start_time: Time.now,
+        },
+        request_id: 1,
+      )
+    end
+  end
+
   describe "#notify_query" do
     context "when :stash key is not provided" do
       it "doesn't add anything to the stash of the query" do
@@ -241,7 +222,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           query: '',
-          start_time: Time.now
+          start_time: Time.now,
         )
       end
     end
@@ -257,14 +238,30 @@ RSpec.describe Airbrake do
             method: 'GET',
             route: '/',
             query: '',
-            start_time: Time.now
+            start_time: Time.now,
           },
-          request_id: 1
+          request_id: 1,
         )
       end
     end
   end
 
+  describe "#notify_query_sync" do
+    it "notifies query synchronously" do
+      expect(described_class.performance_notifier).to receive(:notify_sync)
+
+      described_class.notify_query_sync(
+        {
+          method: 'GET',
+          route: '/',
+          query: '',
+          start_time: Time.now,
+        },
+        request_id: 1,
+      )
+    end
+  end
+
   describe "#notify_performance_breakdown" do
     context "when :stash key is not provided" do
       it "doesn't add anything to the stash of the performance breakdown" do
@@ -276,7 +273,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           query: '',
-          start_time: Time.now
+          start_time: Time.now,
         )
       end
     end
@@ -284,7 +281,7 @@ RSpec.describe Airbrake do
     context "when :stash key is provided" do
       it "adds the value as the stash of the performance breakdown" do
         expect(
-          described_class.performance_notifier
+          described_class.performance_notifier,
         ).to receive(:notify) do |performance_breakdown|
           expect(performance_breakdown.stash).to eq(request_id: 1)
         end
@@ -295,14 +292,31 @@ RSpec.describe Airbrake do
             route: '/',
             response_type: :html,
             groups: {},
-            start_time: Time.now
+            start_time: Time.now,
           },
-          request_id: 1
+          request_id: 1,
         )
       end
     end
   end
 
+  describe "#notify_performance_breakdown_sync" do
+    it "notifies performance breakdown synchronously" do
+      expect(described_class.performance_notifier).to receive(:notify_sync)
+
+      described_class.notify_performance_breakdown_sync(
+        {
+          method: 'GET',
+          route: '/',
+          response_type: :html,
+          groups: {},
+          start_time: Time.now,
+        },
+        request_id: 1,
+      )
+    end
+  end
+
   describe "#notify_queue" do
     context "when :stash key is not provided" do
       it "doesn't add anything to the stash of the queue" do
@@ -312,7 +326,7 @@ RSpec.describe Airbrake do
 
         described_class.notify_queue(
           queue: 'bananas',
-          error_count: 10
+          error_count: 10,
         )
       end
     end
@@ -326,14 +340,28 @@ RSpec.describe Airbrake do
         described_class.notify_queue(
           {
             queue: 'bananas',
-            error_count: 10
+            error_count: 10,
           },
-          request_id: 1
+          request_id: 1,
         )
       end
     end
   end
 
+  describe "#notify_queue_sync" do
+    it "notifies queue synchronously" do
+      expect(described_class.performance_notifier).to receive(:notify_sync)
+
+      described_class.notify_queue_sync(
+        {
+          queue: 'bananas',
+          error_count: 10,
+        },
+        request_id: 1,
+      )
+    end
+  end
+
   describe ".performance_notifier" do
     it "returns a performance notifier" do
       expect(described_class.performance_notifier)
@@ -352,4 +380,35 @@ RSpec.describe Airbrake do
       expect(described_class.deploy_notifier).to be_an(Airbrake::DeployNotifier)
     end
   end
+
+  describe ".close" do
+    after { Airbrake.reset }
+
+    context "when notice_notifier is defined" do
+      it "gets closed" do
+        expect(Airbrake.notice_notifier).to receive(:close)
+      end
+    end
+
+    context "when notice_notifier is undefined" do
+      it "doesn't get closed (because it wasn't initialized)" do
+        Airbrake.instance_variable_set(:@notice_notifier, nil)
+        expect_any_instance_of(Airbrake::NoticeNotifier).not_to receive(:close)
+      end
+    end
+
+    context "when performance_notifier is defined" do
+      it "gets closed" do
+        expect(Airbrake.performance_notifier).to receive(:close)
+      end
+    end
+
+    context "when perforance_notifier is undefined" do
+      it "doesn't get closed (because it wasn't initialized)" do
+        Airbrake.instance_variable_set(:@performance_notifier, nil)
+        expect_any_instance_of(Airbrake::PerformanceNotifier)
+          .not_to receive(:close)
+      end
+    end
+  end
 end

data/spec/async_sender_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Airbrake::AsyncSender do
     Airbrake::Config.instance = Airbrake::Config.new(
       project_id: '1',
       workers: 3,
-      queue_size: 10
+      queue_size: 10,
     )
   end
 
@@ -35,7 +35,7 @@ RSpec.describe Airbrake::AsyncSender do
         Airbrake::Config.instance = Airbrake::Config.new(
           project_id: '1',
           workers: 0,
-          queue_size: 1
+          queue_size: 1,
         )
       end
 
@@ -55,13 +55,13 @@ RSpec.describe Airbrake::AsyncSender do
 
         expect(promise).to be_rejected
         expect(promise.value).to eq(
-          'error' => "AsyncSender has reached its capacity of 1"
+          'error' => "AsyncSender has reached its capacity of 1",
         )
       end
 
       it "logs discarded notice" do
         expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /reached its capacity/
+          /reached its capacity/,
         ).at_least(:once)
 
         15.times { subject.send(notice, Airbrake::Promise.new) }

data/spec/backtrace_spec.rb

@@ -172,13 +172,13 @@ RSpec.describe Airbrake::Backtrace do
 
       it "returns array of hashes where each unknown frame is marked as 'function'" do
         expect(
-          described_class.parse(ex)
+          described_class.parse(ex),
         ).to eq([file: nil, line: nil, function: 'a b c 1 23 321 .rb'])
       end
 
       it "logs frames that cannot be parsed" do
         expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /can't parse 'a b c 1 23 321 .rb'/
+          /can't parse 'a b c 1 23 321 .rb'/,
         )
         described_class.parse(ex)
       end
@@ -280,18 +280,18 @@ RSpec.describe Airbrake::Backtrace do
                 # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
                 # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
-              }
+              },
             },
             {
               file: fixture_path('notroot.txt'),
               line: 3,
-              function: 'pineapple'
+              function: 'pineapple',
             },
             {
               file: project_root_path('vendor/bundle/ignored_file.rb'),
               line: 2,
-              function: 'ignore_me'
-            }
+              function: 'ignore_me',
+            },
           ]
         end
 
@@ -300,7 +300,7 @@ RSpec.describe Airbrake::Backtrace do
           backtrace = [
             project_root_path('code.rb') + ":94:in `to_json'",
             fixture_path('notroot.txt' + ":3:in `pineapple'"),
-            project_root_path('vendor/bundle/ignored_file.rb') + ":2:in `ignore_me'"
+            project_root_path('vendor/bundle/ignored_file.rb') + ":2:in `ignore_me'",
           ]
           ex.set_backtrace(backtrace)
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
@@ -310,7 +310,7 @@ RSpec.describe Airbrake::Backtrace do
       context "and when root_directory is a Pathname" do
         before do
           Airbrake::Config.instance.merge(
-            root_directory: Pathname.new(project_root_path(''))
+            root_directory: Pathname.new(project_root_path('')),
           )
         end
 
@@ -328,8 +328,8 @@ RSpec.describe Airbrake::Backtrace do
                 # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
                 # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
-              }
-            }
+              },
+            },
           ]
         end
 
@@ -360,7 +360,7 @@ RSpec.describe Airbrake::Backtrace do
                 # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
                 # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
-              }
+              },
             },
             {
               file: project_root_path('code.rb'),
@@ -373,14 +373,14 @@ RSpec.describe Airbrake::Backtrace do
                 # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
                 # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
-                97 => '        else'
-              }
+                97 => '        else',
+              },
             },
             {
               file: project_root_path('code.rb'),
               line: 96,
-              function: 'to_json'
-            }
+              function: 'to_json',
+            },
           ]
         end
 
@@ -389,7 +389,7 @@ RSpec.describe Airbrake::Backtrace do
           backtrace = [
             project_root_path('code.rb') + ":94:in `to_json'",
             project_root_path('code.rb') + ":95:in `to_json'",
-            project_root_path('code.rb') + ":96:in `to_json'"
+            project_root_path('code.rb') + ":96:in `to_json'",
           ]
           ex.set_backtrace(backtrace)
           expect(described_class.parse(ex)).to eq(parsed_backtrace)
@@ -410,8 +410,8 @@ RSpec.describe Airbrake::Backtrace do
             {
               file: project_root_path('code.rb'),
               line: 94,
-              function: 'to_json'
-            }
+              function: 'to_json',
+            },
           ]
         end