Apply bundler-cache to CI's Ruby setup

.github/workflows/sentry_delayed_job_test.yml

@@ -21,33 +21,40 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, '3.0', '3.1', '3.2', jruby]
+        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
         os: [ubuntu-latest]
         include:
-          - { os: ubuntu-latest, ruby_version: '3.2', options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
-          - { os: ubuntu-latest, ruby_version: '3.2', options: { codecov: 1 } }
+          - {
+              os: ubuntu-latest,
+              ruby_version: "3.2",
+              options:
+                {
+                  rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
+                },
+            }
+          - { os: ubuntu-latest, ruby_version: "3.2", options: { codecov: 1 } }
     steps:
-    - uses: actions/checkout@v1
-    - name: Install sqlite
-      run: |
-        # See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
-        for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
-        sudo apt-get update
-        sudo apt-get install libsqlite3-dev
+      - uses: actions/checkout@v1
+      - name: Install sqlite
+        run: |
+          # See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
+          for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
+          sudo apt-get update
+          sudo apt-get install libsqlite3-dev
 
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler: "2.3"
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
-    - name: Run specs
-      env:
-        RUBYOPT: ${{ matrix.options.rubyopt }}
-      run: |
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - name: Run specs
+        env:
+          RUBYOPT: ${{ matrix.options.rubyopt }}
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle exec rake
 
-    - name: Upload Coverage
-      if: ${{ matrix.options.codecov }}
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      - name: Upload Coverage
+        if: ${{ matrix.options.codecov }}
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d

.github/workflows/sentry_opentelemetry_test.yml

@@ -21,29 +21,36 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.6, 2.7, '3.0', '3.1', '3.2', jruby]
+        ruby_version: [2.6, 2.7, "3.0", "3.1", "3.2", jruby]
         # opentelemetry_version: [1.2.0]
         os: [ubuntu-latest]
         include:
-          - { os: ubuntu-latest, ruby_version: 3.2, options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
+          - {
+              os: ubuntu-latest,
+              ruby_version: 3.2,
+              options:
+                {
+                  rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
+                },
+            }
           - { os: ubuntu-latest, ruby_version: 3.2, options: { codecov: 1 } }
     steps:
-    - uses: actions/checkout@v1
+      - uses: actions/checkout@v1
 
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@8ddb7b3348b3951590db24c346e94ebafdabc926
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler: "2.3"
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
-    - name: Run specs
-      env:
-        RUBYOPT: ${{ matrix.options.rubyopt }}
-        OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
-      run: |
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - name: Run specs
+        env:
+          RUBYOPT: ${{ matrix.options.rubyopt }}
+          OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle exec rake
 
-    - name: Upload Coverage
-      if: ${{ matrix.options.codecov }}
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      - name: Upload Coverage
+        if: ${{ matrix.options.codecov }}
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d

.github/workflows/sentry_rails_test.yml

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         rails_version: [6.1.0, 7.0.0, 7.1.0]
-        ruby_version: [2.7, '3.0', '3.1', '3.2']
+        ruby_version: [2.7, "3.0", "3.1", "3.2"]
         os: [ubuntu-latest]
         include:
           - { os: ubuntu-latest, ruby_version: "2.4", rails_version: 5.0.0 }
@@ -61,30 +61,27 @@ jobs:
               options: { codecov: 1 },
             }
     steps:
-    - uses: actions/checkout@v1
-    - name: Install sqlite and ImageMagick
-      run: |
-        # See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
-        for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
-        sudo apt-get update
-        sudo apt-get install libsqlite3-dev imagemagick
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler: "2.3"
-        # rails 7.1.0 requires latest rubygems
-        # but 3.5.0 dropped ruby 2.7 so we need to pin to something that works for all our shit
-        rubygems: ${{ matrix.rails_version == '7.1.0' && '3.4.22' || 'default' }}
+      - uses: actions/checkout@v1
+      - name: Install sqlite and ImageMagick
+        run: |
+          # See https://github.community/t5/GitHub-Actions/ubuntu-latest-Apt-repository-list-issues/td-p/41122/page/2
+          for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
+          sudo apt-get update
+          sudo apt-get install libsqlite3-dev imagemagick
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
-    - name: Build with Rails ${{ matrix.rails_version }}
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-        RUBYOPT: ${{ matrix.options.rubyopt }}
-      run: |
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - name: Build with Rails ${{ matrix.rails_version }}
+        env:
+          RAILS_VERSION: ${{ matrix.rails_version }}
+          RUBYOPT: ${{ matrix.options.rubyopt }}
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle exec rake
 
-    - name: Upload Coverage
-      if: ${{ matrix.options.codecov }}
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      - name: Upload Coverage
+        if: ${{ matrix.options.codecov }}
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d

.github/workflows/sentry_resque_test.yml

@@ -21,31 +21,38 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, '3.0', '3.1', '3.2', jruby]
+        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
         os: [ubuntu-latest]
         include:
-          - { os: ubuntu-latest, ruby_version: '3.2', options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
-          - { os: ubuntu-latest, ruby_version: '3.2', options: { codecov: 1 } }
+          - {
+              os: ubuntu-latest,
+              ruby_version: "3.2",
+              options:
+                {
+                  rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
+                },
+            }
+          - { os: ubuntu-latest, ruby_version: "3.2", options: { codecov: 1 } }
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler: "2.3"
+      - uses: actions/checkout@v1
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
-    - name: Start Redis
-      uses: supercharge/redis-github-action@1.1.0
-      with:
-        redis-version: 5
+      - name: Start Redis
+        uses: supercharge/redis-github-action@1.1.0
+        with:
+          redis-version: 5
 
-    - name: Run specs
-      env:
-        RUBYOPT: ${{ matrix.options.rubyopt }}
-      run: |
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - name: Run specs
+        env:
+          RUBYOPT: ${{ matrix.options.rubyopt }}
+        run: |
+          bundle install --jobs 4 --retry 3
+          bundle exec rake
 
-    - name: Upload Coverage
-      if: ${{ matrix.options.codecov }}
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      - name: Upload Coverage
+        if: ${{ matrix.options.codecov }}
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d

.github/workflows/sentry_ruby_test.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ruby_version: [2.4, 2.5, 2.6, 2.7, '3.0', '3.1', '3.2', jruby]
+        ruby_version: [2.4, 2.5, 2.6, 2.7, "3.0", "3.1", "3.2", jruby]
         rack_version: [2.0, 3.0]
         redis_rb_version: [4.0]
         os: [ubuntu-latest]
@@ -62,7 +62,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
-          bundler: "2.3"
+          bundler-cache: true
 
       - name: Start Redis
         uses: supercharge/redis-github-action@c169aa53af4cd5d9321e9114669dbd11be08d307

.github/workflows/sentry_sidekiq_test.yml

@@ -21,8 +21,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        sidekiq_version: ['5.0', '6.0', '7.0']
-        ruby_version: ['2.7', '3.0', '3.1', '3.2', jruby]
+        sidekiq_version: ["5.0", "6.0", "7.0"]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2", jruby]
         os: [ubuntu-latest]
         include:
           - { os: ubuntu-latest, ruby_version: 2.4, sidekiq_version: 5.0 }
@@ -33,30 +33,43 @@ jobs:
           - { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 5.0 }
           - { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 6.0 }
           - { os: ubuntu-latest, ruby_version: jruby, sidekiq_version: 7.0 }
-          - { os: ubuntu-latest, ruby_version: '3.2', sidekiq_version: 7.0, options: { rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal" } }
-          - { os: ubuntu-latest, ruby_version: '3.2', sidekiq_version: 7.0, options: { codecov: 1 } }
+          - {
+              os: ubuntu-latest,
+              ruby_version: "3.2",
+              sidekiq_version: 7.0,
+              options:
+                {
+                  rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
+                },
+            }
+          - {
+              os: ubuntu-latest,
+              ruby_version: "3.2",
+              sidekiq_version: 7.0,
+              options: { codecov: 1 },
+            }
     steps:
-    - uses: actions/checkout@v1
+      - uses: actions/checkout@v1
 
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler: "2.3"
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
-    - name: Start Redis
-      uses: supercharge/redis-github-action@1.1.0
-      with:
-        redis-version: ${{ matrix.sidekiq_version == '7.0' && 6 || 5 }}
+      - name: Start Redis
+        uses: supercharge/redis-github-action@1.1.0
+        with:
+          redis-version: ${{ matrix.sidekiq_version == '7.0' && 6 || 5 }}
 
-    - name: Run specs with Sidekiq ${{ matrix.sidekiq_version }}
-      env:
-        SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
-        RUBYOPT: ${{ matrix.options.rubyopt }}
-      run: |
-        bundle install --jobs 4 --retry 3
-        make test
+      - name: Run specs with Sidekiq ${{ matrix.sidekiq_version }}
+        env:
+          SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
+          RUBYOPT: ${{ matrix.options.rubyopt }}
+        run: |
+          bundle install --jobs 4 --retry 3
+          make test
 
-    - name: Upload Coverage
-      if: ${{ matrix.options.codecov }}
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      - name: Upload Coverage
+        if: ${{ matrix.options.codecov }}
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d

sentry-opentelemetry/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require "bundler/setup"
 require "pry"
-require "debug" if RUBY_VERSION.to_f >= 2.6
+require "debug" if RUBY_VERSION.to_f >= 2.6 && RUBY_ENGINE == "ruby"
 
 require 'simplecov'