Sync internal changes #15
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
- log4j 2.17.0 - grpc 1.43.0 - jackson-databind 2.13.1 Signed-off-by: Nick Hill <[email protected]>
pvaneck
reviewed
Jan 7, 2022
src/test/java/com/ibm/watson/modelmesh/ModelMeshHeaderLoggingTest.java
Outdated
Show resolved
Hide resolved
Motivation
Some users have expressed an interest in the ability to specify particular gRPC request headers (metadata) that should be included in any logs associated with the corresponding requests. Typical example of this would be a transaction id for tracing/correlation.
Modifications
Introduce new environment variable MM_LOG_REQUEST_HEADERS which can be set to a json string->string map (object) whose keys are the header names to log and values are the names of corresponding entries to insert into the logger thread context map (MDC).
Values can be either raw ascii or base64-encoded utf8; in the latter case the corresponding header name must end with "-bin".
Example:
{
"transaction_id": "txid",
"user_id-bin": "user_id"
}
Logic is encapsulated in new LogRequestHeaders class, end-to-end unit test included.
Also update base image to pick up latest java.
Result
Request header logging can be configured.
Signed-off-by: Nick Hill <[email protected]>
Motivation Updated python version in docker file as EOL for python 3.6 is 12/23/21 Modifications Updated python version to 3.8 in Dockerfile Result Using a python version that has not reached end of life. Signed-off-by: Nick Hill <[email protected]>
Addresses latest log4j CVE Signed-off-by: Nick Hill <[email protected]>
- protobuf 3.19.2 - grpc-java 1.43.2 Signed-off-by: Nick Hill <[email protected]>
|
Thanks @pvaneck, hopefully this should be good to rebase-and-merge now. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: njhill, pvaneck The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
No description provided.