open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve attribute type for logback key value pairs (#10781)

This commit is contained in:
Lauri Tulmin 2024-03-12 09:25:03 +02:00 committed by GitHub
parent f9798519ae
commit 2df9001899
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
View File

@ -221,12 +221,25 @@ public final class LoggingEventMapper {
List<KeyValuePair> keyValuePairs = loggingEvent.getKeyValuePairs();
if (keyValuePairs != null) {
for (KeyValuePair keyValuePair : keyValuePairs) {
Object value = keyValuePair.value;
if (keyValuePair.value != null) {
// preserve type for boolean and numeric values, everything else is converted to String
if (value instanceof Boolean) {
attributes.put(keyValuePair.key, (Boolean) keyValuePair.value);
} else if (value instanceof Byte
|| value instanceof Integer
|| value instanceof Long
|| value instanceof Short) {
attributes.put(keyValuePair.key, ((Number) keyValuePair.value).longValue());
} else if (value instanceof Double || value instanceof Float) {
attributes.put(keyValuePair.key, ((Number) keyValuePair.value).doubleValue());
} else {
attributes.put(getAttributeKey(keyValuePair.key), keyValuePair.value.toString());
}
}
}
}
}
private static void captureLoggerContext(
AttributesBuilder attributes, Map<String, String> loggerContextProperties) {
@ -236,7 +249,7 @@ public final class LoggingEventMapper {
}
public static AttributeKey<String> getAttributeKey(String key) {
return attributeKeys.computeIfAbsent(key, k -> AttributeKey.stringKey(k));
return attributeKeys.computeIfAbsent(key, AttributeKey::stringKey);
}
private static boolean supportsKeyValuePairs() {

30
instrumentation/logback/logback-appender-1.0/library/src/slf4j2ApiTest/java/io/opentelemetry/instrumentation/logback/appender/v1_0/Slf4j2Test.java
View File

@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.logback.appender.v1_0;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.sdk.OpenTelemetrySdk;
@ -55,7 +56,18 @@ public class Slf4j2Test {
@Test
void keyValue() {
logger.atInfo().setMessage("log message 1").addKeyValue("key", "value").log();
logger
.atInfo()
.setMessage("log message 1")
.addKeyValue("string key", "string value")
.addKeyValue("boolean key", true)
.addKeyValue("byte key", (byte) 1)
.addKeyValue("short key", (short) 2)
.addKeyValue("int key", 3)
.addKeyValue("long key", 4L)
.addKeyValue("float key", 5.0f)
.addKeyValue("double key", 6.0)
.log();
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
assertThat(logDataList).hasSize(1);
@ -63,10 +75,18 @@ public class Slf4j2Test {
assertThat(logData.getResource()).isEqualTo(resource);
assertThat(logData.getInstrumentationScopeInfo()).isEqualTo(instrumentationScopeInfo);
assertThat(logData.getBody().asString()).isEqualTo("log message 1");
assertThat(logData.getAttributes().size()).isEqualTo(5); // 4 code attributes + 1 key value pair
assertThat(logData.getAttributes())
.hasEntrySatisfying(
AttributeKey.stringKey("key"), value -> assertThat(value).isEqualTo("value"));
assertThat(logData.getAttributes().size())
.isEqualTo(12); // 4 code attributes + 8 key value pairs
assertThat(logData)
.hasAttributesSatisfying(
equalTo(AttributeKey.stringKey("string key"), "string value"),
equalTo(AttributeKey.booleanKey("boolean key"), true),
equalTo(AttributeKey.longKey("byte key"), 1),
equalTo(AttributeKey.longKey("short key"), 2),
equalTo(AttributeKey.longKey("int key"), 3),
equalTo(AttributeKey.longKey("long key"), 4),
equalTo(AttributeKey.doubleKey("float key"), 5.0),
equalTo(AttributeKey.doubleKey("double key"), 6.0));
}
@Test