From 2ee4ee116d6fd1e531775d87108e355bc08aa6e0 Mon Sep 17 00:00:00 2001 From: Evgeniy Zuikin Date: Sat, 6 Jan 2024 01:41:53 +0700 Subject: [PATCH] Remove mdc attributes prefix (#9536) Co-authored-by: Trask Stalnaker --- .../jbosslogmanager/appender/v1_1/LoggingEventMapper.java | 3 +-- .../jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java | 4 ++-- .../log4j/appender/v1_2/LogEventMapper.java | 2 +- .../instrumentation/log4j/appender/v1_2/Log4j1Test.java | 4 ++-- .../instrumentation/log4j/appender/v2_17/Log4j2Test.java | 4 ++-- .../log4j/appender/v2_17/Slf4jToLog4jTest.java | 4 ++-- .../log4j/appender/v2_17/internal/LogEventMapper.java | 3 +-- .../appender/v2_17/AbstractOpenTelemetryAppenderTest.java | 3 +-- .../log4j/appender/v2_17/internal/LogEventMapperTest.java | 7 ++----- .../instrumentation/logback/appender/v1_0/LogbackTest.java | 4 ++-- .../logback/appender/v1_0/internal/LoggingEventMapper.java | 2 +- .../appender/v1_0/AbstractOpenTelemetryAppenderTest.java | 6 ++---- .../appender/v1_0/internal/LoggingEventMapperTest.java | 7 +++---- 13 files changed, 22 insertions(+), 31 deletions(-) diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java index 69a5c4ad2b..e028324b6b 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java @@ -127,8 +127,7 @@ public final class LoggingEventMapper { } public static AttributeKey getMdcAttributeKey(String key) { - return mdcAttributeKeys.computeIfAbsent( - key, k -> AttributeKey.stringKey("jboss-logmanager.mdc." + k)); + return mdcAttributeKeys.computeIfAbsent(key, AttributeKey::stringKey); } private static Severity levelToSeverity(java.util.logging.Level level) { diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java index ac57690cfe..b74459aa82 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java @@ -205,8 +205,8 @@ class JbossLogmanagerTest { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(AttributeKey.stringKey("jboss-logmanager.mdc.key1"), "val1"), - equalTo(AttributeKey.stringKey("jboss-logmanager.mdc.key2"), "val2"), + equalTo(AttributeKey.stringKey("key1"), "val1"), + equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); } diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index 3bb28d0e24..d051fe832b 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -135,7 +135,7 @@ public final class LogEventMapper { } private static AttributeKey getMdcAttributeKey(String key) { - return mdcAttributeKeys.computeIfAbsent(key, k -> AttributeKey.stringKey("log4j.mdc." + k)); + return mdcAttributeKeys.computeIfAbsent(key, AttributeKey::stringKey); } private static Severity levelToSeverity(Priority level) { diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java index fec5218c40..eec3b5ba42 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java @@ -155,8 +155,8 @@ class Log4j1Test { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(AttributeKey.stringKey("log4j.mdc.key1"), "val1"), - equalTo(AttributeKey.stringKey("log4j.mdc.key2"), "val2"), + equalTo(AttributeKey.stringKey("key1"), "val1"), + equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); } 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 3334342928..bd78aec7b5 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 @@ -143,8 +143,8 @@ class Log4j2Test { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(AttributeKey.stringKey("log4j.context_data.key1"), "val1"), - equalTo(AttributeKey.stringKey("log4j.context_data.key2"), "val2"), + equalTo(AttributeKey.stringKey("key1"), "val1"), + equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); } diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java index ac2c848f78..877298562f 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java @@ -132,8 +132,8 @@ class Slf4jToLog4jTest { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(AttributeKey.stringKey("log4j.context_data.key1"), "val1"), - equalTo(AttributeKey.stringKey("log4j.context_data.key2"), "val2"), + equalTo(AttributeKey.stringKey("key1"), "val1"), + equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); } 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 ac0a0b3046..121250b19d 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 @@ -176,8 +176,7 @@ public final class LogEventMapper { } public static AttributeKey getContextDataAttributeKey(String key) { - return contextDataAttributeKeyCache.computeIfAbsent( - key, k -> AttributeKey.stringKey("log4j.context_data." + k)); + return contextDataAttributeKeyCache.computeIfAbsent(key, AttributeKey::stringKey); } public static AttributeKey getMapMessageAttributeKey(String key) { 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 c013573c04..9378bccf3c 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 @@ -166,8 +166,7 @@ abstract class AbstractOpenTelemetryAppenderTest { .hasInstrumentationScope(instrumentationScopeInfo) .hasBody("log message 1") .hasAttributesSatisfyingExactly( - equalTo(stringKey("log4j.context_data.key1"), "val1"), - equalTo(stringKey("log4j.context_data.key2"), "val2")); + equalTo(stringKey("key1"), "val1"), equalTo(stringKey("key2"), "val2")); } @Test 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 1cc86606e1..793da82e0b 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 @@ -59,8 +59,7 @@ class LogEventMapperTest { mapper.captureContextDataAttributes(attributes, contextData); // then - assertThat(attributes.build()) - .containsOnly(attributeEntry("log4j.context_data.key2", "value2")); + assertThat(attributes.build()).containsOnly(attributeEntry("key2", "value2")); } @Test @@ -79,9 +78,7 @@ class LogEventMapperTest { // then assertThat(attributes.build()) - .containsOnly( - attributeEntry("log4j.context_data.key1", "value1"), - attributeEntry("log4j.context_data.key2", "value2")); + .containsOnly(attributeEntry("key1", "value1"), attributeEntry("key2", "value2")); } @Test diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index 1af95465e3..5b1798e398 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -193,8 +193,8 @@ class LogbackTest { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(AttributeKey.stringKey("logback.mdc.key1"), "val1"), - equalTo(AttributeKey.stringKey("logback.mdc.key2"), "val2"), + equalTo(AttributeKey.stringKey("key1"), "val1"), + equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index a00b1753d9..4ad2d5e0d3 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -183,7 +183,7 @@ public final class LoggingEventMapper { } public static AttributeKey getMdcAttributeKey(String key) { - return mdcAttributeKeys.computeIfAbsent(key, k -> AttributeKey.stringKey("logback.mdc." + k)); + return mdcAttributeKeys.computeIfAbsent(key, AttributeKey::stringKey); } private static void setThrowable(AttributesBuilder attributes, Throwable throwable) { diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java index dea7610db9..5d2e6a1c2e 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java @@ -168,10 +168,8 @@ abstract class AbstractOpenTelemetryAppenderTest { assertThat(logData.getInstrumentationScopeInfo()).isEqualTo(instrumentationScopeInfo); assertThat(logData.getBody().asString()).isEqualTo("log message 1"); assertThat(logData.getAttributes().size()).isEqualTo(2 + 4); // 4 code attributes - assertThat(logData.getAttributes().get(AttributeKey.stringKey("logback.mdc.key1"))) - .isEqualTo("val1"); - assertThat(logData.getAttributes().get(AttributeKey.stringKey("logback.mdc.key2"))) - .isEqualTo("val2"); + assertThat(logData.getAttributes().get(AttributeKey.stringKey("key1"))).isEqualTo("val1"); + assertThat(logData.getAttributes().get(AttributeKey.stringKey("key2"))).isEqualTo("val2"); } @Test diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java index 7bbca69549..1f43c1df62 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java @@ -48,8 +48,7 @@ class LoggingEventMapperTest { mapper.captureMdcAttributes(attributes, contextData); // then - assertThat(attributes.build()) - .containsOnly(entry(AttributeKey.stringKey("logback.mdc.key2"), "value2")); + assertThat(attributes.build()).containsOnly(entry(AttributeKey.stringKey("key2"), "value2")); } @Test @@ -68,7 +67,7 @@ class LoggingEventMapperTest { // then assertThat(attributes.build()) .containsOnly( - entry(AttributeKey.stringKey("logback.mdc.key1"), "value1"), - entry(AttributeKey.stringKey("logback.mdc.key2"), "value2")); + entry(AttributeKey.stringKey("key1"), "value1"), + entry(AttributeKey.stringKey("key2"), "value2")); } }