Merge remote-tracking branch 'origin/master' into 6.0-dev

Author: sl0thentr0py

.github/workflows/danger.yml

@@ -6,4 +6,6 @@ on:
 
 jobs:
   danger:
-    uses: getsentry/github-workflows/.github/workflows/danger.yml@v2
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/github-workflows/danger@v3

CHANGELOG.md

@@ -1,4 +1,4 @@
-## Unreleased (6.0.0)
+## 6.0.0
 
 ### Breaking Changes
 
@@ -52,6 +52,12 @@
 - Archive [`sentry-raven`](https://github.com/getsentry/raven-ruby) ([#2708](https://github.com/getsentry/sentry-ruby/pull/2708))
 - Don't send `sample_rate` client reports for profiles if profiling is disabled ([#2728](https://github.com/getsentry/sentry-ruby/pull/2728))
 
+## 5.28.1
+
+### Bug Fixes
+
+- The `sentry.origin` log event attribute is now correctly prefixed with `auto.log` ([#2749](https://github.com/getsentry/sentry-ruby/pull/2749))
+
 ## 5.28.0
 
 ### Features

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

@@ -2,6 +2,6 @@
 
 module Sentry
   module DelayedJob
-    VERSION = "5.28.0"
+    VERSION = "5.28.1"
   end
 end

sentry-delayed_job/sentry-delayed_job.gemspec

@@ -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.28.0"
+  spec.add_dependency "sentry-ruby", "~> 5.28.1"
   spec.add_dependency "delayed_job", ">= 4.0"
 end

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

@@ -2,6 +2,6 @@
 
 module Sentry
   module OpenTelemetry
-    VERSION = "5.28.0"
+    VERSION = "5.28.1"
   end
 end

sentry-opentelemetry/sentry-opentelemetry.gemspec

@@ -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.28.0"
+  spec.add_dependency "sentry-ruby", "~> 5.28.1"
   spec.add_dependency "opentelemetry-sdk", "~> 1.0"
 end

sentry-rails/lib/sentry/rails/log_subscriber.rb

@@ -27,7 +27,7 @@ module Rails
     #     end
     #   end
     class LogSubscriber < ActiveSupport::LogSubscriber
-      ORIGIN = "auto.logger.rails.log_subscriber"
+      ORIGIN = "auto.log.rails.log_subscriber"
 
       class << self
         if ::Rails.version.to_f < 6.0

sentry-rails/lib/sentry/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Rails
-    VERSION = "5.28.0"
+    VERSION = "5.28.1"
   end
 end

sentry-rails/sentry-rails.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 5.2.0"
-  spec.add_dependency "sentry-ruby", "~> 5.28.0"
+  spec.add_dependency "sentry-ruby", "~> 5.28.1"
 end

sentry-rails/spec/sentry/rails/log_subscribers/action_controller_subscriber_spec.rb

@@ -35,7 +35,7 @@
         expect(log_event[:attributes][:method][:value]).to eq("GET")
         expect(log_event[:attributes][:path][:value]).to eq("/world")
         expect(log_event[:attributes][:format][:value]).to eq(:html)
-        expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.rails.log_subscriber")
+        expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.rails.log_subscriber")
       end
 
       it "logs bad requests appropriately" do