Skip to content
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

Jump to bottom

support for adding baggage to log4j 2 ContextData #8810

Merged
merged 1 commit into from
Jul 4, 2023
Merged

support for adding baggage to log4j 2 ContextData #8810

merged 1 commit into from
Jul 4, 2023

Conversation

lu-xiaoshuang
Copy link
Contributor

No description provided.

@lu-xiaoshuang lu-xiaoshuang requested a review from a team as a code owner June 27, 2023 09:16
@github-actions github-actions bot requested a review from theletterf June 27, 2023 09:16
mateuszrzeszutek
mateuszrzeszutek reviewed Jun 27, 2023
View reviewed changes
Copy link
Member

@mateuszrzeszutek mateuszrzeszutek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing @lu-xiaoshuang !
I left a couple comments.

...etry/javaagent/instrumentation/log4j/contextdata/v2_7/SpanDecoratingContextDataInjector.java Outdated Show resolved Hide resolved
...etry/javaagent/instrumentation/log4j/contextdata/v2_7/SpanDecoratingContextDataInjector.java Outdated Show resolved Hide resolved
.../opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java Outdated Show resolved Hide resolved
.../opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java Outdated Show resolved Hide resolved
docs/logger-mdc-instrumentation.md Outdated Show resolved Hide resolved
...rumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/README.md Outdated Show resolved Hide resolved
@lu-xiaoshuang
Copy link
Contributor Author

@mateuszrzeszutek update completed.

mateuszrzeszutek
mateuszrzeszutek reviewed Jun 28, 2023
View reviewed changes
docs/logger-mdc-instrumentation.md Outdated Show resolved Hide resolved
...etry/javaagent/instrumentation/log4j/contextdata/v2_7/SpanDecoratingContextDataInjector.java
@@ -43,6 +54,14 @@ public StringMap injectContextData(List<Property> list, StringMap stringMap) {
newContextData.putValue(TRACE_ID, currentContext.getTraceId());
newContextData.putValue(SPAN_ID, currentContext.getSpanId());
newContextData.putValue(TRACE_FLAGS, currentContext.getTraceFlags().asHex());

if (BAGGAGE_ENABLED) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add tests for the new feature? You can take a look at the logback implementation and do it in a similar way

opentelemetry-java-instrumentation/instrumentation/logback/logback-mdc-1.0/javaagent/build.gradle.kts

Lines 15 to 21 in 47159e6

val addBaggageTest by registering(JvmTestSuite::class) {
targets {
all {
testTask.configure {
jvmArgs("-Dotel.instrumentation.logback-mdc.add-baggage=true")
}
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. I am not familiar with the unit testing modules of this project. It would be great if some volunteers could provide testing cases in future. By the way, my private built agent with this feature works well for me.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'll create a follow-up task for that instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#8863

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure ~

instrumentation/logback/logback-mdc-1.0/javaagent/README.md Outdated Show resolved Hide resolved
mateuszrzeszutek
mateuszrzeszutek approved these changes Jul 4, 2023
View reviewed changes
...etry/javaagent/instrumentation/log4j/contextdata/v2_7/SpanDecoratingContextDataInjector.java
@@ -43,6 +54,14 @@ public StringMap injectContextData(List<Property> list, StringMap stringMap) {
newContextData.putValue(TRACE_ID, currentContext.getTraceId());
newContextData.putValue(SPAN_ID, currentContext.getSpanId());
newContextData.putValue(TRACE_FLAGS, currentContext.getTraceFlags().asHex());

if (BAGGAGE_ENABLED) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'll create a follow-up task for that instead.

@mateuszrzeszutek mateuszrzeszutek mentioned this pull request Jul 4, 2023
Closed
@mateuszrzeszutek
Copy link
Member

Thanks @lu-xiaoshuang !

@mateuszrzeszutek mateuszrzeszutek merged commit a410cde into open-telemetry:main Jul 4, 2023
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mateuszrzeszutek mateuszrzeszutek mateuszrzeszutek approved these changes

@theletterf theletterf Awaiting requested review from theletterf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lu-xiaoshuang @mateuszrzeszutek