diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java index 875a7b24f13d..f9aac838a1ab 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java @@ -186,8 +186,8 @@ void testStringMapMessage() { codeFunctionAssertions(Log4j2Test.class, "testStringMapMessage"); assertions.addAll(codeFileAndLineAssertions("Log4j2Test.java")); assertions.addAll(threadAttributesAssertions()); - assertions.add(equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1")); - assertions.add(equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2")); + assertions.add(equalTo(AttributeKey.stringKey("key1"), "val1")); + assertions.add(equalTo(AttributeKey.stringKey("key2"), "val2")); testing.waitAndAssertLogRecords( logRecord -> @@ -210,7 +210,7 @@ void testStringMapMessageWithSpecialAttribute() { codeFunctionAssertions(Log4j2Test.class, "testStringMapMessageWithSpecialAttribute"); assertions.addAll(codeFileAndLineAssertions("Log4j2Test.java")); assertions.addAll(threadAttributesAssertions()); - assertions.add(equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1")); + assertions.add(equalTo(AttributeKey.stringKey("key1"), "val1")); testing.waitAndAssertLogRecords( logRecord -> @@ -233,8 +233,8 @@ void testStructuredDataMapMessage() { codeFunctionAssertions(Log4j2Test.class, "testStructuredDataMapMessage"); assertions.addAll(codeFileAndLineAssertions("Log4j2Test.java")); assertions.addAll(threadAttributesAssertions()); - assertions.add(equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1")); - assertions.add(equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2")); + assertions.add(equalTo(AttributeKey.stringKey("key1"), "val1")); + assertions.add(equalTo(AttributeKey.stringKey("key2"), "val2")); testing.waitAndAssertLogRecords( logRecord -> diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java index 36ec63fcd186..9ce2627c4438 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java @@ -230,8 +230,7 @@ public static AttributeKey getContextDataAttributeKey(String key) { } public static AttributeKey getMapMessageAttributeKey(String key) { - return mapMessageAttributeKeyCache.computeIfAbsent( - key, k -> AttributeKey.stringKey("log4j.map_message." + k)); + return mapMessageAttributeKeyCache.computeIfAbsent(key, AttributeKey::stringKey); } private static void setThrowable( diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java index 9b51bf835faa..0cea625db5ba 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java @@ -199,8 +199,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 @@ -224,7 +224,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 @@ -263,8 +263,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 addLocationAttributes( diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java index aeccb412fcd9..13a3d7c9bf9a 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/LogReplayOpenTelemetryAppenderTest.java @@ -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 @@ -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 addLocationAttributes( diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapperTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapperTest.java index ce374ff97b9b..0232c332d604 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapperTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapperTest.java @@ -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 @@ -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 @@ -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> {