Merge branch 'master' into dj-scoped-block

rollbar · Dec 19, 2023 · 76fc6df · 76fc6df
2 parents e6c2207 + 54b192d
commit 76fc6df
Show file tree

Hide file tree

Showing 43 changed files with 338 additions and 494 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,67 +8,27 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ruby-version: [2.2.10, 2.3.0, 2.3.8, 2.4.5, 2.5.3, 2.6.0, 2.6.6, 2.7.2]
+        ruby-version: [2.5.3, 2.6.0, 2.6.6, 2.7.2]
         gemfile:
-          - gemfiles/rails42.gemfile
           - gemfiles/rails50.gemfile
           - gemfiles/rails51.gemfile
           - gemfiles/rails52.gemfile
           - gemfiles/rails60.gemfile
           - gemfiles/rails61.gemfile
-        exclude:
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.6.0
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.6.6
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.7.2
-          - gemfile: gemfiles/rails52.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails60.gemfile
-            ruby-version: 2.4.5
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 2.4.5
         include:
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails31.gemfile
-            ruby-version: 2.0.0
-          - gemfile: gemfiles/rails30.gemfile
-            ruby-version: 2.0.0
+          - gemfile: gemfiles/rails71.gemfile
+            ruby-version: 3.2.2
+          - gemfile: gemfiles/rails71.gemfile
+            ruby-version: 3.1.1
+          - gemfile: gemfiles/rails70.gemfile
+            ruby-version: 3.1.1
+          - gemfile: gemfiles/rails70.gemfile
+            ruby-version: 3.0.3
           - gemfile: gemfiles/rails61.gemfile
-            ruby-version: 3.0.0
+            ruby-version: 3.0.3
 
     steps:
       - uses: actions/checkout@v2
@@ -86,21 +46,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
-      - name: Setup Ruby 2.0.0
-        if: ${{ matrix.ruby-version == '2.0.0' }}
-        timeout-minutes: 15
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libssl1.0-dev
-          wget http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p648.tar.gz
-          tar xvfz ruby-2.0.0-p648.tar.gz
-          cd ruby-2.0.0-p648
-          ./configure && make && sudo make install-nodoc
-
-      - name: Ruby 2.0.0, install bundler
-        if: ${{ matrix.ruby-version == '2.0.0' }}
-        run: sudo gem install bundler -v 1.17.3
-
       - name: Rails 4.2 ensure bundler version
         if: ${{ matrix.gemfile == 'gemfiles/rails42.gemfile' }}
         run: |

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,6 @@
-# This file was generated by Appraisal
+# This Gemfile is compatible with Ruby 2.5.0 or greater. To test with
+# earlier Rubies, use the appropriate Gemfile from the ./gemfiles/ dir.
+ruby '3.2.2'
 
 source 'https://rubygems.org'
 
@@ -11,16 +13,18 @@ ENV['CURRENT_GEMFILE'] ||= __FILE__
 
 is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby')
 
-GEMFILE_RAILS_VERSION = '~> 6.1.3'.freeze
+GEMFILE_RAILS_VERSION = '~> 7.1.0'.freeze
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 gem 'appraisal'
 gem 'jruby-openssl', :platform => :jruby
 gem 'rails', GEMFILE_RAILS_VERSION
 gem 'rake'
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'rspec-rails', '~> 3.4'
-else
+elsif GEMFILE_RAILS_VERSION < '7.0'
   gem 'rspec-rails', '~> 4.0.2'
+else
+  gem 'rspec-rails', '~> 6.0.3'
 end
 
 if GEMFILE_RAILS_VERSION < '6.0'
@@ -29,11 +33,7 @@ else
   gem 'sqlite3', '~> 1.4', :platform => [:ruby, :mswin, :mingw]
 end
 
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
+gem 'sidekiq', '>= 6.4.0'
 
 platforms :rbx do
   gem 'minitest'
@@ -68,8 +68,7 @@ else
   gem 'delayed_job', '~> 4.1', :require => false
 end
 gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'redis'
+gem 'redis', '<= 4.8.0'
 gem 'resque', '< 2.0.0'
 gem 'rubocop', '1.15.0', :require => false # pin specific version, update manually
 gem 'rubocop-performance', :require => false

diff --git a/README.md b/README.md
@@ -1,13 +1,35 @@
-# Rollbar-gem
+<p align="center">
+  <img alt="rollbar-logo" src="https://user-images.githubusercontent.com/3300063/207964480-54eda665-d6fe-4527-ba51-b0ab3f41f10b.png" />
+</p>
+
+<h1 align="center">Rollbar Ruby Gem</h1>
+
+<p align="center">
+  <strong>Proactively discover, predict, and resolve errors in real-time with <a href="https://rollbar.com">Rollbar’s</a> error monitoring platform. <a href="https://rollbar.com/signup/">Start tracking errors today</a>!</strong>
+</p>
+
+
 ![Build Status](https://github.com/rollbar/rollbar-gem/workflows/Rollbar-gem%20CI/badge.svg?tag=latest)
 [![Gem Version](https://badge.fury.io/rb/rollbar.svg)](http://badge.fury.io/rb/rollbar)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rollbar&package-manager=bundler&version-scheme=semver&target-version=latest)](https://dependabot.com/compatibility-score.html?dependency-name=rollbar&package-manager=bundler&version-scheme=semver&new-version=latest)
 
 
+---
+
 [Rollbar](https://rollbar.com) is a real-time exception reporting service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.
 
 Rollbar-gem is the SDK for Ruby apps and includes support for apps using Rails, Sinatra, Rack, plain Ruby, and other frameworks.
 
+
+## Key benefits of using Rollbar Ruby Gem are:
+
+- **Frameworks:** Rollbar Ruby Gem supports popular Ruby frameworks such as <a href="https://docs.rollbar.com/docs/rails">Rails</a>, <a href="https://docs.rollbar.com/docs/sinatra">Sinatra</a>, <a href="https://docs.rollbar.com/docs/grape">Grape</a> and more.
+- **Integrations:** Rollbar Ruby has integrations for <a href="https://docs.rollbar.com/docs/resque-integration">Resque</a>, <a href="https://docs.rollbar.com/docs/activejob-integration">ActiveJob</a>, <a href="https://docs.rollbar.com/docs/using-with-rollbar-agent">rollbar-agent</a>, <a href="https://docs.rollbar.com/docs/sidekiq-integration">Sidekiq</a> and more!
+- **Automatic error grouping:** Rollbar aggregates Occurrences caused by the same error into Items that represent application issues. <a href="https://docs.rollbar.com/docs/grouping-occurrences">Learn more about reducing log noise</a>.
+- **Advanced search:** Filter items by many different properties. <a href="https://docs.rollbar.com/docs/search-items">Learn more about search</a>.
+- **Customizable notifications:** Rollbar supports several messaging and incident management tools where your team can get notified about errors and important events by real-time alerts. <a href="https://docs.rollbar.com/docs/notifications">Learn more about Rollbar notifications</a>.
+
+
 ## Setup Instructions
 
 1. [Sign up for a Rollbar account](https://rollbar.com/signup)
@@ -27,7 +49,7 @@ Version < 2.19.0 is compatible with Ruby >= 1.8.7.
 
 ### Ruby 2.6.0
 
-> WARNING: Ruby 2.6.0 introduced a new bug bug ([#15472 -
+> WARNING: Ruby 2.6.0 introduced a new bug ([#15472 -
 Invalid JSON data being sent from Net::HTTP in some cases with Ruby 2.6.0](https://bugs.ruby-lang.org/issues/15472)) that may result in the Rollbar API returning an error when an exception is reported.  (See [rollbar-gem issue #797](https://github.com/rollbar/rollbar-gem/issues/797)).
 
 > UPDATE: This bug is fixed in Ruby 2.6.1, and rollbar-gem has a safe workaround in version >= 2.19.0.