Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support :all in Sentry.LoggerBackend's :metadata #605

Merged
merged 2 commits into from
Sep 4, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
### Improvements

- Make the `Sentry.HTTPClient.child_spec/0` callback optional
- Add `:all` as a possible value of the `:metadata` configuration option for `Sentry.LoggerBackend`

## 8.1.0

Expand Down
12 changes: 9 additions & 3 deletions lib/sentry/logger_backend.ex
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ defmodule Sentry.LoggerBackend do
* `:metadata` - To include non-Sentry Logger metadata in reports, the
`:metadata` key can be set to a list of keys. Metadata under those keys will
be added in the `:extra` context under the `:logger_metadata` key. Defaults
to `[]`.
to `[]`. If set to `:all`, all metadata will be included. `:all` is available
since v9.0.0 of this library.

* `:level` - The minimum [Logger level](https://hexdocs.pm/logger/Logger.html#module-levels) to send events for.
Defaults to `:error`.
* `:level` - The minimum [Logger level](https://hexdocs.pm/logger/Logger.html#module-levels
to send events for. Defaults to `:error`.

* `:capture_log_messages` - When `true`, this module will send all Logger
messages. Defaults to `false`, which will only send messages with metadata
Expand All @@ -42,6 +43,7 @@ defmodule Sentry.LoggerBackend do
metadata: [:foo_bar],
# Send messages like `Logger.error("error")` to Sentry
capture_log_messages: true

"""

@behaviour :gen_event
Expand Down Expand Up @@ -167,6 +169,10 @@ defmodule Sentry.LoggerBackend do

defp excluded_domain?(_, _), do: false

defp logger_metadata(meta, %__MODULE__{metadata: :all}) do
Map.new(meta)
end

defp logger_metadata(meta, state) do
for key <- state.metadata,
value = meta[key],
Expand Down
22 changes: 22 additions & 0 deletions test/logger_backend_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,28 @@ defmodule Sentry.LoggerBackendTest do
assert event.extra.logger_metadata == %{}
end

test "supports :all for Logger metadata" do
Logger.configure_backend(Sentry.LoggerBackend, metadata: :all)
ref = expect_sender_call()

pid = start_supervised!(TestGenServer)
Sentry.TestGenServer.add_logger_metadata(pid, :string, "string")
Sentry.TestGenServer.invalid_function(pid)

assert_receive {^ref, event}

assert event.extra.logger_metadata.string == "string"
assert event.extra.logger_metadata.domain == [:otp]
assert event.extra.logger_metadata.module == :gen_server
assert event.extra.logger_metadata.file == "gen_server.erl"
assert is_integer(event.extra.logger_metadata.time)
assert is_pid(event.extra.logger_metadata.pid)
assert {%FunctionClauseError{}, _stacktrace} = event.extra.logger_metadata.crash_reason

# Make sure that all this stuff is serializable.
assert Sentry.Client.render_event(event).extra.logger_metadata.pid =~ "#PID<"
end

test "sends all messages if :capture_log_messages is true" do
Logger.configure_backend(Sentry.LoggerBackend, capture_log_messages: true)

Expand Down