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

Small cleanup (#1603) 

* Small cleanup

* Format
This commit is contained in:
Nikita Salnikov-Tarnovski 2020-11-10 14:55:53 +02:00 committed by GitHub
parent 76f6b8aa49
commit d6c2de4389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javaagent-spi/src/main/java/io/opentelemetry/javaagent/spi/TracerCustomizer.java
View File

@ -16,7 +16,7 @@ import io.opentelemetry.sdk.trace.config.TraceConfig;
* the provided {@link TracerSdkProvider} be configured e.g. by calling {@link
* TracerSdkProvider#updateActiveTraceConfig(TraceConfig)}, but static methods on {@link
* io.opentelemetry.api.OpenTelemetry}, e.g., {@link
* io.opentelemetry.api.OpenTelemetry#setPropagators(ContextPropagators)} can be used as well.
* io.opentelemetry.api.OpenTelemetry#setGlobalPropagators(ContextPropagators)} can be used as well.
*
* <p>An implementation of {@link TracerCustomizer} can either be provided as part of an initializer
* JAR, using the {@code otel.initializer.jar} property or can be included in the same JAR as the

21
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
View File

@ -16,7 +16,6 @@ import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.config.Config;
import io.opentelemetry.instrumentation.api.internal.BootstrapPackagePrefixesHolder;
import io.opentelemetry.javaagent.instrumentation.api.OpenTelemetrySdkAccess;
import io.opentelemetry.javaagent.instrumentation.api.OpenTelemetrySdkAccess.ForceFlusher;
import io.opentelemetry.javaagent.instrumentation.api.SafeServiceLoader;
import io.opentelemetry.javaagent.spi.BootstrapPackagesProvider;
import io.opentelemetry.javaagent.tooling.config.ConfigInitializer;
@ -30,7 +29,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
@ -65,7 +63,7 @@ public class AgentInstaller {
public static void installBytebuddyAgent(Instrumentation inst) {
if (Config.get().getBooleanProperty(TRACE_ENABLED_CONFIG, true)) {
installBytebuddyAgent(inst, false, new AgentBuilder.Listener[0]);
installBytebuddyAgent(inst, false);
} else {
log.debug("Tracing is disabled, not installing instrumentations.");
}
@ -102,12 +100,8 @@ public class AgentInstaller {
}
OpenTelemetrySdkAccess.internalSetForceFlush(
new ForceFlusher() {
@Override
public void run(int timeout, TimeUnit unit) {
OpenTelemetrySdk.getGlobalTracerManagement().forceFlush().join(timeout, unit);
}
});
(timeout, unit) ->
OpenTelemetrySdk.getGlobalTracerManagement().forceFlush().join(timeout, unit));
INSTRUMENTATION = inst;
@ -180,7 +174,7 @@ public class AgentInstaller {
private static Iterable<Instrumenter> orderInstrumenters(Iterable<Instrumenter> instrumenters) {
List<Instrumenter> orderedInstrumenters = new ArrayList<>();
instrumenters.forEach(orderedInstrumenters::add);
Collections.sort(orderedInstrumenters, Comparator.comparingInt(Instrumenter::getOrder));
orderedInstrumenters.sort(Comparator.comparingInt(Instrumenter::getOrder));
return orderedInstrumenters;
}
@ -341,11 +335,8 @@ public class AgentInstaller {
*/
public static void registerClassLoadCallback(String className, Runnable callback) {
synchronized (CLASS_LOAD_CALLBACKS) {
List<Runnable> callbacks = CLASS_LOAD_CALLBACKS.get(className);
if (callbacks == null) {
callbacks = new ArrayList<>();
CLASS_LOAD_CALLBACKS.put(className, callbacks);
}
List<Runnable> callbacks =
CLASS_LOAD_CALLBACKS.computeIfAbsent(className, k -> new ArrayList<>());
callbacks.add(callback);
}
}