Skip to content

Commit ace8927

Browse files
zeitlingerzeitlinger
committed
convert test
1 parent f8f046f commit ace8927

File tree

4 files changed

+98
-87
lines changed

4 files changed

+98
-87
lines changed

‎javaagent/src/test/java/io/opentelemetry/javaagent/AgentLoadedIntoBootstrapTest.java‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ class AgentLoadedIntoBootstrapTest {
1717

1818
@Test
1919
void agentLoadsInWhenSeparateJvmIsLaunched() throws Exception {
20-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
21-
AgentLoadedChecker.class.getName(),
22-
new String[0],
23-
new String[0],
24-
Collections.emptyMap(),
25-
true);
20+
int exitCode =
21+
IntegrationTestUtils.runOnSeparateJvm(
22+
AgentLoadedChecker.class.getName(),
23+
new String[0],
24+
new String[0],
25+
Collections.emptyMap(),
26+
true);
2627

2728
assertThat(exitCode).isZero();
2829
}
@@ -40,19 +41,15 @@ void agentLoadsInWhenSeparateJvmIsLaunched() throws Exception {
4041
@Test
4142
void applicationUberJarShouldNotBeAddedToTheBootstrapClassLoader() throws Exception {
4243
String mainClassName = MyClassLoaderIsNotBootstrap.class.getName();
43-
String pathToJar = IntegrationTestUtils.createJarWithClasses(
44-
mainClassName,
45-
MyClassLoaderIsNotBootstrap.class,
46-
OpenTelemetryAgent.class).getPath();
44+
String pathToJar =
45+
IntegrationTestUtils.createJarWithClasses(
46+
mainClassName, MyClassLoaderIsNotBootstrap.class, OpenTelemetryAgent.class)
47+
.getPath();
4748

4849
try {
49-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
50-
mainClassName,
51-
new String[0],
52-
new String[0],
53-
Collections.emptyMap(),
54-
pathToJar,
55-
true);
50+
int exitCode =
51+
IntegrationTestUtils.runOnSeparateJvm(
52+
mainClassName, new String[0], new String[0], Collections.emptyMap(), pathToJar, true);
5653

5754
assertThat(exitCode).isZero();
5855
} finally {

‎javaagent/src/test/java/io/opentelemetry/javaagent/LogLevelTest.java‎

Lines changed: 66 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,30 @@ class LogLevelTest {
2222

2323
@Test
2424
void otelJavaagentDebugFalse() throws Exception {
25-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
26-
LogLevelChecker.class.getName(),
27-
new String[]{"-Dotel.javaagent.debug=false", "-Dotel.javaagent.enabled=false"},
28-
new String[0],
29-
Collections.emptyMap(),
30-
true);
25+
int exitCode =
26+
IntegrationTestUtils.runOnSeparateJvm(
27+
LogLevelChecker.class.getName(),
28+
new String[] {"-Dotel.javaagent.debug=false", "-Dotel.javaagent.enabled=false"},
29+
new String[0],
30+
Collections.emptyMap(),
31+
true);
3132

3233
assertThat(exitCode).isOne();
3334
}
3435

3536
@Test
3637
void slf4jDebugAndOtelJavaagentDebugIsFalse() throws Exception {
37-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
38-
LogLevelChecker.class.getName(),
39-
new String[]{
40-
"-Dotel.javaagent.debug=false",
41-
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=debug",
42-
"-Dotel.javaagent.enabled=false"
43-
},
44-
new String[0],
45-
Collections.emptyMap(),
46-
true);
38+
int exitCode =
39+
IntegrationTestUtils.runOnSeparateJvm(
40+
LogLevelChecker.class.getName(),
41+
new String[] {
42+
"-Dotel.javaagent.debug=false",
43+
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=debug",
44+
"-Dotel.javaagent.enabled=false"
45+
},
46+
new String[0],
47+
Collections.emptyMap(),
48+
true);
4749

4850
assertThat(exitCode).isZero();
4951
}
@@ -53,24 +55,26 @@ void otelJavaagentDebugIsFalseAndOtelJavaagentDebugIsTrue() throws Exception {
5355
Map<String, String> env = new HashMap<>();
5456
env.put("OTEL_JAVAAGENT_DEBUG", "true");
5557

56-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
57-
LogLevelChecker.class.getName(),
58-
new String[]{"-Dotel.javaagent.debug=false", "-Dotel.javaagent.enabled=false"},
59-
new String[0],
60-
env,
61-
true);
58+
int exitCode =
59+
IntegrationTestUtils.runOnSeparateJvm(
60+
LogLevelChecker.class.getName(),
61+
new String[] {"-Dotel.javaagent.debug=false", "-Dotel.javaagent.enabled=false"},
62+
new String[0],
63+
env,
64+
true);
6265

6366
assertThat(exitCode).isOne();
6467
}
6568

6669
@Test
6770
void otelJavaagentDebugIsTrue() throws Exception {
68-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
69-
LogLevelChecker.class.getName(),
70-
new String[]{"-Dotel.javaagent.debug=true", "-Dotel.javaagent.enabled=false"},
71-
new String[0],
72-
Collections.emptyMap(),
73-
true);
71+
int exitCode =
72+
IntegrationTestUtils.runOnSeparateJvm(
73+
LogLevelChecker.class.getName(),
74+
new String[] {"-Dotel.javaagent.debug=true", "-Dotel.javaagent.enabled=false"},
75+
new String[0],
76+
Collections.emptyMap(),
77+
true);
7478

7579
assertThat(exitCode).isZero();
7680
}
@@ -80,12 +84,13 @@ void otelJavaagentDebugIsTrue2() throws Exception {
8084
Map<String, String> env = new HashMap<>();
8185
env.put("OTEL_JAVAAGENT_DEBUG", "true");
8286

83-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
84-
LogLevelChecker.class.getName(),
85-
new String[]{"-Dotel.javaagent.enabled=false"},
86-
new String[0],
87-
env,
88-
true);
87+
int exitCode =
88+
IntegrationTestUtils.runOnSeparateJvm(
89+
LogLevelChecker.class.getName(),
90+
new String[] {"-Dotel.javaagent.enabled=false"},
91+
new String[0],
92+
env,
93+
true);
8994

9095
assertThat(exitCode).isZero();
9196
}
@@ -95,12 +100,13 @@ void otelJavaagentDebugIsTrueAndOtelJavaagentDebugIsFalse() throws Exception {
95100
Map<String, String> env = new HashMap<>();
96101
env.put("OTEL_JAVAAGENT_DEBUG", "false");
97102

98-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
99-
LogLevelChecker.class.getName(),
100-
new String[]{"-Dotel.javaagent.debug=true", "-Dotel.javaagent.enabled=false"},
101-
new String[0],
102-
env,
103-
true);
103+
int exitCode =
104+
IntegrationTestUtils.runOnSeparateJvm(
105+
LogLevelChecker.class.getName(),
106+
new String[] {"-Dotel.javaagent.debug=true", "-Dotel.javaagent.enabled=false"},
107+
new String[0],
108+
env,
109+
true);
104110

105111
assertThat(exitCode).isZero();
106112
}
@@ -110,15 +116,16 @@ void slf4jDebugAndOtelJavaagentDebugIsFalse2() throws Exception {
110116
Map<String, String> env = new HashMap<>();
111117
env.put("OTEL_JAVAAGENT_DEBUG", "false");
112118

113-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
114-
LogLevelChecker.class.getName(),
115-
new String[]{
116-
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=debug",
117-
"-Dotel.javaagent.enabled=false"
118-
},
119-
new String[0],
120-
env,
121-
true);
119+
int exitCode =
120+
IntegrationTestUtils.runOnSeparateJvm(
121+
LogLevelChecker.class.getName(),
122+
new String[] {
123+
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=debug",
124+
"-Dotel.javaagent.enabled=false"
125+
},
126+
new String[0],
127+
env,
128+
true);
122129

123130
assertThat(exitCode).isZero();
124131
}
@@ -128,15 +135,16 @@ void slf4jInfoAndOtelJavaagentDebugIsTrue() throws Exception {
128135
Map<String, String> env = new HashMap<>();
129136
env.put("OTEL_JAVAAGENT_DEBUG", "true");
130137

131-
int exitCode = IntegrationTestUtils.runOnSeparateJvm(
132-
LogLevelChecker.class.getName(),
133-
new String[]{
134-
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=info",
135-
"-Dotel.javaagent.enabled=false"
136-
},
137-
new String[0],
138-
env,
139-
true);
138+
int exitCode =
139+
IntegrationTestUtils.runOnSeparateJvm(
140+
LogLevelChecker.class.getName(),
141+
new String[] {
142+
"-Dio.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel=info",
143+
"-Dotel.javaagent.enabled=false"
144+
},
145+
new String[0],
146+
env,
147+
true);
140148

141149
assertThat(exitCode).isOne();
142150
}

‎javaagent/src/test/java/io/opentelemetry/javaagent/classloading/ClassLoadingTest.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,19 @@ class ClassLoadingTest {
2525

2626
@BeforeEach
2727
void setUp() throws Exception {
28-
classpath = new URL[] {createJarWithClasses(ClassToInstrument.class, ClassToInstrumentChild.class)};
28+
classpath =
29+
new URL[] {createJarWithClasses(ClassToInstrument.class, ClassToInstrumentChild.class)};
2930
}
3031

3132
/** Assert that we can instrument classloaders which cannot resolve agent advice classes. */
3233
@Test
3334
void instrumentClassloaderWithoutAgentClasses() throws Exception {
3435
URLClassLoader loader = new URLClassLoader(classpath, null);
3536

36-
assertThatThrownBy(() ->
37-
loader.loadClass("io.opentelemetry.javaagent.instrumentation.trace_annotation.TraceAdvice"))
37+
assertThatThrownBy(
38+
() ->
39+
loader.loadClass(
40+
"io.opentelemetry.javaagent.instrumentation.trace_annotation.TraceAdvice"))
3841
.isInstanceOf(ClassNotFoundException.class);
3942

4043
Class<?> instrumentedClass = loader.loadClass(ClassToInstrument.class.getName());
@@ -55,7 +58,8 @@ void makeSureByteBuddyDoesNotHoldStrongReferencesToClassLoader() throws Exceptio
5558
assertThat(ref.get()).isNull();
5659
}
5760

58-
// We are doing this because Groovy cannot properly resolve constructor argument types in anonymous classes
61+
// We are doing this because Groovy cannot properly resolve constructor argument types in
62+
// anonymous classes
5963
static class CountingClassLoader extends URLClassLoader {
6064
public int count = 0;
6165

@@ -77,17 +81,17 @@ void makeSureThatByteBuddyReadsTheClassBytesOnlyOnce() throws Exception {
7781
int countAfterFirstLoad = loader.count;
7882
loader.loadClass(ClassToInstrumentChild.class.getName());
7983

80-
// ClassToInstrumentChild won't cause an additional getResource() because its TypeDescription is created from transformation bytes.
81-
assertThat(loader.count)
82-
.isPositive()
83-
.isEqualTo(countAfterFirstLoad);
84+
// ClassToInstrumentChild won't cause an additional getResource() because its TypeDescription
85+
// is created from transformation bytes.
86+
assertThat(loader.count).isPositive().isEqualTo(countAfterFirstLoad);
8487
}
8588
}
8689

8790
@Test
88-
void makeSureThatByteBuddyDoesntReuseCachedTypeDescriptionsBetweenDifferentClassloaders() throws Exception {
91+
void makeSureThatByteBuddyDoesntReuseCachedTypeDescriptionsBetweenDifferentClassloaders()
92+
throws Exception {
8993
try (CountingClassLoader loader1 = new CountingClassLoader(classpath);
90-
CountingClassLoader loader2 = new CountingClassLoader(classpath)) {
94+
CountingClassLoader loader2 = new CountingClassLoader(classpath)) {
9195

9296
loader1.loadClass(ClassToInstrument.class.getName());
9397
loader2.loadClass(ClassToInstrument.class.getName());

‎javaagent/src/test/java/io/opentelemetry/javaagent/muzzle/MuzzleBytecodeTransformTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ void muzzleFieldsAddedToAllInstrumentation() throws Exception {
2323
List<Class<?>> nonLazyFields = new ArrayList<>();
2424
List<Class<?>> unInitFields = new ArrayList<>();
2525

26-
Class<?> instrumentationModuleClass = IntegrationTestUtils.getAgentClassLoader()
27-
.loadClass("io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule");
26+
Class<?> instrumentationModuleClass =
27+
IntegrationTestUtils.getAgentClassLoader()
28+
.loadClass(
29+
"io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule");
2830

2931
for (Object instrumenter : ServiceLoader.load(instrumentationModuleClass)) {
3032
if (!instrumentationModuleClass.isAssignableFrom(instrumenter.getClass())) {

0 commit comments

Comments
 (0)