feat(sentry): Add server_name option #4251
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jjbayer
approved these changes
Nov 14, 2024
Dav1dde
reviewed
Nov 14, 2024
loewenheim
commented
Nov 14, 2024
Dav1dde
approved these changes
Nov 14, 2024
relay/src/cli.rs
Outdated
| @@ -119,6 +120,7 @@ pub fn extract_config_env_vars() -> OverridableConfig { | |||
| outcome_source: None, //already extracted in params | |||
| shutdown_timeout: env::var("SHUTDOWN_TIMEOUT").ok(), | |||
| instance: env::var("RELAY_INSTANCE").ok(), | |||
| server_name: env::var("RELAY_SERVER_NAME").ok(), | |||
There was a problem hiding this comment.
We could default it to HOSTNAME.
Something like this (untested):
env::var("RELAY_SERVER_NAME").or_else(|| env::var("HOSTNAME")).ok()There was a problem hiding this comment.
I think you made a typo there
There was a problem hiding this comment.
Updated, copy paste, but get the idea, check RELAY_SERVER_NAME then fallback to HOSTNAME
There was a problem hiding this comment.
Does the HOSTNAME variable have any special meaning/are we already using it somewhere?
There was a problem hiding this comment.
A lot of (all?) kubernetes distributions set the HOSTNAME variable by default. Also e.g. bash sets it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unlike
default_tags, theserver_namealso gets set for transactions. This might aid in the investigation of https://github.com/getsentry/team-ingest/issues/587.