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

Fix logback appender on android #13234

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Fix logback appender on android #13234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions ...a/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ public final class LoggingEventMapper {
private static final AttributeKey<List<String>> LOG_BODY_PARAMETERS =
AttributeKey.stringArrayKey("log.body.parameters");

private static final ClassValue<FieldReader> valueField =
new ClassValue<FieldReader>() {
@Override
protected FieldReader computeValue(Class<?> type) {
return createFieldReader(type);
}
};

private final boolean captureExperimentalAttributes;
private final List<String> captureMdcAttributes;
private final boolean captureAllMdcAttributes;
Expand Down Expand Up @@ -496,7 +488,7 @@ private static void captureLogstashMarker(AttributesBuilder attributes, Marker m

private static void captureLogstashMarkerAttributes(
AttributesBuilder attributes, Object logstashMarker) {
FieldReader fieldReader = valueField.get(logstashMarker.getClass());
FieldReader fieldReader = LogstashFieldReaderHolder.valueField.get(logstashMarker.getClass());
if (fieldReader != null) {
fieldReader.read(attributes, logstashMarker);
}
Expand Down Expand Up @@ -591,6 +583,8 @@ private static boolean supportsLogstashMarkers() {
Class.forName("net.logstash.logback.marker.LogstashMarker");
Class.forName("net.logstash.logback.marker.SingleFieldAppendingMarker");
Class.forName("net.logstash.logback.marker.MapEntriesAppendingMarker");
// missing in some android versions, used for capturing logstash attributes
Class.forName("java.lang.ClassValue");
} catch (ClassNotFoundException e) {
return false;
}
Expand All @@ -602,6 +596,17 @@ private interface FieldReader {
void read(AttributesBuilder attributes, Object logstashMarker);
}

private static class LogstashFieldReaderHolder {
// keeping this field in a separate class because ClassValue is missing in some android versions
static final ClassValue<FieldReader> valueField =
new ClassValue<FieldReader>() {
@Override
protected FieldReader computeValue(Class<?> type) {
return createFieldReader(type);
}
};
}

/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
Expand Down
Loading