Skip to content

fix: handle nil environment values correctly in Sentry config #753

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 18, 2024
Merged

fix: handle nil environment values correctly in Sentry config #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion lib/sentry/config.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,10 @@ defmodule Sentry.Config do
## Helpers

defp fill_in_from_env(config, key, system_key) do
Keyword.put_new_lazy(config, key, fn -> System.get_env(system_key, nil) end)
case System.get_env(system_key) do
nil -> config
value -> Keyword.put_new(config, key, value)
end
end

# TODO: remove me on v11.0.0, :included_environments has been deprecated
Expand Down
12 changes: 12 additions & 0 deletions test/sentry/config_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,18 @@ defmodule Sentry.ConfigTest do
assert Config.validate!(environment_name: "test")[:environment_name] == "test"
end

test ":environment_name set to default" do
previous_value = Application.get_env(:sentry, :environment_name)
Application.delete_env(:sentry, :environment_name)

on_exit(fn ->
Application.put_env(:sentry, :environment_name, previous_value)
assert previous_value === Application.get_env(:sentry, :environment_name)
end)

assert Config.validate!()[:environment_name] == "production"
end

test ":environment_name from system env" do
with_system_env("SENTRY_ENVIRONMENT", "my_env", fn ->
assert Config.validate!([])[:environment_name] == "my_env"
Expand Down