Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion sentry-rails/lib/sentry/rails/log_subscriber.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sentry-rails/spec/sentry/rails/structured_logging_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sentry-ruby/lib/sentry/std_lib_logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sentry-ruby/spec/isolated/std_lib_logger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sentry-ruby/spec/sentry_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading