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

Fix android desugaring for HashMap.forEach (#5468)

This commit is contained in:
Lauri Tulmin 2022-03-01 01:46:25 +02:00 committed by GitHub
parent 96906741c3
commit c8c115d13f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/UnsafeAttributes.java
View File

@ -10,6 +10,7 @@ import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.BiConsumer;
/** /**
* The {@link AttributesBuilder} and {@link Attributes} used by the instrumentation API. We are able * The {@link AttributesBuilder} and {@link Attributes} used by the instrumentation API. We are able
@ -68,4 +69,12 @@ final class UnsafeAttributes extends HashMap<AttributeKey<?>, Object>
attributes.forEach(this::put); attributes.forEach(this::put);
return this; return this;
} }
@Override
public void forEach(BiConsumer<? super AttributeKey<?>, ? super Object> action) {
// https://github.com/open-telemetry/opentelemetry-java/issues/4161
// Help out android desugaring by having an explicit call to HashMap.forEach, when forEach is
// just called through Attributes.forEach desugaring is unable to correctly handle it.
super.forEach(action);
}
} }