Skip to content

Commit c6d98f1

Browse files
authored
fix(logging): auto.logger -> auto.log (#2749)
* fix(logging): auto.logger -> auto.log * Update CHANGELOG
1 parent 1f80107 commit c6d98f1

File tree

10 files changed

+17
-11
lines changed

10 files changed

+17
-11
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## Unreleased
2+
3+
### Bug Fixes
4+
5+
- The `sentry.origin` log event attribute is now correctly prefixed with `auto.log` ([#2749](https://github.com/getsentry/sentry-ruby/pull/2749))
6+
17
## 5.28.0
28

39
### Features
@@ -7,7 +13,7 @@
713
### Miscellaneous
814

915
- Deprecate all Metrics related APIs [#2726](https://github.com/getsentry/sentry-ruby/pull/2726)
10-
16+
1117
Sentry [no longer has the Metrics Beta offering](https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Metrics-Beta-Ended-on-October-7th) so
1218
all the following APIs linked to Metrics have been deprecated and will be removed in the next major.
1319

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module Rails
2727
# end
2828
# end
2929
class LogSubscriber < ActiveSupport::LogSubscriber
30-
ORIGIN = "auto.logger.rails.log_subscriber"
30+
ORIGIN = "auto.log.rails.log_subscriber"
3131

3232
class << self
3333
if ::Rails.version.to_f < 6.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
expect(log_event[:attributes][:method][:value]).to eq("GET")
3636
expect(log_event[:attributes][:path][:value]).to eq("/world")
3737
expect(log_event[:attributes][:format][:value]).to eq(:html)
38-
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.rails.log_subscriber")
38+
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.rails.log_subscriber")
3939
end
4040

4141
it "logs bad requests appropriately" do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
expect(log_event[:attributes][:duration_ms][:value]).to be > 0
3939
expect(log_event[:attributes][:perform_deliveries][:value]).to be true
4040
expect(log_event[:attributes][:delivery_method][:value]).to eq(:test)
41-
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.rails.log_subscriber")
41+
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.rails.log_subscriber")
4242
expect(log_event[:attributes][:date]).to be_present
4343
end
4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
expect(log_event[:level]).to eq("info")
2727
expect(log_event[:attributes][:job_class][:value]).to eq("NormalJob")
2828
expect(log_event[:attributes][:duration_ms][:value]).to be > 0
29-
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.rails.log_subscriber")
29+
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.rails.log_subscriber")
3030
end
3131

3232
it "logs job enqueue events when jobs are enqueued" do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
expect(log_event[:level]).to eq("info")
2626
expect(log_event[:attributes][:sql][:value]).to include("INSERT INTO")
2727
expect(log_event[:attributes][:duration_ms][:value]).to be > 0
28-
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.rails.log_subscriber")
28+
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.rails.log_subscriber")
2929
end
3030

3131
it "logs SELECT queries with proper attributes" do

sentry-rails/spec/sentry/rails/structured_logging_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
expect(sentry_logs).not_to be_empty
5959

6060
rails_log_events = sentry_logs.select { |log|
61-
log.dig(:attributes, "sentry.origin", :value) == "auto.logger.rails.log_subscriber"
61+
log.dig(:attributes, "sentry.origin", :value) == "auto.log.rails.log_subscriber"
6262
}
6363

6464
expect(rails_log_events).not_to be_empty

sentry-ruby/lib/sentry/std_lib_logger.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module StdLibLogger
1212
4 => :fatal
1313
}.freeze
1414

15-
ORIGIN = "auto.logger.ruby.std_logger"
15+
ORIGIN = "auto.log.ruby.std_logger"
1616

1717
def add(severity, message = nil, progname = nil, &block)
1818
result = super

sentry-ruby/spec/isolated/std_lib_logger_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
expect(log_event[:level]).to eql(level)
5959
expect(log_event[:body]).to eql("Hello World")
60-
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.logger.ruby.std_logger")
60+
expect(log_event[:attributes]["sentry.origin"][:value]).to eq("auto.log.ruby.std_logger")
6161
end
6262
end
6363
end

sentry-ruby/spec/sentry_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402

403403
it "includes sentry.origin attribute when origin is provided" do
404404
expect do
405-
described_class.capture_log("Database query executed", level: :info, origin: "auto.logger.rails.log_subscriber")
405+
described_class.capture_log("Database query executed", level: :info, origin: "auto.log.rails.log_subscriber")
406406
end.to_not change { sentry_events.count }
407407

408408
Sentry.get_current_client.flush
@@ -414,7 +414,7 @@
414414
expect(log_event[:level]).to eq("info")
415415
expect(log_event[:body]).to eq("Database query executed")
416416
expect(log_event[:attributes]).to have_key("sentry.origin")
417-
expect(log_event[:attributes]["sentry.origin"]).to eq({ value: "auto.logger.rails.log_subscriber", type: "string" })
417+
expect(log_event[:attributes]["sentry.origin"]).to eq({ value: "auto.log.rails.log_subscriber", type: "string" })
418418
end
419419

420420
it "does not include sentry.origin attribute when origin is not provided" do

0 commit comments

Comments
 (0)