Allow for dynamic log injection configuration #2992
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
marcotc
force-pushed
the
log-config-dynamic
branch
from
3f6f50d
to
0a6f8df
Compare
marcotc
commented
Jul 24, 2023
|
|
||
| # `after_initialize` will respect the configuration from `config/initializers/datadog.rb` | ||
| # and add tags to `::ActiveSupport::TaggedLogging` | ||
| add_tags_to_logger(app) if Datadog.configuration.tracing.log_injection |
There was a problem hiding this comment.
We don't have to try to inject tag logs at the after_initialize stage anymore because we always inject a safe injection proc early, at before_initialize.
This simplifies our logic quite a bit.
TonyCTHsu
approved these changes
Jul 25, 2023
github-actions
bot
added
appsec
Merged
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.
Fixes #2542
As part of Dynamic Configuration, we want to allow users to enable or disable log injection at any time.
The main limitation we have in Ruby Tracing is that we need to patch an integration to enable log injection.
This PR enables all integrations that perform log correlation to always inject the correlation patch methods, but allow it to be safely disabled when
Datadog.configuration.tracing.log_injectionis set tofalseat runtime.Rails, for example, was making decision at the application startup that couldn't be changed later. This PR addresses that.
We still depend on users having instrumented the integration itself for correlation to work.
Our
SemanticLoggerandLogrageintegrations already support dynamic configuration of log injection; onlyRailscore logger andActiveJoblogging needed changes.