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

Merge pull request #134 from DataDog/tyler/logging 

Reduce noise generated when injecting classes into classloader
This commit is contained in:
Tyler Benson 2017-09-19 15:03:11 -07:00 committed by GitHub
parent b988f27751 19af7840fb
commit 20fb09c0fd
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dd-java-agent/src/main/java/com/datadoghq/agent/ClassLoaderIntegrationInjector.java
View File

@ -3,6 +3,9 @@ package com.datadoghq.agent;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -13,7 +16,16 @@ public class ClassLoaderIntegrationInjector {
private final Map<ClassLoader, Method> invocationPoints = Maps.newConcurrentMap(); private final Map<ClassLoader, Method> invocationPoints = Maps.newConcurrentMap();
public ClassLoaderIntegrationInjector(final Map<ZipEntry, byte[]> entries) { public ClassLoaderIntegrationInjector(final Map<ZipEntry, byte[]> entries) {
this.entries = entries; this.entries = Maps.newHashMap(entries);
for (final Iterator<Map.Entry<ZipEntry, byte[]>> it = entries.entrySet().iterator();
it.hasNext();
) {
final Map.Entry<ZipEntry, byte[]> entry = it.next();
if (!entry.getKey().getName().endsWith(".class")) {
// remove all non-class files
it.remove();
}
}
} }
public void inject(final ClassLoader cl) { public void inject(final ClassLoader cl) {
@ -21,31 +33,31 @@ public class ClassLoaderIntegrationInjector {
final Method inovcationPoint = getInovcationPoint(cl); final Method inovcationPoint = getInovcationPoint(cl);
final Map<ZipEntry, byte[]> toInject = Maps.newHashMap(entries); final Map<ZipEntry, byte[]> toInject = Maps.newHashMap(entries);
final Map<ZipEntry, byte[]> injectedEntries = Maps.newHashMap(); final Map<ZipEntry, byte[]> injectedEntries = Maps.newHashMap();
final List<Throwable> lastErrors = new LinkedList<>();
boolean successfulyAdded = true; boolean successfulyAdded = true;
while (!toInject.isEmpty() && successfulyAdded) { while (!toInject.isEmpty() && successfulyAdded) {
log.debug("Attempting to inject {} entries into {}", toInject.size(), cl); log.debug("Attempting to inject {} entries into {}", toInject.size(), cl);
successfulyAdded = false; successfulyAdded = false;
lastErrors.clear();
for (final Map.Entry<ZipEntry, byte[]> entry : toInject.entrySet()) { for (final Map.Entry<ZipEntry, byte[]> entry : toInject.entrySet()) {
final String name = entry.getKey().getName();
if (!name.endsWith(".class")) {
continue;
}
final byte[] bytes = entry.getValue(); final byte[] bytes = entry.getValue();
try { try {
inovcationPoint.invoke(cl, bytes, 0, bytes.length); inovcationPoint.invoke(cl, bytes, 0, bytes.length);
injectedEntries.put(entry.getKey(), entry.getValue()); injectedEntries.put(entry.getKey(), entry.getValue());
successfulyAdded = true; successfulyAdded = true;
} catch (final InvocationTargetException e) { } catch (final InvocationTargetException e) {
log.debug( lastErrors.add(e);
"Error calling 'defineClass' method on {} for entry {}: {}",
cl,
entry,
e.getMessage());
log.debug("Error Details", e);
} }
} }
toInject.keySet().removeAll(injectedEntries.keySet()); toInject.keySet().removeAll(injectedEntries.keySet());
} }
log.info("Successfully injected {} classes into {}", injectedEntries.size(), cl);
log.info("Failed injecting {} classes into {}", toInject.size(), cl);
log.debug("\nSuccesses: {}", injectedEntries);
log.debug("\nFailures: {}", toInject);
for (final Throwable error : lastErrors) {
log.debug("Injection error", error.getCause());
}
} catch (final NoSuchMethodException e) { } catch (final NoSuchMethodException e) {
log.error("Error getting 'defineClass' method from {}", cl); log.error("Error getting 'defineClass' method from {}", cl);

2
dd-java-agent/src/main/java/com/datadoghq/agent/InstrumentationRulesManager.java
View File

@ -102,7 +102,7 @@ public class InstrumentationRulesManager {
} }
initializedClassloaders.add(classLoader); initializedClassloaders.add(classLoader);
} }
log.info("Initializing on classloader ", classLoader); log.info("Initializing on classloader {}", classLoader);
injector.inject(classLoader); injector.inject(classLoader);