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 #966 from DataDog/landerson/wrap-instrumentation-install 

Wrap instrumentation installation with a try/catch
This commit is contained in:
Laplie Anderson 2019-08-30 14:02:13 -04:00 committed by GitHub
parent 534df900c3 f3bb22d8df
commit d03d583e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View File

@ -138,8 +138,13 @@ public class AgentInstaller {
int numInstrumenters = 0; int numInstrumenters = 0;
for (final Instrumenter instrumenter : ServiceLoader.load(Instrumenter.class)) { for (final Instrumenter instrumenter : ServiceLoader.load(Instrumenter.class)) {
log.debug("Loading instrumentation {}", instrumenter.getClass().getName()); log.debug("Loading instrumentation {}", instrumenter.getClass().getName());
agentBuilder = instrumenter.instrument(agentBuilder);
numInstrumenters++; try {
agentBuilder = instrumenter.instrument(agentBuilder);
numInstrumenters++;
} catch (final Exception | LinkageError e) {
log.error("Unable to load instrumentation {}", instrumenter.getClass().getName(), e);
}
} }
log.debug("Installed {} instrumenter(s)", numInstrumenters); log.debug("Installed {} instrumenter(s)", numInstrumenters);