diff --git a/CHANGELOG.md b/CHANGELOG.md index 6451cefc9..0f83f6469 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Unreleased + +### 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 @@ -7,7 +13,7 @@ ### Miscellaneous - Deprecate all Metrics related APIs [#2726](https://github.com/getsentry/sentry-ruby/pull/2726) - + Sentry [no longer has the Metrics Beta offering](https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Metrics-Beta-Ended-on-October-7th) so all the following APIs linked to Metrics have been deprecated and will be removed in the next major. diff --git a/sentry-rails/lib/sentry/rails/log_subscriber.rb b/sentry-rails/lib/sentry/rails/log_subscriber.rb index 678c0b1ad..8275f16dd 100644 --- a/sentry-rails/lib/sentry/rails/log_subscriber.rb +++ b/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 diff --git a/sentry-rails/spec/sentry/rails/log_subscribers/action_controller_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/log_subscribers/action_controller_subscriber_spec.rb index 69e44992a..e54945738 100644 --- a/sentry-rails/spec/sentry/rails/log_subscribers/action_controller_subscriber_spec.rb +++ b/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 diff --git a/sentry-rails/spec/sentry/rails/log_subscribers/action_mailer_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/log_subscribers/action_mailer_subscriber_spec.rb index cea1158cc..1369b5d07 100644 --- a/sentry-rails/spec/sentry/rails/log_subscribers/action_mailer_subscriber_spec.rb +++ b/sentry-rails/spec/sentry/rails/log_subscribers/action_mailer_subscriber_spec.rb @@ -38,7 +38,7 @@ expect(log_event[:attributes][:duration_ms][:value]).to be > 0 expect(log_event[:attributes][:perform_deliveries][:value]).to be true expect(log_event[:attributes][:delivery_method][:value]).to eq(:test) - 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") expect(log_event[:attributes][:date]).to be_present end diff --git a/sentry-rails/spec/sentry/rails/log_subscribers/active_job_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/log_subscribers/active_job_subscriber_spec.rb index 3d24aa69f..90ef7181c 100644 --- a/sentry-rails/spec/sentry/rails/log_subscribers/active_job_subscriber_spec.rb +++ b/sentry-rails/spec/sentry/rails/log_subscribers/active_job_subscriber_spec.rb @@ -26,7 +26,7 @@ expect(log_event[:level]).to eq("info") expect(log_event[:attributes][:job_class][:value]).to eq("NormalJob") expect(log_event[:attributes][:duration_ms][:value]).to be > 0 - 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 job enqueue events when jobs are enqueued" do diff --git a/sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb index b8e575083..3f4c578a0 100644 --- a/sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb +++ b/sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb @@ -25,7 +25,7 @@ expect(log_event[:level]).to eq("info") expect(log_event[:attributes][:sql][:value]).to include("INSERT INTO") expect(log_event[:attributes][:duration_ms][:value]).to be > 0 - 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 SELECT queries with proper attributes" do diff --git a/sentry-rails/spec/sentry/rails/structured_logging_spec.rb b/sentry-rails/spec/sentry/rails/structured_logging_spec.rb index 0c7aae44e..14f0fd86a 100644 --- a/sentry-rails/spec/sentry/rails/structured_logging_spec.rb +++ b/sentry-rails/spec/sentry/rails/structured_logging_spec.rb @@ -58,7 +58,7 @@ expect(sentry_logs).not_to be_empty rails_log_events = sentry_logs.select { |log| - log.dig(:attributes, "sentry.origin", :value) == "auto.logger.rails.log_subscriber" + log.dig(:attributes, "sentry.origin", :value) == "auto.log.rails.log_subscriber" } expect(rails_log_events).not_to be_empty diff --git a/sentry-ruby/lib/sentry/std_lib_logger.rb b/sentry-ruby/lib/sentry/std_lib_logger.rb index 6d0697ada..fcae1f49f 100644 --- a/sentry-ruby/lib/sentry/std_lib_logger.rb +++ b/sentry-ruby/lib/sentry/std_lib_logger.rb @@ -12,7 +12,7 @@ module StdLibLogger 4 => :fatal }.freeze - ORIGIN = "auto.logger.ruby.std_logger" + ORIGIN = "auto.log.ruby.std_logger" def add(severity, message = nil, progname = nil, &block) result = super diff --git a/sentry-ruby/spec/isolated/std_lib_logger_spec.rb b/sentry-ruby/spec/isolated/std_lib_logger_spec.rb index 0428c4daf..21674a8d7 100644 --- a/sentry-ruby/spec/isolated/std_lib_logger_spec.rb +++ b/sentry-ruby/spec/isolated/std_lib_logger_spec.rb @@ -57,7 +57,7 @@ expect(log_event[:level]).to eql(level) expect(log_event[:body]).to eql("Hello World") - expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.ruby.std_logger") + expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.ruby.std_logger") end end end diff --git a/sentry-ruby/spec/sentry_spec.rb b/sentry-ruby/spec/sentry_spec.rb index a2a94c43e..8428f3abd 100644 --- a/sentry-ruby/spec/sentry_spec.rb +++ b/sentry-ruby/spec/sentry_spec.rb @@ -402,7 +402,7 @@ it "includes sentry.origin attribute when origin is provided" do expect do - described_class.capture_log("Database query executed", level: :info, origin: "auto.logger.rails.log_subscriber") + described_class.capture_log("Database query executed", level: :info, origin: "auto.log.rails.log_subscriber") end.to_not change { sentry_events.count } Sentry.get_current_client.flush @@ -414,7 +414,7 @@ expect(log_event[:level]).to eq("info") expect(log_event[:body]).to eq("Database query executed") expect(log_event[:attributes]).to have_key("sentry.origin") - expect(log_event[:attributes]["sentry.origin"]).to eq({ value: "auto.logger.rails.log_subscriber", type: "string" }) + expect(log_event[:attributes]["sentry.origin"]).to eq({ value: "auto.log.rails.log_subscriber", type: "string" }) end it "does not include sentry.origin attribute when origin is not provided" do