[5889] Bmoric/mdc manipulation tools [1/2] #7266
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
benmoriceau
changed the title
benmoriceau
changed the title
jrhizor
approved these changes
Oct 21, 2021
|
|
||
| @BeforeEach | ||
| public void init() { | ||
| MDC.clear(); |
There was a problem hiding this comment.
Suggested change
| MDC.clear(); |
From the MDC docs:
Set the current thread's context map by first clearing any existing map and then copying the map passed as parameter
It shouldn't be necessary to clear.
| CYAN("\u001b[36m"), | ||
| WHITE("\u001b[37m"); | ||
|
|
||
| private final String ainsiCode; |
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| MDC.clear(); |
There was a problem hiding this comment.
Suggested change
| MDC.clear(); |
| @@ -4,7 +4,7 @@ | |||
|
|
|||
| <!-- The following patterns mask the string apikey=<string> to apikey=***** to prevent secrets leaking. --> | |||
| <Property name="default-pattern">%d{yyyy-MM-dd HH:mm:ss}{GMT+0} %highlight{%p} %C{1.}(%M):%L - %X - %replace{%m}{apikey=[\w\-]*}{apikey=*****}%n</Property> | |||
| <Property name="docker-worker-file-pattern">%d{yyyy-MM-dd HH:mm:ss}{GMT+0} %p (%X{job_root}) %C{1}(%M):%L - %replace{%m}{apikey=[\w\-]*}{apikey=*****}%n</Property> | |||
| <Property name="docker-worker-file-pattern">%replace{%X{log_source} - }{^ - }{}%d{yyyy-MM-dd HH:mm:ss}{GMT+0} %p (%X{job_root}) %C{1}(%M):%L - %replace{%m}{apikey=[\w\-]*}{apikey=*****}%n</Property> | |||
There was a problem hiding this comment.
Can you add a comment to describe what's happening here? It's kind of difficult to work backwards to figure out what is happening here for someone not super familiar with log4j2.
| * </code> | ||
| * </pre> | ||
| */ | ||
| public class ScopedMDCChange implements AutoCloseable { |
There was a problem hiding this comment.
nit: I don't really love the name. Maybe MdcScope? Definitely not blocking.
cgardens
approved these changes
Oct 22, 2021
|
|
||
| /** | ||
| * This class is an autoClosable class that will add some specific values into the log MDC. When | ||
| * being close, it will restore the orginal MDC. It is advise to use it like that: |
There was a problem hiding this comment.
Suggested change
| * being close, it will restore the orginal MDC. It is advise to use it like that: | |
| * being closed, it will restore the original MDC. It is advised to use it like that: |
| @@ -4,7 +4,8 @@ | |||
|
|
|||
| <!-- The following patterns mask the string apikey=<string> to apikey=***** to prevent secrets leaking. --> | |||
| <Property name="default-pattern">%d{yyyy-MM-dd HH:mm:ss}{GMT+0} %highlight{%p} %C{1.}(%M):%L - %X - %replace{%m}{apikey=[\w\-]*}{apikey=*****}%n</Property> | |||
| <Property name="docker-worker-file-pattern">%d{yyyy-MM-dd HH:mm:ss}{GMT+0} %p (%X{job_root}) %C{1}(%M):%L - %replace{%m}{apikey=[\w\-]*}{apikey=*****}%n</Property> | |||
| <!-- The following patter log the application name in the beginning of the line, then a regular log line after a - separator. If the application name is not present in the context, the separator is removed --> | |||
There was a problem hiding this comment.
Suggested change
| <!-- The following patter log the application name in the beginning of the line, then a regular log line after a - separator. If the application name is not present in the context, the separator is removed --> | |
| <!-- The following pattern log the application name in the beginning of the line, then a regular log line after a - separator. If the application name is not present in the context, the separator is removed --> |
benmoriceau
changed the title
schlattk
pushed a commit
to schlattk/airbyte
that referenced
this pull request
Jan 4, 2022
This is preparing the tagging of the application that generate a log which is requested in airbytehq#5889 It is adding helper to add a color to the log and safely manipulate the MDC. It is also modifying the log4j pattern. The use of those helper will will be implemented in another PR.
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.
What
This is preparing the tagging of the application that generate a log which is requested in #5889
It is adding helper to add a color to the log and safely manipulate the MDC.
It is also modifiying the log4j pattern.
The use of those helper will will be implemented in another PR.