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

Retry strict context check failures for library instrumenation tests (#4826)

This commit is contained in:
Lauri Tulmin 2021-12-08 01:35:18 +02:00 committed by GitHub
parent 902748cfd5
commit bba587ea01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/util/ContextStorageCloser.java
View File

@ -30,7 +30,7 @@ public final class ContextStorageCloser {
}
private static void cleanup(AutoCloseable storage) throws Exception {
ContextRestorer restorer = ContextRestorer.create();
ContextRestorer restorer = ContextRestorer.create((ContextStorage) storage);
if (restorer == null) {
storage.close();
return;
@ -43,6 +43,7 @@ public final class ContextStorageCloser {
.ignoreException(AssertionError.class)
.atMost(Duration.ofSeconds(10))
.pollInterval(Duration.ofSeconds(1))
.pollDelay(Duration.ZERO)
.until(() -> restorer.runWithRestore(storage));
}
@ -74,18 +75,15 @@ public final class ContextStorageCloser {
}
}
static ContextRestorer create()
throws NoSuchFieldException, IllegalAccessException, ClassNotFoundException {
Object strictContextStorage = getStrictContextStorage();
static ContextRestorer create(ContextStorage storage)
throws NoSuchFieldException, IllegalAccessException {
Object strictContextStorage = getStrictContextStorage(storage);
if (strictContextStorage == null) {
return null;
}
Object pendingScopes = getStrictContextStoragePendingScopes(strictContextStorage);
Class<?> pendingScopesClass =
Class.forName(
"io.opentelemetry.javaagent.shaded.io.opentelemetry.context.StrictContextStorage$PendingScopes");
Field mapField = pendingScopesClass.getDeclaredField("map");
Object pendingScopes = getStrictContextStoragePendingScopes(strictContextStorage);
Field mapField = pendingScopes.getClass().getDeclaredField("map");
mapField.setAccessible(true);
@SuppressWarnings("unchecked")
ConcurrentHashMap<Object, Object> map =
@ -101,17 +99,20 @@ public final class ContextStorageCloser {
}
private static Object getStrictContextStoragePendingScopes(Object strictContextStorage)
throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
Class<?> strictContextStorageClass =
Class.forName(
"io.opentelemetry.javaagent.shaded.io.opentelemetry.context.StrictContextStorage");
Field field = strictContextStorageClass.getDeclaredField("pendingScopes");
throws NoSuchFieldException, IllegalAccessException {
Field field = strictContextStorage.getClass().getDeclaredField("pendingScopes");
field.setAccessible(true);
return field.get(strictContextStorage);
}
private static Object getStrictContextStorage()
private static Object getStrictContextStorage(ContextStorage storage)
throws NoSuchFieldException, IllegalAccessException {
// in library instrumentation tests we already have access to StrictContextStorage
if (storage.getClass().getName().contains("StrictContextStorage")) {
return storage;
}
// in javaagent tests the storage we get is wrapped by opentelemetry api bridge, find the
// actual storage
Object contextStorage = getAgentContextStorage();
if (contextStorage == null) {
return null;