Merge pull request #841 from bugsnag/release/v6.28.0

twometresteve · web-flow · commit 0eb9d9d9711e · 2025-07-08T11:00:54.000+01:00
Release v6.28.0
diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml
@@ -7,7 +7,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['1.9', '3.4']
+        # Ruby 1.9/2.0 skipped pending PLAT-14387
+        #ruby-version: ['1.9', '3.4']
+        ruby-version: ['3.4']
 
     uses: ./.github/workflows/run-maze-runner.yml
     with:
@@ -18,7 +20,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.0', '3.0']
+        # Ruby 1.9/2.0 skipped pending PLAT-14387
+        #ruby-version: ['2.0', '3.0']
+        ruby-version: ['3.0']
 
     uses: ./.github/workflows/run-maze-runner.yml
     with:
@@ -30,8 +34,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby-version: '1.9'
-            rack-version: '1'
+          # Ruby 1.9/2.0 skipped pending PLAT-14387
+          #- ruby-version: '1.9'
+          #  rack-version: '1'
           - ruby-version: '3.0'
             rack-version: '1'
           - ruby-version: '2.2'
@@ -54,8 +59,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby-version: '2.0'
-            que-version: '0.14'
+          # Ruby 1.9/2.0 skipped pending PLAT-14387
+          #- ruby-version: '2.0'
+          #  que-version: '0.14'
           - ruby-version: '2.5'
             que-version: '0.14'
           - ruby-version: '2.5'
@@ -113,8 +119,9 @@ jobs:
         ruby-version: ['2.2', '2.5']
         rails-version: ['3', '4', '5']
         include:
-          - ruby-version: '2.0'
-            rails-version: '3'
+          # Ruby 1.9/2.0 skipped pending PLAT-14387
+          #- ruby-version: '2.0'
+          #  rails-version: '3'
           - ruby-version: '2.6'
             rails-version: '5'
         exclude:
@@ -159,6 +166,9 @@ jobs:
             rails-version: '8'
           - ruby-version: '3.4'
             rails-version: '_integrations'
+          # 2.7 integrations skipped pending PLAT-14389
+          - ruby-version: '2.7'
+            rails-version: '_integrations'
 
     uses: ./.github/workflows/run-maze-runner.yml
     with:
@@ -170,7 +180,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        # Ruby 1.9/2.0 skipped pending PLAT-14387
+        #ruby-version: ['1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
 
     uses: ./.github/workflows/run-maze-runner.yml
     with:
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -13,15 +13,12 @@ jobs:
         optional-groups: ['test sidekiq']
         include:
           - ruby-version: '1.9'
-            os: 'ubuntu-20.04'
+            os: 'ubuntu-22.04'
             optional-groups: 'test'
           - ruby-version: '2.0'
             optional-groups: 'test'
           - ruby-version: '2.1'
             optional-groups: 'test'
-          - ruby-version: '2.2'
-            optional-groups: 'test sidekiq'
-            os: 'ubuntu-20.04'
           - ruby-version: 'jruby'
             optional-groups: 'test'
 
diff --git a/.gitignore b/.gitignore
@@ -18,20 +18,13 @@ pkg
 *.gem
 
 vendor
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
+
+# IDEs
+.idea/
+*.iml
+
+# macOS:
+.DS_Store
 
 # For TextMate
 #*.tmproj
@@ -54,3 +47,4 @@ bin
 
 # For Bugsnag-Maze-Runner:
 maze_output
+maze-runner.log
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -600,6 +600,7 @@ Style/RescueStandardError:
 Style/SafeNavigation:
   Exclude:
     - 'lib/bugsnag/middleware/callbacks.rb'
+    - 'lib/bugsnag/configuration.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## v6.28.0 (8 July 2025)
+
+### Enhancements
+
+* Set default endpoints based on API key
+| [#835](https://github.com/bugsnag/bugsnag-ruby/pull/835)
+
 ## v6.27.1 (18 June 2024)
 
 ### Fixes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -49,22 +49,17 @@ If you're a member of the core team, follow these instructions for releasing bug
 ### First time setup
 
 * Create a Rubygems account
-* Get James/Simon to add you as contributor on bugsnag-ruby in Rubygems
+* Get someone to add you as contributor on bugsnag-ruby-performance in Rubygems
 
 ### Every time
 
-* Update `VERSION`
-* Update `CHANGELOG.md`
-* Update `README.md` if necessary
-* Commit/push your changes
-
-    ```
-    git add VERSION CHANGELOG.md README.md
-    git commit -m "Release v6.x.x"
-    git push origin master
-    ```
-
-* Release to rubygems
+* Create a new release branch named in the format `release/v1.x.x`
+* Update the version number in [`VERSION`](./VERSION)
+* Update [`CHANGELOG.md`](./CHANGELOG.md) with any changes
+* Open a pull request into `master` and get it approved
+* Merge the pull request using the message "Release v1.x.x"
+* Make a GitHub release
+* Release to rubygems:
 
     ```
     gem build bugsnag.gemspec
diff --git a/Gemfile-maze-runner b/Gemfile-maze-runner
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.10.1'
+gem 'bugsnag-maze-runner', '~> 9.0'
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.27.1
+6.28.0
diff --git a/example/rack/Gemfile b/example/rack/Gemfile
@@ -6,5 +6,5 @@ else
   gem 'bugsnag'
 end
 
-gem 'rack'
+gem 'rack', '~> 2.0'
 gem 'redcarpet'
diff --git a/features/fixtures/rails3/app/config/boot.rb b/features/fixtures/rails3/app/config/boot.rb
@@ -1,3 +1,4 @@
+require 'logger'
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
diff --git a/features/fixtures/rails4/app/config/boot.rb b/features/fixtures/rails4/app/config/boot.rb
@@ -1,4 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
+require 'logger'
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/features/fixtures/rails5/app/config/boot.rb b/features/fixtures/rails5/app/config/boot.rb
@@ -1,3 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
+require 'logger'
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/features/fixtures/rails6/app/config/boot.rb b/features/fixtures/rails6/app/config/boot.rb
@@ -1,4 +1,5 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
+require "logger"
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/features/fixtures/rails7/app/config/boot.rb b/features/fixtures/rails7/app/config/boot.rb
@@ -1,4 +1,5 @@
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
+require "logger"
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/features/plain_features/auto_notify.feature b/features/plain_features/auto_notify.feature
@@ -3,4 +3,4 @@ Feature: Auto notify configuration option
 Scenario: When Auto-notify is false notifications are not sent
   Given I set environment variable "BUGSNAG_AUTO_NOTIFY" to "false"
   When I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_unhandled.rb"
-  Then I should receive no requests
+  Then I should receive no errors
diff --git a/features/plain_features/handled_errors.feature b/features/plain_features/handled_errors.feature
@@ -26,7 +26,7 @@ Scenario: A notified string sends a report
 
 Scenario: A handled error doesn't send a report when the :skip_bugsnag flag is set
   When I run the service "plain-ruby" with the command "bundle exec ruby handled/ignore_exception.rb"
-  Then I should receive no requests
+  Then I should receive no errors
 
 Scenario: A handled error can attach metadata in a block
   When I run the service "plain-ruby" with the command "bundle exec ruby handled/block_metadata.rb"
diff --git a/features/plain_features/ignore_classes.feature b/features/plain_features/ignore_classes.feature
@@ -2,7 +2,7 @@ Feature: Plain ignore classes
 
 Scenario Outline: An errors class is in the ignore_classes array
   When I run the service "plain-ruby" with the command "bundle exec ruby ignore_classes/<state>.rb"
-  Then I should receive no requests
+  Then I should receive no errors
 
   Examples:
   | state     |
diff --git a/features/plain_features/ignore_report.feature b/features/plain_features/ignore_report.feature
@@ -3,7 +3,7 @@ Feature: Plain ignore report
 Scenario Outline: A reports severity can be modified
   Given I set environment variable "CALLBACK_INITIATOR" to "<initiator>"
   When I run the service "plain-ruby" with the command "bundle exec ruby report_modification/ignore_report.rb"
-  Then I should receive no requests
+  Then I should receive no errors
 
   Examples:
   | initiator               |
diff --git a/features/plain_features/release_stages.feature b/features/plain_features/release_stages.feature
@@ -4,7 +4,7 @@ Scenario: Doesn't notify in the wrong release stage
   Given I set environment variable "BUGSNAG_NOTIFY_RELEASE_STAGE" to "stage_one"
   And I set environment variable "BUGSNAG_RELEASE_STAGE" to "stage_two"
   When I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_unhandled.rb"
-  Then I should receive no requests
+  Then I should receive no errors
 
 Scenario: Does notify in the correct release stage
   Given I set environment variable "BUGSNAG_NOTIFY_RELEASE_STAGE" to "stage_one"
diff --git a/features/plain_features/unhandled_errors.feature b/features/plain_features/unhandled_errors.feature
@@ -33,7 +33,7 @@ Scenario Outline: An unhandled error sends a report
 
 Scenario Outline: An unhandled error doesn't send a report
   When I run the service "plain-ruby" with the command "<command> unhandled/<file>.rb"
-  Then I should receive no requests
+  Then I should receive no errors
 
   Examples:
   | file                 | command          |
diff --git a/features/rails_features/auto_capture_sessions.feature b/features/rails_features/auto_capture_sessions.feature
@@ -13,7 +13,7 @@ Scenario: Auto_capture_sessions can be set to false in the initializer
   Given I set environment variable "BUGSNAG_AUTO_CAPTURE_SESSIONS" to "false"
   And I start the rails service
   When I navigate to the route "/session_tracking/initializer" on the rails app
-  Then I should receive no requests
+  Then I should receive no sessions
 
 @rails3 @rails4 @rails5 @rails6 @rails7 @rails8
 Scenario: Manual sessions are still sent if Auto_capture_sessions is false
diff --git a/features/rails_features/auto_notify.feature b/features/rails_features/auto_notify.feature
@@ -5,7 +5,7 @@ Scenario: Auto_notify set to false in the initializer prevents unhandled error s
   Given I set environment variable "BUGSNAG_AUTO_NOTIFY" to "false"
   And I start the rails service
   When I navigate to the route "/auto_notify/unhandled" on the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails3 @rails4 @rails5 @rails6 @rails7 @rails8
 Scenario: Auto_notify set to false in the initializer still sends handled errors
@@ -24,7 +24,7 @@ Scenario: Auto_notify set to false in the initializer still sends handled errors
 Scenario: Auto_notify set to false after the initializer prevents unhandled error sending
   Given I start the rails service
   When I navigate to the route "/auto_notify/unhandled_after" on the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails3 @rails4 @rails5 @rails6 @rails7 @rails8
 Scenario: Auto_notify set to false after the initializer still sends handled errors
diff --git a/features/rails_features/ignore_classes.feature b/features/rails_features/ignore_classes.feature
@@ -5,10 +5,10 @@ Scenario: Ignore_classes can be set to a different value in initializer
   Given I set environment variable "BUGSNAG_IGNORE_CLASS" to "IgnoredError"
   And I start the rails service
   When I navigate to the route "/ignore_classes/initializer" on the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails3 @rails4 @rails5 @rails6 @rails7 @rails8
 Scenario: Ignore_classes can be set to a different value after initializer
   Given I start the rails service
   When I navigate to the route "/ignore_classes/after?ignore=IgnoredError" on the rails app
-  Then I should receive no requests
+  Then I should receive no errors
diff --git a/features/rails_features/integrations.feature b/features/rails_features/integrations.feature
@@ -238,28 +238,28 @@ Scenario: Using Sidekiq as the Active Job queue adapter for a job that works
   And I start the rails service
   And I run "bundle exec sidekiq" in the rails app in the background
   When I run the "fixture:queue_working_job" rake task in the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails_integrations
 Scenario: Using Resque as the Active Job queue adapter for a job that works
   Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "resque"
   And I start the rails service
   And I run "bundle exec rake resque:work" in the rails app in the background
   When I run the "fixture:queue_working_job" rake task in the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails_integrations
 Scenario: Using Que as the Active Job queue adapter for a job that works
   Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "que"
   And I start the rails service with the database
   And I run "bundle exec que -q default ./config/environment.rb" in the rails app in the background
   When I run the "fixture:queue_working_job" rake task in the rails app
-  Then I should receive no requests
+  Then I should receive no errors
 
 @rails_integrations
 Scenario: Using Delayed Job as the Active Job queue adapter for a job that works
   Given I set environment variable "ACTIVE_JOB_QUEUE_ADAPTER" to "delayed_job"
   And I start the rails service with the database
   And I run the "jobs:work" rake task in the rails app in the background
   When I run the "fixture:queue_working_job" rake task in the rails app
-  Then I should receive no requests
+  Then I should receive no errors
diff --git a/lib/bugsnag.rb b/lib/bugsnag.rb
@@ -54,6 +54,8 @@ class << self
     def configure(validate_api_key=true)
       yield(configuration) if block_given?
 
+      configuration.set_default_endpoints
+
       # Create the session tracker if sessions are enabled to avoid the overhead
       # of creating it on the first request. We skip this if we're not validating
       # the API key as we use this internally before the user's configure block
@@ -522,8 +524,12 @@ def check_key_valid
     # If only a notify_endpoint has been set, session tracking will be disabled
     # If only a session_endpoint has been set, and ArgumentError will be raised
     def check_endpoint_setup
-      notify_set = configuration.notify_endpoint && configuration.notify_endpoint != Bugsnag::Configuration::DEFAULT_NOTIFY_ENDPOINT
-      session_set = configuration.session_endpoint && configuration.session_endpoint != Bugsnag::Configuration::DEFAULT_SESSION_ENDPOINT
+      notify_set = configuration.notify_endpoint &&
+                   configuration.notify_endpoint != Bugsnag::Configuration::DEFAULT_NOTIFY_ENDPOINT &&
+                   configuration.notify_endpoint != Bugsnag::Configuration::HUB_NOTIFY_ENDPOINT
+      session_set = configuration.session_endpoint &&
+                    configuration.session_endpoint != Bugsnag::Configuration::DEFAULT_SESSION_ENDPOINT &&
+                    configuration.session_endpoint != Bugsnag::Configuration::HUB_SESSION_ENDPOINT
       if notify_set && !session_set
         configuration.warn("The session endpoint has not been set, all further session capturing will be disabled")
         configuration.disable_sessions
diff --git a/lib/bugsnag/configuration.rb b/lib/bugsnag/configuration.rb
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
diff --git a/spec/fixtures/apps/rails-invalid-initializer-config/config.ru b/spec/fixtures/apps/rails-invalid-initializer-config/config.ru
diff --git a/spec/fixtures/apps/rails-no-config/config.ru b/spec/fixtures/apps/rails-no-config/config.ru
diff --git a/spec/report_spec.rb b/spec/report_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`source "https://rubygems.org"`
`2`	`2`
`3`		`-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.10.1'`
	`3`	`+gem 'bugsnag-maze-runner', '~> 9.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'logger'`
`1`	`2`	`require 'rubygems'`
`2`	`3`
`3`	`4`	`# Set up gems listed in the Gemfile.`