Skip to content

remove the log4j.map_message prefix #13871

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

remove the log4j.map_message prefix #13871

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5e0ec5
Remove the log4j.map_message prefix from attributes from that logging…
AlchemyDing May 16, 2025
22bdc9d
fix
AlchemyDing May 19, 2025
275183c
Merge branch 'main' into feature-log4j-map-message
AlchemyDing Aug 31, 2025
aac2f28
Merge branch 'main' into feature-log4j-map-message
AlchemyDing Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...agent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ void testStringMapMessage() {
.hasSeverity(Severity.INFO)
.hasSeverityText("INFO")
.hasAttributesSatisfyingExactly(
equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"),
equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2"),
equalTo(AttributeKey.stringKey("key1"), "val1"),
equalTo(AttributeKey.stringKey("key2"), "val2"),
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(CODE_NAMESPACE, Log4j2Test.class.getName()),
Expand All @@ -214,7 +214,7 @@ void testStringMapMessageWithSpecialAttribute() {
.hasSeverity(Severity.INFO)
.hasSeverityText("INFO")
.hasAttributesSatisfyingExactly(
equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"),
equalTo(AttributeKey.stringKey("key1"), "val1"),
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(CODE_NAMESPACE, Log4j2Test.class.getName()),
Expand All @@ -238,8 +238,8 @@ void testStructuredDataMapMessage() {
.hasSeverity(Severity.INFO)
.hasSeverityText("INFO")
.hasAttributesSatisfyingExactly(
equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"),
equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2"),
equalTo(AttributeKey.stringKey("key1"), "val1"),
equalTo(AttributeKey.stringKey("key2"), "val2"),
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(CODE_NAMESPACE, Log4j2Test.class.getName()),
Expand Down
3 changes: 1 addition & 2 deletions ...n/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ public static AttributeKey<String> getContextDataAttributeKey(String key) {
}

public static AttributeKey<String> getMapMessageAttributeKey(String key) {
return mapMessageAttributeKeyCache.computeIfAbsent(
key, k -> AttributeKey.stringKey("log4j.map_message." + k));
return mapMessageAttributeKeyCache.computeIfAbsent(key, AttributeKey::stringKey);
}

private static void setThrowable(AttributesBuilder attributes, Throwable throwable) {
Expand Down
10 changes: 5 additions & 5 deletions ...opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ void logStringMapMessage() {
"logStringMapMessage",
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(stringKey("log4j.map_message.key1"), "val1"),
equalTo(stringKey("log4j.map_message.key2"), "val2"))));
equalTo(stringKey("key1"), "val1"),
equalTo(stringKey("key2"), "val2"))));
}

@Test
Expand All @@ -227,7 +227,7 @@ void logStringMapMessageWithSpecialAttribute() {
"logStringMapMessageWithSpecialAttribute",
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(stringKey("log4j.map_message.key1"), "val1"))));
equalTo(stringKey("key1"), "val1"))));
}

@Test
Expand Down Expand Up @@ -266,8 +266,8 @@ void logStructuredDataMessage() {
"logStructuredDataMessage",
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(stringKey("log4j.map_message.key1"), "val1"),
equalTo(stringKey("log4j.map_message.key2"), "val2"))));
equalTo(stringKey("key1"), "val1"),
equalTo(stringKey("key2"), "val2"))));
}

private static List<AttributeAssertion> addLocationAttributes(
Expand Down
8 changes: 4 additions & 4 deletions ...pentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ void twoLogsStringMapMessage() {
"twoLogsStringMapMessage",
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(stringKey("log4j.map_message.key1"), "val1"),
equalTo(stringKey("log4j.map_message.key2"), "val2"))));
equalTo(stringKey("key1"), "val1"),
equalTo(stringKey("key2"), "val2"))));
}

@Test
Expand Down Expand Up @@ -136,8 +136,8 @@ void twoLogsStructuredDataMessage() {
"twoLogsStructuredDataMessage",
equalTo(THREAD_NAME, Thread.currentThread().getName()),
equalTo(THREAD_ID, Thread.currentThread().getId()),
equalTo(stringKey("log4j.map_message.key1"), "val1"),
equalTo(stringKey("log4j.map_message.key2"), "val2"))));
equalTo(stringKey("key1"), "val1"),
equalTo(stringKey("key2"), "val2"))));
}

private static List<AttributeAssertion> addLocationAttributes(
Expand Down
10 changes: 3 additions & 7 deletions ...va/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void testCaptureMapMessageWithSpecialAttribute() {

// then
verify(logRecordBuilder).setBody("value2");
assertThat(attributes.build()).containsOnly(attributeEntry("log4j.map_message.key1", "value1"));
assertThat(attributes.build()).containsOnly(attributeEntry("key1", "value1"));
}

@Test
Expand All @@ -146,9 +146,7 @@ void testCaptureMapMessageWithoutSpecialAttribute() {
// then
verify(logRecordBuilder, never()).setBody(anyString());
assertThat(attributes.build())
.containsOnly(
attributeEntry("log4j.map_message.key1", "value1"),
attributeEntry("log4j.map_message.key2", "value2"));
.containsOnly(attributeEntry("key1", "value1"), attributeEntry("key2", "value2"));
}

@Test
Expand All @@ -171,9 +169,7 @@ void testCaptureStructuredDataMessage() {
// then
verify(logRecordBuilder).setBody("a message");
assertThat(attributes.build())
.containsOnly(
attributeEntry("log4j.map_message.key1", "value1"),
attributeEntry("log4j.map_message.message", "value2"));
.containsOnly(attributeEntry("key1", "value1"), attributeEntry("message", "value2"));
}

private enum ContextDataAccessorImpl implements ContextDataAccessor<Map<String, String>> {
Expand Down
Loading