Merge branch 'master' into master

.github/workflows/sentry_ruby_test.yml

@@ -25,6 +25,7 @@ jobs:
         working-directory: sentry-ruby
     name: Ruby ${{ matrix.ruby_version }} & Rack ${{ matrix.rack_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -12,5 +12,6 @@ Gemfile.lock
 .ruby-gemset
 .idea
 *.rdb
+.rgignore
 
 examples/**/node_modules

.rubocop.yml

@@ -4,7 +4,17 @@ inherit_gem:
 Layout/SpaceInsideArrayLiteralBrackets:
   Enabled: false
 
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/RedundantFreeze:
+  Enabled: true
+
 AllCops:
   Exclude:
     - "sentry-raven/**/*"
     - "sentry-*/tmp/**/*"
+    - "sentry-*/examples/**/*"

CHANGELOG.md

@@ -1,10 +1,61 @@
 ## Unreleased
 
+### Features 
+
+- Add support for Sentry Cache instrumentation, when using Rails.cache ([#2380](https://github.com/getsentry/sentry-ruby/pull/2380))
+
+## 5.21.0
+
 ### Features
 
-- Add support for $SENTRY_DEBUG and $SENTRY_SPOTLIGHT ([#2374](https://github.com/getsentry/sentry-ruby/pull/2374))
+- Experimental support for multi-threaded profiling using [Vernier](https://github.com/jhawthorn/vernier) ([#2372](https://github.com/getsentry/sentry-ruby/pull/2372))
+
+  You can have much better profiles if you're using multi-threaded servers like Puma now by leveraging Vernier.
+  To use it, first add `vernier` to your `Gemfile` and make sure it is loaded before `sentry-ruby`.
+
+  ```ruby
+  # Gemfile
+
+  gem 'vernier'
+  gem 'sentry-ruby'
+  ```
+
+  Then, set a `profiles_sample_rate` and the new `profiler_class` configuration in your sentry initializer to use the new profiler.
+
+  ```ruby
+  # config/initializers/sentry.rb
+
+  Sentry.init do |config|
+    # ...
+    config.profiles_sample_rate = 1.0
+    config.profiler_class = Sentry::Vernier::Profiler
+  end
+  ```
+
+### Internal
+
+- Profile items have bigger size limit now ([#2421](https://github.com/getsentry/sentry-ruby/pull/2421))
+- Consistent string freezing ([#2422](https://github.com/getsentry/sentry-ruby/pull/2422))
+
+## 5.20.1
+
+### Bug Fixes
+
+- Skip `rubocop.yml` in `spec.files` ([#2420](https://github.com/getsentry/sentry-ruby/pull/2420))
+
+## 5.20.0
+
+- Add support for `$SENTRY_DEBUG` and `$SENTRY_SPOTLIGHT` ([#2374](https://github.com/getsentry/sentry-ruby/pull/2374))
 - Support human readable intervals in `sidekiq-cron` ([#2387](https://github.com/getsentry/sentry-ruby/pull/2387))
-- Add support for Sentry Cache instrumentation, when using Rails.cache ([#2380](https://github.com/getsentry/sentry-ruby/pull/2380))
+- Set default app dirs pattern ([#2390](https://github.com/getsentry/sentry-ruby/pull/2390))
+- Add new `strip_backtrace_load_path` boolean config (default true) to enable disabling load path stripping ([#2409](https://github.com/getsentry/sentry-ruby/pull/2409))
+
+### Bug Fixes
+
+- Fix error events missing a DSC when there's an active span ([#2408](https://github.com/getsentry/sentry-ruby/pull/2408))
+- Verifies presence of client before adding a breadcrumb ([#2394](https://github.com/getsentry/sentry-ruby/pull/2394))
+- Fix `Net:HTTP` integration for non-ASCII URI's ([#2417](https://github.com/getsentry/sentry-ruby/pull/2417))
+- Prevent Hub from having nil scope and client ([#2402](https://github.com/getsentry/sentry-ruby/pull/2402))
 
 ## 5.19.0
 

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 

sentry-delayed_job/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 

sentry-delayed_job/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

sentry-delayed_job/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "sentry/ruby"

sentry-delayed_job/example/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails"

sentry-delayed_job/example/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_job"
 require "active_record"
 require "delayed_job"

sentry-delayed_job/lib/sentry-delayed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "delayed_job"
 require "sentry-ruby"
 require "sentry/integrable"

sentry-delayed_job/lib/sentry/delayed_job/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sentry
   class Configuration
     attr_reader :delayed_job

sentry-delayed_job/lib/sentry/delayed_job/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Sentry
   module DelayedJob
-    VERSION = "5.19.0"
+    VERSION = "5.21.0"
   end
 end

sentry-delayed_job/sentry-delayed_job.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "lib/sentry/delayed_job/version"
 
 Gem::Specification.new do |spec|
@@ -11,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.platform = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.4'
   spec.extra_rdoc_files = ["README.md", "LICENSE.txt"]
-  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples)'`.split("\n")
+  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples|\.rubocop\.yml)'`.split("\n")
 
   github_root_uri = 'https://github.com/getsentry/sentry-ruby'
   spec.homepage = "#{github_root_uri}/tree/#{spec.version}/#{spec.name}"
@@ -28,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby", "~> 5.19.0"
+  spec.add_dependency "sentry-ruby", "~> 5.21.0"
   spec.add_dependency "delayed_job", ">= 4.0"
 end

sentry-delayed_job/spec/sentry/delayed_job/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Sentry::DelayedJob::Configuration do

sentry-delayed_job/spec/sentry/delayed_job_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Sentry::DelayedJob do

sentry-delayed_job/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 begin
   require "debug/prelude"

sentry-opentelemetry/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 

sentry-opentelemetry/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

sentry-opentelemetry/lib/sentry/opentelemetry/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module OpenTelemetry
-    VERSION = "5.19.0"
+    VERSION = "5.21.0"
   end
 end

sentry-opentelemetry/sentry-opentelemetry.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.platform = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.4'
   spec.extra_rdoc_files = ["README.md", "LICENSE.txt"]
-  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples)'`.split("\n")
+  spec.files = `git ls-files | grep -Ev '^(spec|benchmarks|examples|\.rubocop\.yml)'`.split("\n")
 
   github_root_uri = 'https://github.com/getsentry/sentry-ruby'
   spec.homepage = "#{github_root_uri}/tree/#{spec.version}/#{spec.name}"
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby", "~> 5.19.0"
+  spec.add_dependency "sentry-ruby", "~> 5.21.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.0"
 end

sentry-rails/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 

sentry-rails/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

sentry-rails/app/jobs/sentry/send_event_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(ActiveJob)
   module Sentry
     parent_job =

sentry-rails/benchmarks/allocation_comparison.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark/memory'
 require "sentry-ruby"
 require "sentry/benchmarks/benchmark_transport"

sentry-rails/benchmarks/allocation_report.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark/ipsa'
 require "sentry-ruby"
 require "sentry/benchmarks/benchmark_transport"

sentry-rails/benchmarks/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/all"
 require "action_controller"
 require_relative "../spec/support/test_rails_app/app"

sentry-rails/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "sentry/ruby"

sentry-rails/lib/generators/sentry_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/base"
 
 class SentryGenerator < ::Rails::Generators::Base

sentry-rails/lib/sentry-rails.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "sentry/rails/version"
 require "sentry/rails"

sentry-rails/lib/sentry/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 require "sentry-ruby"
 require "sentry/integrable"

sentry-rails/lib/sentry/rails/action_cable.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     module ActionCableExtensions
       class ErrorHandler
-        OP_NAME = "websocket.server".freeze
+        OP_NAME = "websocket.server"
         SPAN_ORIGIN = "auto.http.rails.actioncable"
 
         class << self

sentry-rails/lib/sentry/rails/active_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     module ActiveJobExtensions
@@ -16,8 +18,8 @@ def already_supported_by_sentry_integration?
       end
 
       class SentryReporter
-        OP_NAME = "queue.active_job".freeze
-        SPAN_ORIGIN = "auto.queue.active_job".freeze
+        OP_NAME = "queue.active_job"
+        SPAN_ORIGIN = "auto.queue.active_job"
 
         class << self
           def record(job, &block)

sentry-rails/lib/sentry/rails/background_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sentry
   class BackgroundWorker
     def _perform(&block)

sentry-rails/lib/sentry/rails/backtrace_cleaner.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "active_support/backtrace_cleaner"
 require "active_support/core_ext/string/access"
 
 module Sentry
   module Rails
     class BacktraceCleaner < ActiveSupport::BacktraceCleaner
-      APP_DIRS_PATTERN = /\A(?:\.\/)?(?:app|config|lib|test|\(\w*\))/.freeze
-      RENDER_TEMPLATE_PATTERN = /:in `.*_\w+_{2,3}\d+_\d+'/.freeze
+      APP_DIRS_PATTERN = /\A(?:\.\/)?(?:app|config|lib|test|\(\w*\))/
+      RENDER_TEMPLATE_PATTERN = /:in `.*_\w+_{2,3}\d+_\d+'/
 
       def initialize
         super

sentry-rails/lib/sentry/rails/breadcrumb/active_support_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     module Breadcrumb

sentry-rails/lib/sentry/rails/breadcrumb/monotonic_active_support_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sentry/rails/instrument_payload_cleanup_helper"
 
 module Sentry

sentry-rails/lib/sentry/rails/capture_exceptions.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     class CaptureExceptions < Sentry::Rack::CaptureExceptions
       RAILS_7_1 = Gem::Version.new(::Rails.version) >= Gem::Version.new("7.1.0.alpha")
-      SPAN_ORIGIN = "auto.http.rails".freeze
+      SPAN_ORIGIN = "auto.http.rails"
 
       def initialize(_)
         super
@@ -20,7 +22,7 @@ def collect_exception(env)
       end
 
       def transaction_op
-        "http.server".freeze
+        "http.server"
       end
 
       def capture_exception(exception, env)

sentry-rails/lib/sentry/rails/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sentry/rails/tracing/action_controller_subscriber"
 require "sentry/rails/tracing/action_view_subscriber"
 require "sentry/rails/tracing/active_record_subscriber"

sentry-rails/lib/sentry/rails/controller_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     module ControllerMethods

sentry-rails/lib/sentry/rails/controller_transaction.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Sentry
   module Rails
     module ControllerTransaction
-      SPAN_ORIGIN = "auto.view.rails".freeze
+      SPAN_ORIGIN = "auto.view.rails"
 
       def self.included(base)
         base.prepend_around_action(:sentry_around_action)