Skip to content

Commit 09084bf

Browse files
committed
spotless
1 parent 3a6d15d commit 09084bf

File tree

4 files changed

+41
-34
lines changed

4 files changed

+41
-34
lines changed

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/BootDelegationInstrumentation.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,25 @@ public ElementMatcher<TypeDescription> typeMatcher() {
4949

5050
@Override
5151
public void transform(TypeTransformer transformer) {
52-
ElementMatcher.Junction<MethodDescription> methodMatcher = isMethod()
53-
.and(named("loadClass"))
54-
.and(
55-
takesArguments(1)
56-
.and(takesArgument(0, String.class))
57-
.or(
58-
takesArguments(2)
59-
.and(takesArgument(0, String.class))
60-
.and(takesArgument(1, boolean.class))))
61-
.and(isPublic().or(isProtected()))
62-
.and(not(isStatic()));
52+
ElementMatcher.Junction<MethodDescription> methodMatcher =
53+
isMethod()
54+
.and(named("loadClass"))
55+
.and(
56+
takesArguments(1)
57+
.and(takesArgument(0, String.class))
58+
.or(
59+
takesArguments(2)
60+
.and(takesArgument(0, String.class))
61+
.and(takesArgument(1, boolean.class))))
62+
.and(isPublic().or(isProtected()))
63+
.and(not(isStatic()));
6364

6465
transformer.applyTransformer(
6566
new AgentBuilder.Transformer.ForAdvice()
6667
.include(Utils.getBootstrapProxy(), Utils.getAgentClassLoader())
6768
.withExceptionHandler(ExceptionHandlers.defaultExceptionHandler())
68-
.advice(methodMatcher, BootDelegationInstrumentation.class.getName() + "$LoadClassAdvice")
69-
);
69+
.advice(
70+
methodMatcher, BootDelegationInstrumentation.class.getName() + "$LoadClassAdvice"));
7071
}
7172

7273
@SuppressWarnings("unused")
@@ -107,7 +108,8 @@ public static Class<?> onEnter(@Advice.Argument(0) String name) {
107108

108109
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
109110
public static void onExit(
110-
@Advice.Return(readOnly = false) Class<?> result, @Advice.Enter Class<?> resultFromBootstrapLoader) {
111+
@Advice.Return(readOnly = false) Class<?> result,
112+
@Advice.Enter Class<?> resultFromBootstrapLoader) {
111113
if (resultFromBootstrapLoader != null) {
112114
result = resultFromBootstrapLoader;
113115
}

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/BootstrapPackagesHelper.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.javaagent.instrumentation.internal.classloader;
27

8+
import static java.util.logging.Level.WARNING;
9+
310
import io.opentelemetry.javaagent.bootstrap.BootstrapPackagePrefixesHolder;
411
import io.opentelemetry.javaagent.tooling.Constants;
5-
612
import java.lang.invoke.MethodHandle;
713
import java.lang.invoke.MethodHandles;
814
import java.lang.invoke.MethodType;
915
import java.util.List;
1016
import java.util.logging.Logger;
1117

12-
import static java.util.logging.Level.WARNING;
13-
1418
public class BootstrapPackagesHelper {
1519

1620
public static final List<String> bootstrapPackagesPrefixes = findBootstrapPackagePrefixes();

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import java.util.List;
1717

1818
@AutoService(InstrumentationModule.class)
19-
public class ClassLoaderInstrumentationModule extends InstrumentationModule implements
20-
ExperimentalInstrumentationModule {
19+
public class ClassLoaderInstrumentationModule extends InstrumentationModule
20+
implements ExperimentalInstrumentationModule {
2121
public ClassLoaderInstrumentationModule() {
2222
super("internal-class-loader");
2323
}
@@ -46,7 +46,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
4646
new BootDelegationInstrumentation(),
4747
new LoadInjectedClassInstrumentation(),
4848
new ResourceInjectionInstrumentation(),
49-
new DefineClassInstrumentation()
50-
);
49+
new DefineClassInstrumentation());
5150
}
5251
}

instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,25 @@ public ElementMatcher<TypeDescription> typeMatcher() {
3939

4040
@Override
4141
public void transform(TypeTransformer transformer) {
42-
ElementMatcher.Junction<MethodDescription> methodMatcher = isMethod()
43-
.and(named("loadClass"))
44-
.and(
45-
takesArguments(1)
46-
.and(takesArgument(0, String.class))
47-
.or(
48-
takesArguments(2)
49-
.and(takesArgument(0, String.class))
50-
.and(takesArgument(1, boolean.class))))
51-
.and(isPublic().or(isProtected()))
52-
.and(not(isStatic()));
42+
ElementMatcher.Junction<MethodDescription> methodMatcher =
43+
isMethod()
44+
.and(named("loadClass"))
45+
.and(
46+
takesArguments(1)
47+
.and(takesArgument(0, String.class))
48+
.or(
49+
takesArguments(2)
50+
.and(takesArgument(0, String.class))
51+
.and(takesArgument(1, boolean.class))))
52+
.and(isPublic().or(isProtected()))
53+
.and(not(isStatic()));
5354
transformer.applyTransformer(
5455
new AgentBuilder.Transformer.ForAdvice()
5556
.include(Utils.getBootstrapProxy(), Utils.getAgentClassLoader())
5657
.withExceptionHandler(ExceptionHandlers.defaultExceptionHandler())
57-
.advice(methodMatcher, LoadInjectedClassInstrumentation.class.getName() + "$LoadClassAdvice")
58-
);
58+
.advice(
59+
methodMatcher,
60+
LoadInjectedClassInstrumentation.class.getName() + "$LoadClassAdvice"));
5961
}
6062

6163
@SuppressWarnings("unused")

0 commit comments

Comments
 (0)